pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

clean up some tileset sections

Browse Source 
also found unused metatile/collision data for a 128-block tileset
This commit is contained in:
yenatch 2013-12-20 21:16:57 -05:00
parent cabf0a5b87
commit d4074dd385
8 changed files with 90 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contents.asm
View File

@ -1,5 +1,17 @@
; Doubles as bank constants. ; Doubles as bank constants.
; main.o
ROOFS EQU $7
TILESETS_1 EQU $6
TILESETS_2 EQU $7
TILESETS_3 EQU $8
TILESETS_4 EQU $C
TILESETS_5 EQU $2D
TILESETS_6 EQU $37
TILESETS_7 EQU $77
TILESETS_8 EQU $78
; stats/egg_moves.o ; stats/egg_moves.o

75
main.asm
View File

@ -27130,68 +27130,17 @@ Function1746c: ; 1746c
INCBIN "baserom.gbc",$1749c,$174ba - $1749c INCBIN "baserom.gbc",$1749c,$174ba - $1749c
SECTION "bank6", ROMX, BANK[$6] SECTION "Tileset Data 1", ROMX, BANK[TILESETS_1]
INCLUDE "tilesets/data_1.asm" INCLUDE "tilesets/data_1.asm"
SECTION "bank7", ROMX, BANK[$7] SECTION "Roofs", ROMX, BANK[ROOFS]
LoadMapGroupRoof: ; 1c000 INCLUDE "tilesets/roofs.asm"
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 SECTION "Tileset Data 2", ROMX, BANK[TILESETS_2]
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/data_2.asm" INCLUDE "tilesets/data_2.asm"
@ -27408,11 +27357,12 @@ Function20168: ; 20168 (8:4168)
INCBIN "baserom.gbc",$2017c,$20181 - $2017c INCBIN "baserom.gbc",$2017c,$20181 - $2017c
SECTION "Tileset Data 3", ROMX, BANK[TILESETS_3]
INCLUDE "tilesets/data_3.asm" INCLUDE "tilesets/data_3.asm"
SECTION "bank9", ROMX, BANK[$9] SECTION "bank9", ROMX, BANK[$9]
INCBIN "baserom.gbc",$24000,$2400e - $24000 INCBIN "baserom.gbc",$24000,$2400e - $24000
@ -37333,13 +37283,10 @@ FillBox: ; 2ef6e
; 2ef9f ; 2ef9f
SECTION "Tileset Data 4", ROMX, BANK[TILESETS_4]
SECTION "bankC", ROMX, BANK[$C]
INCLUDE "tilesets/data_4.asm" INCLUDE "tilesets/data_4.asm"
INCBIN "baserom.gbc",$329f0,$333f0 - $329f0
SECTION "bankD", ROMX, BANK[$D] SECTION "bankD", ROMX, BANK[$D]
@ -71921,7 +71868,7 @@ SECTION "bank2C", ROMX, BANK[$2C]
INCLUDE "maps/blockdata_3.asm" INCLUDE "maps/blockdata_3.asm"
SECTION "bank2D", ROMX, BANK[$2D] SECTION "Tileset Data 5", ROMX, BANK[TILESETS_5]
INCLUDE "tilesets/data_5.asm" INCLUDE "tilesets/data_5.asm"
@ -74533,7 +74480,7 @@ INCLUDE "gfx/pics/unown_frame_pointers.asm"
INCLUDE "gfx/pics/unown_frames.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" INCLUDE "tilesets/data_6.asm"
@ -100099,7 +100046,7 @@ Function1df220: ; 1df220
; 1df238 ; 1df238
SECTION "bank78", ROMX, BANK[$78] SECTION "Tileset Data 8", ROMX, BANK[TILESETS_8]
INCLUDE "tilesets/data_8.asm" INCLUDE "tilesets/data_8.asm"

4
tilesets/data_2.asm
View File

@ -52,11 +52,11 @@ INCBIN "gfx/tilesets/24.lz"
Tileset24Meta: ; 0x1ee1c Tileset24Meta: ; 0x1ee1c
Tileset30Meta: ; 0x1ee1c Tileset30Meta: ; 0x1ee1c
INCBIN "tilesets/30_metatiles.bin" INCBIN "tilesets/24_metatiles.bin"
; 0x1f21c ; 0x1f21c
Tileset24Coll: ; 0x1f21c Tileset24Coll: ; 0x1f21c
Tileset30Coll: ; 0x1f21c Tileset30Coll: ; 0x1f21c
INCBIN "tilesets/30_collision.bin" INCBIN "tilesets/24_collision.bin"
; 0x1f31c ; 0x1f31c

8
tilesets/data_4.asm
View File

@ -50,3 +50,11 @@ Tileset30GFX: ; 0x326b0
INCBIN "gfx/tilesets/30.lz" INCBIN "gfx/tilesets/30.lz"
; 0x329f0 ; 0x329f0
UnusedTileset30Meta: ; 0x329f0
INCBIN "tilesets/unused_30_metatiles.bin"
; 0x331f0
UnusedTileset30Coll: ; 0x331f0
INCBIN "tilesets/unused_30_collision.bin"
; 0x333f0

2
tilesets/data_7.asm
View File

@ -4,7 +4,7 @@ Tileset33GFX: ; 0x1dc5a1
Tileset34GFX: ; 0x1dc5a1 Tileset34GFX: ; 0x1dc5a1
Tileset35GFX: ; 0x1dc5a1 Tileset35GFX: ; 0x1dc5a1
Tileset36GFX: ; 0x1dc5a1 Tileset36GFX: ; 0x1dc5a1
INCBIN "gfx/tilesets/36.lz" INCBIN "gfx/tilesets/26.lz"
; 0x1dd1a9 ; 0x1dd1a9
Tileset26Meta: ; 0x1dd1a9 Tileset26Meta: ; 0x1dd1a9

56
tilesets/roofs.asm Normal file
View File

@ -0,0 +1,56 @@
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

BIN
tilesets/unused_30_collision.bin Normal file
View File

Binary file not shown.

BIN
tilesets/unused_30_metatiles.bin Normal file
View File

Binary file not shown.