Skip to content

Commit

Permalink
Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansio…
Browse files Browse the repository at this point in the history
…n3F (#437)
  • Loading branch information
Vortyne authored Nov 19, 2023
1 parent 27940a7 commit 3bbd38a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/PokemonMansion3F.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions scripts/SeafoamIslandsB4F.asm
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ SeafoamIslandsB4FObjectMoving2Script:
ld a, [wSimulatedJoypadStatesIndex]
ld b, a
cp $1
call z, SeaFoamIslands5Script_46872
call z, .doneForcedSurfMovement
ld a, b
and a
ret nz
ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT
ld [wSeafoamIslandsB4FCurScript], a
ret

SeaFoamIslands5Script_46872:
.doneForcedSurfMovement:
xor a
ld [wWalkBikeSurfState], a
ld [wWalkBikeSurfStateCopy], a
Expand Down

0 comments on commit 3bbd38a

Please sign in to comment.