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 | |
| parent | 4f87e62feddaed6b2ede988289abbf3fc43a8614 (diff) | |
| parent | ee8cd1444fc5bfd37a5688bdff0ba5c9416ac040 (diff) | |
Merge pull request #11 from PikalaxALT/farcall_deprecation
Deprecate farcall/callfar in favor of callba/callab
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 6 | ||||
| -rw-r--r-- | home/overworld.asm | 12 | ||||
| -rw-r--r-- | macros/farcall.asm | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index c8e42f2..1946c1f 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -546,7 +546,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281) ret _QueueBattleAnimation: ; c82ee (32:42ee) - callfar QueueBattleAnimation + callab QueueBattleAnimation ret BattleBGEffect_27: ; c82f5 (32:42f5) @@ -2363,13 +2363,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059) BattleBGEffects_Sine: ; c905d (32:505d) ld e, a - callfar BattleAnim_Sine_e + callab BattleAnim_Sine_e ld a, e ret BattleBGEffects_Cosine: ; c9066 (32:5066) ld e, a - callfar BattleAnim_Cosine_e + callab BattleAnim_Cosine_e ld a, e ret 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 diff --git a/macros/farcall.asm b/macros/farcall.asm index 533ea46..50bb232 100644 --- a/macros/farcall.asm +++ b/macros/farcall.asm @@ -1,11 +1,11 @@ -farcall: MACRO ; bank, address +callba: MACRO ; bank, address ld a, BANK(\1) ld hl, \1 call FarCall_hl ENDM -callfar: MACRO ; address, bank +callab: MACRO ; address, bank ld hl, \1 ld a, BANK(\1) call FarCall_hl |