diff options
Diffstat (limited to 'main.asm')
-rw-r--r-- | main.asm | 77 |
1 files changed, 12 insertions, 65 deletions
@@ -27130,68 +27130,17 @@ Function1746c: ; 1746c INCBIN "baserom.gbc",$1749c,$174ba - $1749c -SECTION "bank6", ROMX, BANK[$6] +SECTION "Tileset Data 1", ROMX, BANK[TILESETS_1] INCLUDE "tilesets/data_1.asm" -SECTION "bank7", ROMX, BANK[$7] +SECTION "Roofs", ROMX, BANK[ROOFS] -LoadMapGroupRoof: ; 1c000 - ld a, [MapGroup] - ld e, a - ld d, 0 - ld hl, MapGroupRoofs - add hl, de - ld a, [hl] - cp $ff - ret z - ld hl, Roofs - ld bc, $90 - call AddNTimes - ld de, $90a0 - ld bc, $90 - call CopyBytes - ret -; 1c021 - -MapGroupRoofs: ; 1c021i - db -1 ; group 1 - db 3 ; group 2 - db 2 ; group 3 - db -1 ; group 4 - db 1 ; group 5 - db 2 ; group 6 - db -1 ; group 7 - db -1 ; group 8 - db 2 ; group 9 - db 2 ; group 10 - db 1 ; group 11 - db 4 ; group 12 - db -1 ; group 13 - db -1 ; group 14 - db -1 ; group 15 - db -1 ; group 16 - db -1 ; group 17 - db -1 ; group 18 - db -1 ; group 19 - db 0 ; group 20 - db -1 ; group 21 - db -1 ; group 22 - db 3 ; group 23 - db -1 ; group 24 - db 0 ; group 25 - db -1 ; group 26 - db 0 ; group 27 -; 1c03c - -Roofs: ; 1c03c -INCBIN "gfx/tilesets/roofs/0.2bpp" -INCBIN "gfx/tilesets/roofs/1.2bpp" -INCBIN "gfx/tilesets/roofs/2.2bpp" -INCBIN "gfx/tilesets/roofs/3.2bpp" -INCBIN "gfx/tilesets/roofs/4.2bpp" -; 1c30c +INCLUDE "tilesets/roofs.asm" + + +SECTION "Tileset Data 2", ROMX, BANK[TILESETS_2] INCLUDE "tilesets/data_2.asm" @@ -27408,9 +27357,10 @@ Function20168: ; 20168 (8:4168) INCBIN "baserom.gbc",$2017c,$20181 - $2017c -INCLUDE "tilesets/data_3.asm" +SECTION "Tileset Data 3", ROMX, BANK[TILESETS_3] +INCLUDE "tilesets/data_3.asm" SECTION "bank9", ROMX, BANK[$9] @@ -37333,13 +37283,10 @@ FillBox: ; 2ef6e ; 2ef9f - -SECTION "bankC", ROMX, BANK[$C] +SECTION "Tileset Data 4", ROMX, BANK[TILESETS_4] INCLUDE "tilesets/data_4.asm" -INCBIN "baserom.gbc",$329f0,$333f0 - $329f0 - SECTION "bankD", ROMX, BANK[$D] @@ -71921,7 +71868,7 @@ SECTION "bank2C", ROMX, BANK[$2C] INCLUDE "maps/blockdata_3.asm" -SECTION "bank2D", ROMX, BANK[$2D] +SECTION "Tileset Data 5", ROMX, BANK[TILESETS_5] INCLUDE "tilesets/data_5.asm" @@ -74533,7 +74480,7 @@ INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" -SECTION "bank37", ROMX, BANK[$37] +SECTION "Tileset Data 6", ROMX, BANK[TILESETS_6] INCLUDE "tilesets/data_6.asm" @@ -100099,7 +100046,7 @@ Function1df220: ; 1df220 ; 1df238 -SECTION "bank78", ROMX, BANK[$78] +SECTION "Tileset Data 8", ROMX, BANK[TILESETS_8] INCLUDE "tilesets/data_8.asm" |