diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index c3a9fba8..f64357d5 100644 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -45,9 +45,9 @@ PokemonMansion3FDefaultScript: jp z, CheckFightingMapTrainers cp $3 ld a, POKEMON_MANSION_1F - jr nz, .asm_52250 + jr nz, .fellDownHoleTo1F ld a, POKEMON_MANSION_2F -.asm_52250 +.fellDownHoleTo1F ld [wDungeonWarpDestinationMap], a ret diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 7584cd81..bff27e9f 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -118,7 +118,7 @@ SeafoamIslandsB4FObjectMoving2Script: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 - call z, SeaFoamIslands5Script_46872 + call z, .doneForcedSurfMovement ld a, b and a ret nz @@ -126,7 +126,7 @@ SeafoamIslandsB4FObjectMoving2Script: ld [wSeafoamIslandsB4FCurScript], a ret -SeaFoamIslands5Script_46872: +.doneForcedSurfMovement: xor a ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a