Skip to content

Commit

Permalink
Bugfix - Pager moves work without pagers in the overworld
Browse files Browse the repository at this point in the history
  • Loading branch information
SoupPotato committed Jan 6, 2024
1 parent d851cb5 commit e179f73
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions engine/events/overworld.asm
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,10 @@ TrySurfOW::
ld de, ENGINE_FOGBADGE
call CheckEngineFlag
jr c, .quit
ld de, ENGINE_PAGER_SURF
call CheckEngineFlag
jr c, .quit

ld hl, wBikeFlags
bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
Expand Down Expand Up @@ -1058,6 +1062,10 @@ TryStrengthOW:
call CheckEngineFlag
jr c, .nope

ld de, ENGINE_PAGER_STRENGTH
call CheckEngineFlag
jr c, .nope

ld hl, wBikeFlags
bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
jr z, .already_using
Expand Down Expand Up @@ -1188,6 +1196,11 @@ TryWhirlpoolOW::
ld de, ENGINE_GLACIERBADGE
call CheckEngineFlag
jr c, .failed

ld de, ENGINE_PAGER_WHIRLPOOL
call CheckEngineFlag
jr c, .failed

call TryWhirlpoolMenu
jr c, .failed
ld a, BANK(Script_AskWhirlpoolOW)
Expand Down Expand Up @@ -1390,8 +1403,9 @@ UseRockSmashText:
text_end

AskRockSmashScript:
checkflag ENGINE_PAGER_ROCK_SMASH
iffalse .no
ld de, ENGINE_PAGER_ROCK_SMASH
call CheckEngineFlag
jr c, .no

opentext
writetext AskRockSmashText
Expand Down Expand Up @@ -1768,6 +1782,10 @@ TryCutOW::
call CheckEngineFlag
jr c, .cant_cut

ld de, ENGINE_PAGER_CUT
call CheckEngineFlag
jr c, .cant_cut
ld a, BANK(AskCutScript)
ld hl, AskCutScript
call CallScript
Expand Down

0 comments on commit e179f73

Please sign in to comment.