ref: d47c5603674414e6afeb34693d6255cfb9dece65
parent: 38cdad798dbae4a2820f4d4e61bc5b782e70ef47
parent: 20464d1bfbc9934ccf7e98f3d2cb6ebe1c310480
author: mid-kid <[email protected]>
date: Thu Apr 30 13:54:56 EDT 2020
Merge pull request #715 from Rangi42/master Miscellaneous updates
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -38,7 +38,7 @@
; PredefPals indexes (see gfx/sgb/predef.pal)
; GetPredefPal arguments (see engine/gfx/color.asm)
const_def
- const PREDEFPAL_00
+ const PREDEFPAL_ROUTES
const PREDEFPAL_PALLET
const PREDEFPAL_VIRIDIAN
const PREDEFPAL_PEWTER
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@@ -2,7 +2,7 @@
MapGroupRoofSGBPalInds:
; entries correspond to map groups
- db PREDEFPAL_00
+ db PREDEFPAL_ROUTES
db PREDEFPAL_OLIVINE
db PREDEFPAL_MAHOGANY
db PREDEFPAL_DUNGEONS
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -547,7 +547,7 @@
ret
.route
- ld a, PREDEFPAL_00
+ ld a, PREDEFPAL_ROUTES
ret
.cave
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -577,11 +577,14 @@
; Standing
jr .update
-.d_down add hl, de
-.d_up add hl, de
-.d_left add hl, de
-.d_right add hl, de
-
+.d_down
+ add hl, de
+.d_up
+ add hl, de
+.d_left
+ add hl, de
+.d_right
+ add hl, de
.update
ld a, [hli]
ld [wWalkingDirection], a
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -124,7 +124,7 @@
ld e, a
; the next three lines are useless
ld a, [wObjectFollow_Leader]
- cp $0
+ cp PLAYER
ret nz
ret
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -20,7 +20,7 @@
sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
PalPacket_MagnetTrain:
- sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00
+ sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, ROUTES
PalPacket_BetaPoker:
sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3
@@ -29,28 +29,28 @@
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
PalPacket_9bd6:
- sgb_pal_set 00, 00, 00, 00
+ sgb_pal_set ROUTES, ROUTES, ROUTES, ROUTES
PalPacket_GSIntroShellderLapras:
- sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
+ sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, ROUTES, ROUTES, ROUTES
UnreferencedPalPacket_BetaIntroLapras:
- sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00
+ sgb_pal_set BETA_INTRO_LAPRAS, ROUTES, ROUTES, ROUTES
PalPacket_GSIntroJigglypuffPikachu:
- sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES
PalPacket_GSIntroStartersTransition:
- sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
+ sgb_pal_set GS_INTRO_STARTERS_TRANSITION, ROUTES, ROUTES, ROUTES
PalPacket_BetaIntroVenusaur:
- sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00
+ sgb_pal_set BETA_INTRO_VENUSAUR, ROUTES, ROUTES, ROUTES
PalPacket_Pack:
- sgb_pal_set PACK, 00, 00, 00
+ sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
PalPacket_BetaPikachuMinigame:
- sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, ROUTES, ROUTES, ROUTES
PalPacket_PartyMenu:
sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
@@ -59,10 +59,10 @@
sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
PalPacket_Pokegear:
- sgb_pal_set POKEGEAR, 00, 00, 00
+ sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES
UnreferencedPalPacket_9c86:
- sgb_pal_set PACK, 00, 00, 00
+ sgb_pal_set PACK, ROUTES, ROUTES, ROUTES
PalPacket_SlotMachine:
sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
@@ -71,13 +71,13 @@
sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
PalPacket_Diploma:
- sgb_pal_set DIPLOMA, 00, 00, 00
+ sgb_pal_set DIPLOMA, ROUTES, ROUTES, ROUTES
PalPacket_TradeTube:
- sgb_pal_set TRADE_TUBE, 00, 00, 00
+ sgb_pal_set TRADE_TUBE, ROUTES, ROUTES, ROUTES
PalPacket_GamefreakLogo:
- sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
+ sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, ROUTES, ROUTES, ROUTES
PalPacket_9ce6:
sgb_pal01