diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
| commit | 6fe56af2cd63abaf30040cc5031e3db5358cf638 (patch) | |
| tree | b024aa8480912ebf2667184068466ee7f354012c /macros/farcall.asm | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| download | pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.gz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.xz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.zip | |
Organize home and macro code
Diffstat (limited to 'macros/farcall.asm')
| -rw-r--r-- | macros/farcall.asm | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/macros/farcall.asm b/macros/farcall.asm index e6ecdaae..f3fa07d4 100644 --- a/macros/farcall.asm +++ b/macros/farcall.asm @@ -32,7 +32,7 @@ homecall: MACRO call BankswitchCommon ENDM -homecall_jump: MACRO +homejp: MACRO ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -42,7 +42,7 @@ homecall_jump: MACRO jp BankswitchCommon ENDM -homecall_jump_sf: MACRO +homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -50,10 +50,10 @@ homecall_jump_sf: MACRO call \1 pop bc ld a, b - jp BankswitchCommon + call BankswitchCommon ENDM -homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af +homejp_sf: MACRO ; homejp but save flags by popping into bc instead of af ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -61,18 +61,7 @@ homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af call \1 pop bc ld a, b - call BankswitchCommon -ENDM - -switchbank: MACRO - ld a, BANK(\1) - call BankswitchCommon -ENDM - -callbs: MACRO - ld a, BANK(\1) - call BankswitchCommon - call \1 + jp BankswitchCommon ENDM calladb_ModifyPikachuHappiness: MACRO |