Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F #437

Merged
merged 4 commits into from
Nov 19, 2023
Merged

Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ab48c5
Update PokemonMansion1F.asm
Vortyne Nov 19, 2023
2bf69e2
Name unnamed seafoam/mansion labels
Vortyne Nov 19, 2023
81cc14c
Two labels I missed naming
Vortyne Nov 19, 2023
445a1b0
Merge branch 'master' of https://github.com/pret/pokered into patch-3
Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/PokemonMansion3F.asm
View file
Open in desktop
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
View file
Open in desktop
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