diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/menu.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/menu.asm')
| -rwxr-xr-x | engine/menu.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu.asm b/engine/menu.asm index e84d8d597..6fbed2848 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -16,7 +16,7 @@ _InterpretBattleMenu:: ; 24022 rst FarCall call Draw2DMenu - callba MobileTextBorder + farcall MobileTextBorder call UpdateSprites call ApplyTilemap call Get2DMenuSelection @@ -29,7 +29,7 @@ _InterpretMobileMenu:: ; 2403c rst FarCall call Draw2DMenu - callba MobileTextBorder + farcall MobileTextBorder call UpdateSprites call ApplyTilemap call Init2DMenuCursorPosition @@ -37,7 +37,7 @@ _InterpretMobileMenu:: ; 2403c set 7, [hl] .loop call DelayFrame - callba Function10032e + farcall Function10032e ld a, [wcd2b] and a jr nz, .quit @@ -322,7 +322,7 @@ Function241d5: ; 241d5 call AdvanceMobileInactivityTimerAndCheckExpired ; BUG: This function is in another bank. ; Pointer in current bank (9) is bogus. ret c - callba Function100337 + farcall Function100337 ret c ld a, [w2DMenuFlags1] bit 7, a @@ -382,7 +382,7 @@ Menu_WasButtonPressed: ; 24259 ld a, [w2DMenuFlags1] bit 6, a jr z, .skip_to_joypad - callab PlaySpriteAnimationsAndDelayFrame + callfar PlaySpriteAnimationsAndDelayFrame .skip_to_joypad call JoyTextDelay |