diff --git a/Makefile b/Makefile index f836c6ee..2ca73284 100755 --- a/Makefile +++ b/Makefile @@ -273,6 +273,7 @@ $(call DEFINE_SECTION_FILES,audio,DEFINE_BINARY_FILES) $(call DEFINE_SECTION_FILES,bin,DEFINE_BINARY_FILES) $(call DEFINE_SECTION_FILES,fonts,DEFINE_JSON_AND_BINARY_FILES) $(call DEFINE_SECTION_FILES,ids,DEFINE_BINARY_FILES) +$(call DEFINE_SECTION_FILES,levels,DEFINE_BINARY_FILES) $(call DEFINE_SECTION_FILES,levels/headers,DEFINE_JSON_FILES) $(call DEFINE_SECTION_FILES,levels/models,DEFINE_COMPRESSED_BINARY_FILES) $(call DEFINE_SECTION_FILES,levels/names,DEFINE_JSON_FILES) @@ -411,6 +412,7 @@ $(eval $(call CREATE_BINARY_ASSET_TARGET,bin,Copying Bin Binary)) $(eval $(call CREATE_BINARY_ASSET_TARGET,fonts,Copying Fonts Binary)) $(eval $(call CREATE_JSON_ASSET_TARGET,fonts,Building Fonts)) $(eval $(call CREATE_BINARY_ASSET_TARGET,ids,Copying IDs Binary)) +$(eval $(call CREATE_BINARY_ASSET_TARGET,levels,Copying Levels Binary)) $(eval $(call CREATE_JSON_ASSET_TARGET,levels/headers,Building Level Header)) $(eval $(call CREATE_COMPRESSED_ASSET_TARGET,levels/models,Compressing Level Model Binary)) $(eval $(call CREATE_JSON_ASSET_TARGET,levels/names,Building Level Name)) diff --git a/asm/assets/assets.s b/asm/assets/assets.s index c85bfcc1..b0776187 100755 --- a/asm/assets/assets.s +++ b/asm/assets/assets.s @@ -24,7 +24,7 @@ .word ASSET_MISC_TABLE - ASSETS_START .word ASSET_HUD_ELEMENT_IDS - ASSETS_START .word ASSET_MENU_ELEMENT_IDS - ASSETS_START -.word ASSET_UNKNOWN_19 - ASSETS_START +.word ASSET_WEATHER_PARTICLES - ASSETS_START .word ASSET_LEVEL_OBJECT_MAPS_TABLE - ASSETS_START .word ASSET_LEVEL_OBJECT_MAPS - ASSETS_START .word ASSET_LEVEL_HEADERS_TABLE - ASSETS_START @@ -8704,12 +8704,12 @@ glabel ASSET_MENU_ELEMENT_IDS .incbin "./build/us_1.0/ids/menu_element_ids.bin" glabel ASSET_MENU_ELEMENT_IDS_END -/********** ASSET_UNKNOWN_19 **********/ +/********** ASSET_WEATHER_PARTICLES **********/ .balign 16 -glabel ASSET_UNKNOWN_19 -.incbin "./build/us_1.0/bin/unknown_table.bin" -glabel ASSET_UNKNOWN_19_END +glabel ASSET_WEATHER_PARTICLES +.incbin "./build/us_1.0/levels/weather_particles.bin" +glabel ASSET_WEATHER_PARTICLES_END /********** ASSET_LEVEL_OBJECT_MAPS_TABLE **********/ diff --git a/extract-ver/us_1.0.config.json b/extract-ver/us_1.0.config.json index 53e74fb5..d88ecb92 100755 --- a/extract-ver/us_1.0.config.json +++ b/extract-ver/us_1.0.config.json @@ -556,10 +556,10 @@ "filenames": ["menu_element_ids"] }, { - "build-id": "ASSET_UNKNOWN_19", + "build-id": "ASSET_WEATHER_PARTICLES", "type": "Binary", - "folder": "bin", - "filenames": ["unknown_table"] + "folder": "levels", + "filenames": ["weather_particles"] }, { "build-id": "ASSET_LEVEL_OBJECT_MAPS_TABLE", diff --git a/include/asset_enums.h b/include/asset_enums.h index 5a7e746a..bf9f0f2a 100644 --- a/include/asset_enums.h +++ b/include/asset_enums.h @@ -25,7 +25,7 @@ typedef enum { ASSET_MISC_TABLE, ASSET_HUD_ELEMENT_IDS, ASSET_MENU_ELEMENT_IDS, - ASSET_UNKNOWN_19, + ASSET_WEATHER_PARTICLES, ASSET_LEVEL_OBJECT_MAPS_TABLE, ASSET_LEVEL_OBJECT_MAPS, ASSET_LEVEL_HEADERS_TABLE, diff --git a/src/game.c b/src/game.c index e6d39367..10af0c19 100644 --- a/src/game.c +++ b/src/game.c @@ -20,7 +20,7 @@ #include "printf.h" #include "thread0_epc.h" #include "thread30.h" -#include "unknown_0ABDF0.h" +#include "weather.h" #include "audio.h" #include "objects.h" #include "camera.h" diff --git a/src/object_functions.c b/src/object_functions.c index 04b6ab34..047d74f5 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -10,7 +10,7 @@ #include "video.h" #include "camera.h" #include "menu.h" // For cheats -#include "unknown_0ABDF0.h" +#include "weather.h" #include "racer.h" #include "game.h" #include "audio.h" diff --git a/src/unknown_0ABDF0.c b/src/weather.c similarity index 99% rename from src/unknown_0ABDF0.c rename to src/weather.c index 1507f76c..c03ca37b 100644 --- a/src/unknown_0ABDF0.c +++ b/src/weather.c @@ -1,7 +1,7 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800AB1F0 */ -#include "unknown_0ABDF0.h" +#include "weather.h" #include "types.h" #include "macros.h" #include "structs.h" @@ -183,7 +183,7 @@ void func_800AB1F0(void) { D_800E2A84 = 1; D_800E2A88 = 0; if (D_800E291C == NULL) { - D_800E291C = load_asset_section_from_rom(ASSET_UNKNOWN_19); + D_800E291C = load_asset_section_from_rom(ASSET_WEATHER_PARTICLES); D_800E2920 = 0; while ((s32)D_800E291C[D_800E2920] != -1) { D_800E2920++; diff --git a/src/unknown_0ABDF0.h b/src/weather.h similarity index 100% rename from src/unknown_0ABDF0.h rename to src/weather.h