diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /macros | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/coords.asm | 6 | ||||
| -rw-r--r-- | macros/farcall.asm | 8 | ||||
| -rw-r--r-- | macros/gfx.asm | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/macros/coords.asm b/macros/coords.asm index 984073ed..6eccdec4 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -47,11 +47,11 @@ ENDM MACRO bgcoord ; register, x, y[, origin] - validate_coords \2, \3, BG_MAP_WIDTH, BG_MAP_HEIGHT + validate_coords \2, \3, TILEMAP_WIDTH, TILEMAP_HEIGHT IF _NARG >= 4 - ld \1, (\3) * BG_MAP_WIDTH + (\2) + \4 + ld \1, (\3) * TILEMAP_WIDTH + (\2) + \4 ELSE - ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0 + ld \1, (\3) * TILEMAP_WIDTH + (\2) + vBGMap0 ENDC ENDM diff --git a/macros/farcall.asm b/macros/farcall.asm index a40bff36..ead11739 100644 --- a/macros/farcall.asm +++ b/macros/farcall.asm @@ -27,11 +27,11 @@ MACRO homecall push af ld a, BANK(\1) ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a call \1 pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ENDM MACRO homecall_sf ; homecall but save flags by popping into bc instead of af @@ -39,10 +39,10 @@ MACRO homecall_sf ; homecall but save flags by popping into bc instead of af push af ld a, BANK(\1) ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a call \1 pop bc ld a, b ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ENDM diff --git a/macros/gfx.asm b/macros/gfx.asm index 944e6dd5..7b8fcf5d 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -5,16 +5,16 @@ MACRO RGB ENDR ENDM -DEF palred EQUS "(1 << 0) *" -DEF palgreen EQUS "(1 << 5) *" -DEF palblue EQUS "(1 << 10) *" +DEF palred EQUS "(1 << B_COLOR_RED) *" +DEF palgreen EQUS "(1 << B_COLOR_GREEN) *" +DEF palblue EQUS "(1 << B_COLOR_BLUE) *" DEF palettes EQUS "* PALETTE_SIZE" DEF palette EQUS "+ PALETTE_SIZE *" DEF color EQUS "+ PAL_COLOR_SIZE *" -DEF tiles EQUS "* LEN_2BPP_TILE" -DEF tile EQUS "+ LEN_2BPP_TILE *" +DEF tiles EQUS "* TILE_SIZE" +DEF tile EQUS "+ TILE_SIZE *" MACRO dbsprite ; x tile, y tile, x pixel, y pixel, vtile offset, attributes |