mirror of https://github.com/zeldaret/tmc.git
Dump tileset headers and one tileset image
This commit is contained in:
parent
ae5ecd017a
commit
c63a859528
|
@ -9,4 +9,16 @@
|
|||
.2byte \tileset_id
|
||||
.endm
|
||||
|
||||
.macro tileset_tiles src_offset, dest, size, compressed, terminator=0
|
||||
.4byte (!(\terminator) << 0x1F) | (\src_offset)
|
||||
.4byte \dest
|
||||
.4byte (\compressed << 0x1F) | (\size)
|
||||
.endm
|
||||
|
||||
.macro tileset_palette_set id, terminator=0
|
||||
.4byte (!(\terminator) << 0x1F) | (\id)
|
||||
.4byte 0x0
|
||||
.4byte 0x0
|
||||
.endm
|
||||
|
||||
.endif @ GUARD_ASM_MACROS_MAP_INC
|
||||
|
|
3486
data/data_08100CD4.s
3486
data/data_08100CD4.s
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -7633,16 +7633,13 @@ gUnk_08324AE4:: @ 08324AE4
|
|||
.incbin "baserom.gba", 0x324AE4, 0x000018F
|
||||
|
||||
gUnk_08324C73:: @ 08324C73
|
||||
.incbin "baserom.gba", 0x324C73, 0x00007FA
|
||||
.incbin "baserom.gba", 0x324C73, 0x0000241
|
||||
|
||||
gUnk_0832546D:: @ 0832546D
|
||||
.incbin "baserom.gba", 0x32546D, 0x000041B
|
||||
gUnk_08324EB4:: @ 08324EB4
|
||||
.incbin "data/tilesets/minish_woods/tiles_bottom.4bpp.lz"
|
||||
|
||||
gUnk_08325888:: @ 08325888
|
||||
.incbin "baserom.gba", 0x325888, 0x00010E9
|
||||
|
||||
gUnk_08326971:: @ 08326971
|
||||
.incbin "baserom.gba", 0x326971, 0x0002C90
|
||||
gUnk_08327B08:: @ 08327B08
|
||||
.incbin "baserom.gba", 0x327B08, 0x0001AF9
|
||||
|
||||
gUnk_08329601:: @ 08329601
|
||||
.incbin "baserom.gba", 0x329601, 0x00053C2
|
||||
|
|
|
@ -154,7 +154,7 @@ gAreaRoomHeaders_CastorWildsDigCave:: @ 0811C7AE
|
|||
room_header 0x00, 0x00, 0x3f0, 0x3c0, 0
|
||||
.2byte 0xFFFF
|
||||
|
||||
gAreaRoomHeaders_OuterFoW:: @ 0811C7BA
|
||||
gAreaRoomHeaders_OuterFortressOfWinds:: @ 0811C7BA
|
||||
room_header 0x00, 0x00, 0x3b0, 0xd0, 0
|
||||
room_header 0x00, 0x20, 0x3b0, 0x140, 0
|
||||
room_header 0x00, 0x38, 0x3b0, 0xd0, 0
|
||||
|
@ -1044,7 +1044,7 @@ gAreaRoomHeaders:: @ 0811E214
|
|||
.4byte gAreaRoomHeaders_FestivalTown @ 0x15
|
||||
.4byte gAreaRoomHeaders_VeilFallsDigCave @ 0x16
|
||||
.4byte gAreaRoomHeaders_CastorWildsDigCave @ 0x17
|
||||
.4byte gAreaRoomHeaders_OuterFoW @ 0x18
|
||||
.4byte gAreaRoomHeaders_OuterFortressOfWinds @ 0x18
|
||||
.4byte gAreaRoomHeaders_HyliaDigCaves @ 0x19
|
||||
.4byte gAreaRoomHeaders_VeilFallsTop @ 0x1A
|
||||
.4byte 0x0 @ 0x1B
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
After Width: | Height: | Size: 9.4 KiB |
|
@ -917,8 +917,10 @@ SECTIONS {
|
|||
data/data_080D5360.o(.rodata);
|
||||
src/mainLoop.o(.rodata);
|
||||
data/data_08100CD4.o(.rodata);
|
||||
src/manager/managerB.o(.rodata);
|
||||
data/data_0810821C.o(.rodata);
|
||||
data/tileset_headers.o(.rodata);
|
||||
data/data_081026AC.o(.rodata);
|
||||
src/manager/managerB.o(.rodata);
|
||||
data/data_0810821C.o(.rodata);
|
||||
src/item.o(.rodata);
|
||||
data/data_0811BD44.o(.rodata);
|
||||
data/room_headers.o(.rodata);
|
||||
|
|
|
@ -8,15 +8,15 @@ extern u8 gUnk_08324AE4;
|
|||
|
||||
void sub_0807C960(void* dest, u32 offset)
|
||||
{
|
||||
void* temp;
|
||||
void* src;
|
||||
|
||||
if (offset != -1) {
|
||||
temp = &gUnk_08324AE4 + (offset & 0x7fffffff);
|
||||
src = &gUnk_08324AE4 + (offset & 0x7fffffff);
|
||||
if ((u32)dest >> 0x18 == 6) {
|
||||
LZ77UnCompVram(temp, (void *)dest);
|
||||
LZ77UnCompVram(src, (void *)dest);
|
||||
}
|
||||
else {
|
||||
LZ77UnCompWram(temp, (void *)dest);
|
||||
LZ77UnCompWram(src, (void *)dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue