diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-06-04 21:20:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-04 21:20:09 -0400 |
commit | c0fdb258d360790e20e08e9e36e474aa4213325c (patch) | |
tree | 294d91537061c00e21f76c573cf802d8f5579766 /home/overworld.asm | |
parent | 4f87e62feddaed6b2ede988289abbf3fc43a8614 (diff) | |
parent | ee8cd1444fc5bfd37a5688bdff0ba5c9416ac040 (diff) |
Merge pull request #11 from PikalaxALT/farcall_deprecation
Deprecate farcall/callfar in favor of callba/callab
Diffstat (limited to 'home/overworld.asm')
-rw-r--r-- | home/overworld.asm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 2a4671a..4b10b72 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -17,20 +17,14 @@ if DEBUG ld a, [wce63] bit 1, a ret z ; debug disabled - ld a, BANK(InGameDebugMenu) - ld hl, InGameDebugMenu - call FarCall_hl + callba InGameDebugMenu jr CheckStartmenuSelectHook .regularMenu endc - ld a, BANK(DisplayStartMenu) - ld hl, DisplayStartMenu - call FarCall_hl + callba DisplayStartMenu jr CheckStartmenuSelectHook SelectButtonFunction:: ; 2c2a (0:2c2a) - ld hl, CheckRegisteredItem - ld a, BANK(CheckRegisteredItem) - call FarCall_hl + callab CheckRegisteredItem CheckStartmenuSelectHook: ldh a, [hStartmenuCloseAndSelectHookEnable] and a |