diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/PokemonMansion3F.asm | 12 | ||||
| -rwxr-xr-x | scripts/SeafoamIslands1F.asm | 2 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB1F.asm | 2 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB3F.asm | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 3edc7bfd..ff172413 100755 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -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 diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm index dc3b8599..b024a6bd 100755 --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm @@ -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 diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm index 876c0837..a4c5767b 100755 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -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 diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm index c0141a3e..eb6d2437 100755 --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -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 diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index 7343b17d..c8fec338 100755 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -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 |