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 | |
| parent | ed03fc4f4a3287a01647e528abba27aac1937de0 (diff) | |
Organize home and macro code
Diffstat (limited to 'macros')
| -rwxr-xr-x | macros/code.asm | 2 | ||||
| -rw-r--r-- | macros/farcall.asm | 21 | ||||
| -rw-r--r-- | macros/gfx.asm | 12 |
3 files changed, 6 insertions, 29 deletions
diff --git a/macros/code.asm b/macros/code.asm index 8507b1ad..e0b3e9c9 100755 --- a/macros/code.asm +++ b/macros/code.asm @@ -4,7 +4,7 @@ lb: MACRO ; r, hi, lo ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) ENDM -ldPal: MACRO +ldpal: MACRO ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 ENDM 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 diff --git a/macros/gfx.asm b/macros/gfx.asm index ad428eb0..98eabec4 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -16,18 +16,6 @@ color EQUS "+ PAL_COLOR_SIZE *" tiles EQUS "* LEN_2BPP_TILE" tile EQUS "+ LEN_2BPP_TILE *" -setpal: MACRO - ld a, \1 << 6 | \2 << 4 | \3 << 2 | \4 -ENDM - -setpalBGP: MACRO - setpal SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE -ENDM - -setpalOBP: MACRO - setpal SHADE_BLACK, SHADE_DARK, SHADE_WHITE, SHADE_WHITE -ENDM - dbsprite: MACRO ; x tile, y tile, x pixel, y pixel, vtile offset, attributes db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 |