diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/engine/bank1c.asm | 12 | ||||
| -rwxr-xr-x | src/engine/bank20.asm | 8 | ||||
| -rwxr-xr-x | src/engine/home.asm | 16 | ||||
| -rwxr-xr-x | src/sram.asm | 2 | ||||
| -rw-r--r-- | src/vram.asm | 10 | ||||
| -rwxr-xr-x | src/wram.asm | 8 |
6 files changed, 34 insertions, 22 deletions
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index 7ceb0dc..c7ae122 100755 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -80,7 +80,7 @@ Func_700a3: ; 700a3 (1c:40a3) ld a, [hli] ld h, [hl] ld l, a - ld de, $8800 + ld de, vTiles1 call Func_701e9 call Func_701fe ld hl, SGB_700de @@ -96,7 +96,7 @@ Func_700a3: ; 700a3 (1c:40a3) jr z, .asm_700da call Func_70136 dec hl - ld de, $8800 + ld de, vTiles1 call Func_701e9 ld hl, SGB_700ee call Func_70177 @@ -123,10 +123,10 @@ Func_700fe: ; 700fe (1c:40fe) push hl call Func_70136 pop hl - ld de, $8800 + ld de, vTiles1 call Func_701e9 pop hl - ld de, $9000 + ld de, vTiles2 call Func_701e9 call Func_701fe pop hl @@ -212,7 +212,7 @@ Func_701c0: ; 701c0 (1c:41c0) call DisableLCD xor a ld c, $10 - ld hl, $9000 + ld hl, vTiles2 .asm_701cb ld [hli], a dec c @@ -251,7 +251,7 @@ Func_701e9: ; 701e9 (1c:41e9) ret Func_701fe: ; 701fe (1c:41fe) - ld hl, $9800 + ld hl, vBGMapTiles ld de, $000c ld a, $80 ld c, $d diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 1630e3b..b551e73 100755 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -65,8 +65,8 @@ Func_801a1: ; 801a1 (20:41a1) push af ld a, $1 call BankswitchRAM - ld hl, $a000 - ld de, $9800 + ld hl, vEnd + ld de, vBGMapTiles ld c, $20 .asm_801b4 push bc @@ -75,7 +75,7 @@ Func_801a1: ; 801a1 (20:41a1) ld b, $20 call SafeCopyDataHLtoDE ld a, [wConsole] - cp $2 + cp CONSOLE_CGB jr nz, .asm_801d6 pop de pop hl @@ -288,7 +288,7 @@ Func_80ba4: ; 80ba4 (20:4ba4) ld c, [hl] inc hl ld a, [wConsole] - cp $2 + cp CONSOLE_CGB jr nz, .asm_80be7 inc hl diff --git a/src/engine/home.asm b/src/engine/home.asm index a71fdf1..4639853 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -422,8 +422,8 @@ SetupVRAM: ; 03a1 (0:03a1) call .asm_3b2 call BankswitchVRAM_0 .asm_3b2 - ld hl, $8000 - ld bc, $1800 + ld hl, vTiles0 + ld bc, vBGMapTiles - vTiles0 .asm_3b8 xor a ld [hli], a @@ -436,8 +436,8 @@ SetupVRAM: ; 03a1 (0:03a1) ; fill VARM tile map banks with [wTileMapFill] FillTileMap: ; 03c0 (0:03c0) call BankswitchVRAM_0 - ld hl, $9800 - ld bc, $0400 + ld hl, vBGMapTiles + ld bc, vBGMapAttrs - vBGMapTiles .asm_3c9 ld a, [wTileMapFill] ld [hli], a @@ -449,8 +449,8 @@ FillTileMap: ; 03c0 (0:03c0) cp CONSOLE_CGB ret nz call BankswitchVRAM_1 - ld hl, $9800 - ld bc, $0400 + ld hl, vBGMapTiles + ld bc, vBGMapAttrs - vBGMapTiles .asm_3e1 xor a ld [hli], a @@ -630,7 +630,7 @@ SGB_ATTR_BLK_04bf: ; 04bf (0:04bf) sgb ATTR_BLK, 1 ; sgb_command, length db $01,$03,$00,$00,$00,$13,$11,$00,$00,$00,$00,$00,$00,$00,$00 -; returns $9800 + 32 * c + b in de. +; returns vBGMapTiles + 32 * c + b in de. ; used to map coordinates at bc to a BGMap0 address. BCCoordToBGMap0Address: ; 04cf (0:04cf) ld l, c @@ -3727,7 +3727,7 @@ SafeCopyDataDEtoHL: ; 1dca (0:1dca) .lcd_on jp HblankCopyDataDEtoHL -; returns $9800 + 32 * e + d in hl. +; returns vBGMapTiles + 32 * e + d in hl. ; used to map coordinates at de to a BGMap0 address. DECoordToBGMap0Address: ; 1ddb (0:1ddb) ld l, e diff --git a/src/sram.asm b/src/sram.asm index 0cf593d..bd095fc 100755 --- a/src/sram.asm +++ b/src/sram.asm @@ -1,6 +1,6 @@ SECTION "Working Cards", SRAM, BANK[0] -ds $100 + ds $100 sCardCollection:: ds $100 ; a100 diff --git a/src/vram.asm b/src/vram.asm new file mode 100644 index 0000000..07972de --- /dev/null +++ b/src/vram.asm @@ -0,0 +1,10 @@ +SECTION "VRAM", VRAM, BANK[0] + +vTiles0:: ds $800 ; 8000 +vTiles1:: ds $800 ; 8800 +vTiles2:: ds $800 ; 9000 + +vBGMapTiles:: ds $400 ; 9800 +vBGMapAttrs:: ds $400 ; 9c00 + +vEnd:: ; a000 diff --git a/src/wram.asm b/src/wram.asm index ba63201..90153dc 100755 --- a/src/wram.asm +++ b/src/wram.asm @@ -1,13 +1,15 @@ INCLUDE "constants.asm" INCLUDE "macros.asm" +INCLUDE "vram.asm" + ;---------------------------------------------------------- ;--- Bank 0: $Cxxx ---------------------------------------- ;---------------------------------------------------------- SECTION "WRAM0", WRAM0 -wTempCardCollection:: +wTempCardCollection:: ; c000 ds $100 ds $100 @@ -527,10 +529,10 @@ wDamage:: ; ccb9 ; wccbb and wccbc appear to be used for AI scoring wccbb:: ds $1 - + wccbc:: ds $1 - + ds $2 wccbf:: ; ccbf |