Replace some hard-coded values with constants

This commit is contained in:
Rangi 2019-07-07 00:44:21 -04:00
parent 725b86ebbe
commit f99a715fae
18 changed files with 37 additions and 30 deletions

View file

@ -16,18 +16,18 @@ Mansion3Script_52204:
CheckEvent EVENT_MANSION_SWITCH_ON
jr nz, .asm_52224
ld a, $e
ld bc, $207
lb bc, 2, 7
call Mansion2Script_5202f
ld a, $5f
ld bc, $507
lb bc, 5, 7
call Mansion2Script_5202f
ret
.asm_52224
ld a, $5f
ld bc, $207
lb bc, 2, 7
call Mansion2Script_5202f
ld a, $e
ld bc, $507
lb bc, 5, 7
call Mansion2Script_5202f
ret
@ -43,9 +43,9 @@ Mansion3Script0:
and a
jp z, CheckFightingMapTrainers
cp $3
ld a, $a5
ld a, POKEMON_MANSION_1F
jr nz, .asm_52250
ld a, $d6
ld a, POKEMON_MANSION_2F
.asm_52250
ld [wDungeonWarpDestinationMap], a
ret

View file

@ -32,7 +32,7 @@ SeafoamIslands1F_Script:
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_4483b
ld a, $9f
ld a, SEAFOAM_ISLANDS_B1F
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam1HolesCoords
jp IsPlayerOnDungeonWarp

View file

@ -31,7 +31,7 @@ SeafoamIslandsB1F_Script:
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_46362
ld a, $a0
ld a, SEAFOAM_ISLANDS_B2F
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam2HolesCoords
jp IsPlayerOnDungeonWarp

View file

@ -31,7 +31,7 @@ SeafoamIslandsB2F_Script:
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_4649e
ld a, $a1
ld a, SEAFOAM_ISLANDS_B3F
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam3HolesCoords
jp IsPlayerOnDungeonWarp

View file

@ -32,7 +32,7 @@ SeafoamIslandsB3F_Script:
predef ShowObject
jr .asm_465ed
.asm_465dc
ld a, $a2
ld a, SEAFOAM_ISLANDS_B4F
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam4HolesCoords
call IsPlayerOnDungeonWarp