diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/overworld.asm | 8 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_movement.asm | 10 | ||||
| -rwxr-xr-x | engine/specials.asm | 2 | ||||
| -rwxr-xr-x | engine/variables.asm | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 68f7dcc3..82981450 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -360,7 +360,7 @@ CheckAbleToSurf: jr c, .asm_c980 CheckFlagHL ENGINE_ALWAYS_ON_BIKE jr nz, .asm_c986 - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_SURF jr z, .asm_c983 cp PLAYER_SURF_PIKA @@ -472,7 +472,7 @@ GetSurfDirection: ; c9ea (3:49ea) db FACE_RIGHT TrySurfOW:: - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_SURF_PIKA jr z, .quit cp PLAYER_SURF @@ -1389,7 +1389,7 @@ FishingRodFunction: ; cf91 dw Fish_NoFish ; 3:5013 Fish_CheckMap: - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_SURF jr z, .asm_cfc7 cp PLAYER_SURF_PIKA @@ -1575,7 +1575,7 @@ BicycleFunction: Functiond0c9: ; d0c9 (3:50c9) call CheckBikePermission jr c, .cant_bike - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_NORMAL jr z, .get_on_bike cp PLAYER_BIKE diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 9a829be9..ff480e37 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -819,7 +819,7 @@ OakText2: text_jump _OakText2 start_asm ld a, MARILL - call PlayCry + call PlayMonCry call WaitSFX ld hl, OakText3 ; $606c ret diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 61b45a72..1fdec4e2 100755 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -24,7 +24,7 @@ Function10017: ; 10017 (4:4017) ret Function1002d: ; 1002d (4:402d) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_NORMAL jr z, .asm_10044 cp PLAYER_SURF @@ -236,7 +236,7 @@ Function10147: ; 10147 (4:4147) ret Function1016b: ; 1016b (4:416b) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $4 jr z, Function101c0 cp $8 @@ -655,7 +655,7 @@ Function103b4: ; 103b4 (4:43b4) ret Function103ca: ; 103ca (4:43ca) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $1 ret z cp $2 @@ -699,7 +699,7 @@ Function103ee: ; 103ee (4:43ee) Function103f9: ; 103f9 (4:43f9) push bc ld a, $0 - ld [wPlayerBikeSurfState], a + ld [wPlayerState], a call ReplacePlayerSprite pop bc ret @@ -713,7 +713,7 @@ Function10404: ; 10404 (4:4404) ld a, [wPlayerStandingTile] call CheckIceTile jr nc, .asm_1041e - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $2 jr nz, .asm_10420 .asm_1041e diff --git a/engine/specials.asm b/engine/specials.asm index 6cd4fa91..b26b6bf1 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -521,7 +521,7 @@ SnorlaxAwake: ; c5d6 (3:45d6) PlayCurMonCry: ; c60b (3:460b) ld a, [wCurPartySpecies] - jp PlayCry + jp PlayMonCry GameboyCheck: ; c611 (3:4611) ld a, [hCGB] diff --git a/engine/variables.asm b/engine/variables.asm index 4d67c2bf..e2a399f0 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -42,7 +42,7 @@ GetVarAction_:: dwb .CountCaughtMons, RETVAR_EXECUTE dwb .CountSeenMons, RETVAR_EXECUTE dwb .CountBadges, RETVAR_EXECUTE - dwb wPlayerBikeSurfState, RETVAR_ADDR_DE + dwb wPlayerState, RETVAR_ADDR_DE dwb .PlayerFacing, RETVAR_EXECUTE dwb hHours, RETVAR_STRBUF2 dwb .DayOfWeek, RETVAR_EXECUTE |