mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-15 22:40:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split up gAssets

Browse Source
This commit is contained in:
octorock
2021-10-27 00:39:21 +02:00
parent 415f2b0618
commit 1eb15e495a
5 changed files with 20859 additions and 5179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets.json
+11128 -55
View File
File diff suppressed because it is too large Load Diff
data/assets.s
+4627
View File
File diff suppressed because it is too large Load Diff
data/enums.s
+5101 -5098
View File
File diff suppressed because it is too large Load Diff
data/gfx_08324AE4.s
+2 -25
View File
@@ -5,33 +5,10 @@
.align 2
gAssets:: @ 08324AE4
.incbin "data_08132B30/gAssets.bin"
.incbin "tilesets/gTileset_MinishWoods_0_0.4bpp.lz"
.incbin "tilesets/gTileset_MinishWoods_0_1.4bpp.lz"
.incbin "tilesets/gTileset_MinishWoods_0_2.4bpp.lz"
.incbin "data_08132B30/gAssets_1.bin"
.include "data/assets.s"
.align 2
@ TODO EU differs from here
.ifdef EU
.incbin "data_08132B30/gAssets_2_EU.bin"
.else
.incbin "data_08132B30/gAssets_3_USA-JP-DEMO_USA-DEMO_JP.bin"
@ TODO JP differs from here
.ifdef JP
.incbin "data_08132B30/gAssets_4_JP.bin"
.else
@ TODO JP differs from here
.ifdef DEMO_JP
.incbin "data_08132B30/gAssets_5_DEMO_JP.bin"
.else
.incbin "data_08132B30/gAssets_6_USA-DEMO_USA.bin"
.endif
.endif
.endif
@ TODO JP and EU differ to here
gGlobalGfxAndPalettes:: @ 085A2E80
.incbin "data_08132B30/gGlobalGfxAndPalettes.bin"
src/manager/manager38.c
+1 -1
View File
@@ -28,4 +28,4 @@ void sub_0805E0C0(Entity* this) {
void sub_0805E0F4(Entity* this) {
this->actionDelay = 0;
}
}