diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-07-01 23:42:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-01 17:42:14 -0600 |
| commit | 7937896598f3df46eb78c158bde787bc4f12ad7f (patch) | |
| tree | 876548daaec2f8a5bb284374d834abcf9aad15b9 /yamls | |
| parent | b57afa83b42bb14e526043be4ca9f6e322788edb (diff) | |
make some texture more flexible and editable + port documentation from the decomp + fix some bug (#309)
* support a more flexible background
* remove useless function
* rename of some font
* experimental png
* migrate to the new initdata
* fix skybox and adjust minimap
* format in audio
* simplify player render
* simplify shell render and support custom texture of shell
* clean redshell texture
* format and multiple fix
* some update of name
* allow change icon of character
* more rename
* continue rename
* more documentation and simplification
* change lus and continue rename
* continue rename
* few fix for asan
* fix ghost
* Update menu_items.c
* fix mac error
* some test of tweak for texture
* some tweak
* some button constant
* finish fix ghost
* Update menu_items.c
* Update render_objects.c
* Update menu_items.c
* Update libultraship
* Update libultraship
* Delete valgrind.report
* Update libultraship
* callgrind benchmark
* Update valgrind_callgrind.sh
* fix animation
* some rename
* remove useless submodule
* Update libultraship
* fix assets
* fix mistake
* fix more mistake
* Update menu_items.c
* sync more rename with the decom + fix review
* fix a mistake
* fix more mistake
* re add the limit of fps
* fix some hd texture and minimap
* fix a name
* Update menu_items.c
* fix a regression
* fix some segment 5 texture (not all)
* Update camera.c
* improve performance of custom sprite
* fix flatten bug and add documentation on player vertex
* Update render_player.c
* fix data menu
* fix trophy for 50 and 150
* Update memory.c
* Update code_80057C60.c
* fix ghost
* fix boo tlut
* fix a mistake in yaml
* fix yaml
* Update common_data.yml
* add comment for segment 3
* allow even more change in texture
* Update common_data.yml
* Update update.inc.c
* Update camera.c
* Update some_data.c
* wip changes
* Update other_textures.yml
* More changes
* Update update_objects.c
* Fix compile
* Update memory.c
* Update memory.c
---------
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'yamls')
| -rw-r--r-- | yamls/us/banshee_boardwalk_data.yml | 4 | ||||
| -rw-r--r-- | yamls/us/boo_frames.yml | 58 | ||||
| -rw-r--r-- | yamls/us/bowsers_castle_data.yml | 6 | ||||
| -rw-r--r-- | yamls/us/common_data.yml | 86 | ||||
| -rw-r--r-- | yamls/us/frappe_snowland_data.yml | 3 | ||||
| -rw-r--r-- | yamls/us/koopa_troopa_beach_data.yml | 7 | ||||
| -rw-r--r-- | yamls/us/luigi_raceway_data.yml | 2 | ||||
| -rw-r--r-- | yamls/us/moo_moo_farm_data.yml | 7 | ||||
| -rw-r--r-- | yamls/us/other_textures.yml | 319 | ||||
| -rw-r--r-- | yamls/us/player_selection.yml | 20 | ||||
| -rw-r--r-- | yamls/us/texture_data_2.yml | 192 | ||||
| -rw-r--r-- | yamls/us/texture_tkmk00.yml | 134 |
12 files changed, 500 insertions, 338 deletions
diff --git a/yamls/us/banshee_boardwalk_data.yml b/yamls/us/banshee_boardwalk_data.yml index ee3ad7579..d7c15de03 100644 --- a/yamls/us/banshee_boardwalk_data.yml +++ b/yamls/us/banshee_boardwalk_data.yml @@ -550,6 +550,7 @@ gTextureBat1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat2: symbol: gTextureBat2 type: texture @@ -558,6 +559,7 @@ gTextureBat2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat3: symbol: gTextureBat3 type: texture @@ -566,6 +568,7 @@ gTextureBat3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut gTextureBat4: symbol: gTextureBat4 type: texture @@ -574,6 +577,7 @@ gTextureBat4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_banshee_boardwalk_bat_tlut d_course_banshee_boardwalk_texture: symbol: d_course_banshee_boardwalk_texture type: texture diff --git a/yamls/us/boo_frames.yml b/yamls/us/boo_frames.yml index 2c563b000..522659d86 100644 --- a/yamls/us/boo_frames.yml +++ b/yamls/us/boo_frames.yml @@ -19,7 +19,7 @@ gTextureBoo01: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo02: symbol: gTextureBoo02 @@ -27,7 +27,7 @@ gTextureBoo02: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo03: symbol: gTextureBoo03 @@ -35,7 +35,7 @@ gTextureBoo03: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo04: symbol: gTextureBoo04 @@ -43,7 +43,7 @@ gTextureBoo04: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo05: symbol: gTextureBoo05 @@ -51,7 +51,7 @@ gTextureBoo05: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo06: symbol: gTextureBoo06 @@ -59,7 +59,7 @@ gTextureBoo06: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo07: symbol: gTextureBoo07 @@ -67,7 +67,7 @@ gTextureBoo07: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo08: symbol: gTextureBoo08 @@ -75,7 +75,7 @@ gTextureBoo08: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo09: symbol: gTextureBoo09 @@ -83,7 +83,7 @@ gTextureBoo09: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo10: symbol: gTextureBoo10 @@ -91,7 +91,7 @@ gTextureBoo10: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo11: symbol: gTextureBoo11 @@ -99,7 +99,7 @@ gTextureBoo11: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo12: symbol: gTextureBoo12 @@ -107,7 +107,7 @@ gTextureBoo12: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo13: symbol: gTextureBoo13 @@ -115,7 +115,7 @@ gTextureBoo13: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo14: symbol: gTextureBoo14 @@ -123,7 +123,7 @@ gTextureBoo14: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo15: symbol: gTextureBoo15 @@ -131,7 +131,7 @@ gTextureBoo15: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo16: symbol: gTextureBoo16 @@ -139,7 +139,7 @@ gTextureBoo16: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo17: symbol: gTextureBoo17 @@ -147,7 +147,7 @@ gTextureBoo17: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo18: symbol: gTextureBoo18 @@ -155,7 +155,7 @@ gTextureBoo18: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo19: symbol: gTextureBoo19 @@ -163,7 +163,7 @@ gTextureBoo19: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo20: symbol: gTextureBoo20 @@ -171,7 +171,7 @@ gTextureBoo20: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo21: symbol: gTextureBoo21 @@ -179,7 +179,7 @@ gTextureBoo21: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo22: symbol: gTextureBoo22 @@ -187,7 +187,7 @@ gTextureBoo22: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo23: symbol: gTextureBoo23 @@ -195,7 +195,7 @@ gTextureBoo23: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo24: symbol: gTextureBoo24 @@ -203,7 +203,7 @@ gTextureBoo24: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo25: symbol: gTextureBoo25 @@ -211,7 +211,7 @@ gTextureBoo25: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo26: symbol: gTextureBoo26 @@ -219,7 +219,7 @@ gTextureBoo26: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo27: symbol: gTextureBoo27 @@ -227,7 +227,7 @@ gTextureBoo27: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo28: symbol: gTextureBoo28 @@ -235,7 +235,7 @@ gTextureBoo28: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8 gTextureBoo29: symbol: gTextureBoo29 @@ -243,5 +243,5 @@ gTextureBoo29: width: 48 height: 40 type: texture - tlut: gTLUTBoo + tlut: d_course_banshee_boardwalk_boo_tlut format: ci8
\ No newline at end of file diff --git a/yamls/us/bowsers_castle_data.yml b/yamls/us/bowsers_castle_data.yml index f4b77099d..8559d5cb5 100644 --- a/yamls/us/bowsers_castle_data.yml +++ b/yamls/us/bowsers_castle_data.yml @@ -480,6 +480,7 @@ gTextureThwompFace1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace2: symbol: gTextureThwompFace2 type: texture @@ -488,6 +489,7 @@ gTextureThwompFace2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace3: symbol: gTextureThwompFace3 type: texture @@ -496,6 +498,7 @@ gTextureThwompFace3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace4: symbol: gTextureThwompFace4 type: texture @@ -504,6 +507,7 @@ gTextureThwompFace4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace5: symbol: gTextureThwompFace5 type: texture @@ -512,6 +516,7 @@ gTextureThwompFace5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut gTextureThwompFace6: symbol: gTextureThwompFace6 type: texture @@ -520,6 +525,7 @@ gTextureThwompFace6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_bowsers_castle_thwomp_tlut d_course_bowsers_castle_thwomp_model1: symbol: d_course_bowsers_castle_thwomp_model1 type: vtx diff --git a/yamls/us/common_data.yml b/yamls/us/common_data.yml index 8a773c16e..60ad277cd 100644 --- a/yamls/us/common_data.yml +++ b/yamls/us/common_data.yml @@ -3,14 +3,14 @@ - [0x0D, 0x132B50] header: code: - - '#include <macros.h>' - - '#include <defines.h>' - - '#include <assets/common_data.h>' + - "#include <macros.h>" + - "#include <defines.h>" + - "#include <assets/common_data.h>" header: - - '#include <libultra/gbi.h>' - - '#include <libultraship.h>' - - '#include <common_structs.h>' - - '#include <align_asset_macro.h>' + - "#include <libultra/gbi.h>" + - "#include <libultraship.h>" + - "#include <common_structs.h>" + - "#include <align_asset_macro.h>" tables: common_texture_hud_place: range: [0xD258, 0x14258] @@ -56,8 +56,8 @@ common_texture_particle_fire: ctype: u16 offset: 0x200 size: 0x1000 - width: 16 - height: 16 + width: 32 + height: 64 format: RGBA16 D_0D001200: symbol: D_0D001200 @@ -573,8 +573,8 @@ common_tlut_debug_font: size: 0x20 type: texture ctype: u16 - colors: 32 - height: 32 + colors: 4 + height: 4 format: tlut common_texture_debug_font: symbol: common_texture_debug_font @@ -2253,3 +2253,67 @@ common_texture_minimap_progress_dot: height: 8 type: texture format: rgba16 +common_texture_minimap_mario: + symbol: common_texture_minimap_mario + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_luigi: + symbol: common_texture_minimap_luigi + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_yoshi: + symbol: common_texture_minimap_yoshi + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_toad: + symbol: common_texture_minimap_toad + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_dk: + symbol: common_texture_minimap_dk + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_wario: + symbol: common_texture_minimap_wario + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_peach: + symbol: common_texture_minimap_peach + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 +common_texture_minimap_bowser: + symbol: common_texture_minimap_bowser + offset: 0x2D0D8 + ctype: u16 + width: 8 + height: 8 + type: texture + format: rgba16 diff --git a/yamls/us/frappe_snowland_data.yml b/yamls/us/frappe_snowland_data.yml index 4e53e2b1a..aee8f92b1 100644 --- a/yamls/us/frappe_snowland_data.yml +++ b/yamls/us/frappe_snowland_data.yml @@ -308,6 +308,7 @@ d_course_frappe_snowland_snowman_head: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snowman_tlut d_course_frappe_snowland_snowman_body: symbol: d_course_frappe_snowland_snowman_body type: texture @@ -316,6 +317,7 @@ d_course_frappe_snowland_snowman_body: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snowman_tlut d_course_frappe_snowland_snow_tlut: symbol: d_course_frappe_snowland_snow_tlut type: texture @@ -332,6 +334,7 @@ d_course_frappe_snowland_snow: height: 32 format: ci8 ctype: u8 + tlut_symbol: d_course_frappe_snowland_snow_tlut d_course_frappe_snowland_tree_tlut: symbol: d_course_frappe_snowland_tree_tlut type: texture diff --git a/yamls/us/koopa_troopa_beach_data.yml b/yamls/us/koopa_troopa_beach_data.yml index abe4c6a6d..ecdef9a46 100644 --- a/yamls/us/koopa_troopa_beach_data.yml +++ b/yamls/us/koopa_troopa_beach_data.yml @@ -1242,6 +1242,7 @@ gTextureCrab1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab2: symbol: gTextureCrab2 type: texture @@ -1250,6 +1251,7 @@ gTextureCrab2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab3: symbol: gTextureCrab3 type: texture @@ -1258,6 +1260,7 @@ gTextureCrab3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab4: symbol: gTextureCrab4 type: texture @@ -1266,6 +1269,7 @@ gTextureCrab4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab5: symbol: gTextureCrab5 type: texture @@ -1274,6 +1278,7 @@ gTextureCrab5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab6: symbol: gTextureCrab6 type: texture @@ -1282,6 +1287,7 @@ gTextureCrab6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut gTextureCrab7: symbol: gTextureCrab7 type: texture @@ -1290,6 +1296,7 @@ gTextureCrab7: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_koopa_troopa_beach_crab_tlut d_course_koopa_troopa_beach_light1: symbol: d_course_koopa_troopa_beach_light1 type: lights diff --git a/yamls/us/luigi_raceway_data.yml b/yamls/us/luigi_raceway_data.yml index c0a16c494..db678bba4 100644 --- a/yamls/us/luigi_raceway_data.yml +++ b/yamls/us/luigi_raceway_data.yml @@ -620,7 +620,7 @@ d_course_luigi_raceway_track_waypoints: offset: 0xA6D0 count: 632 type: mk64:TRACK_PATH - d_course_luigi_raceway_basket_model_lod2: +d_course_luigi_raceway_basket_model_lod2: symbol: d_course_luigi_raceway_basket_model_lod2 type: vtx offset: 0xBA90 diff --git a/yamls/us/moo_moo_farm_data.yml b/yamls/us/moo_moo_farm_data.yml index c6ce2f67a..fc9f36a7b 100644 --- a/yamls/us/moo_moo_farm_data.yml +++ b/yamls/us/moo_moo_farm_data.yml @@ -525,6 +525,7 @@ gTextureMole1: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole2: symbol: gTextureMole2 type: texture @@ -533,6 +534,7 @@ gTextureMole2: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole3: symbol: gTextureMole3 type: texture @@ -541,6 +543,7 @@ gTextureMole3: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole4: symbol: gTextureMole4 type: texture @@ -549,6 +552,7 @@ gTextureMole4: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole5: symbol: gTextureMole5 type: texture @@ -557,6 +561,7 @@ gTextureMole5: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole6: symbol: gTextureMole6 type: texture @@ -565,6 +570,7 @@ gTextureMole6: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut gTextureMole7: symbol: gTextureMole7 type: texture @@ -573,6 +579,7 @@ gTextureMole7: height: 64 format: ci8 ctype: u8 + tlut_symbol: d_course_moo_moo_farm_mole_tlut d_course_moo_moo_farm_mole_dirt: symbol: d_course_moo_moo_farm_mole_dirt type: texture diff --git a/yamls/us/other_textures.yml b/yamls/us/other_textures.yml index 8af958165..43d683782 100644 --- a/yamls/us/other_textures.yml +++ b/yamls/us/other_textures.yml @@ -2575,8 +2575,8 @@ texture_68E2D0: offset: 0x4C360 mio0: true format: rgba16 -gTextureGreenShell0: - symbol: gTextureGreenShell0 +texture_green_shell_0: + symbol: texture_green_shell_0 type: texture mio0: true offset: 0x4CBE0 @@ -2585,8 +2585,8 @@ gTextureGreenShell0: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell1: - symbol: gTextureGreenShell1 +texture_green_shell_1: + symbol: texture_green_shell_1 type: texture mio0: true offset: 0x4CE30 @@ -2595,8 +2595,8 @@ gTextureGreenShell1: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell2: - symbol: gTextureGreenShell2 +texture_green_shell_2: + symbol: texture_green_shell_2 type: texture mio0: true offset: 0x4D080 @@ -2605,8 +2605,8 @@ gTextureGreenShell2: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell3: - symbol: gTextureGreenShell3 +texture_green_shell_3: + symbol: texture_green_shell_3 type: texture mio0: true offset: 0x4D2D8 @@ -2615,8 +2615,8 @@ gTextureGreenShell3: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell4: - symbol: gTextureGreenShell4 +texture_green_shell_4: + symbol: texture_green_shell_4 type: texture mio0: true offset: 0x4D538 @@ -2625,8 +2625,8 @@ gTextureGreenShell4: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell5: - symbol: gTextureGreenShell5 +texture_green_shell_5: + symbol: texture_green_shell_5 type: texture mio0: true offset: 0x4D790 @@ -2635,8 +2635,8 @@ gTextureGreenShell5: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell6: - symbol: gTextureGreenShell6 +texture_green_shell_6: + symbol: texture_green_shell_6 type: texture mio0: true offset: 0x4D9FC @@ -2645,8 +2645,8 @@ gTextureGreenShell6: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureGreenShell7: - symbol: gTextureGreenShell7 +texture_green_shell_7: + symbol: texture_green_shell_7 type: texture mio0: true offset: 0x4DC5C @@ -2655,8 +2655,88 @@ gTextureGreenShell7: height: 32 format: CI8 tlut_symbol: common_tlut_green_shell -gTextureBlueShell0: - symbol: gTextureBlueShell0 +texture_red_shell_0: + symbol: texture_red_shell_0 + type: texture + mio0: true + offset: 0x4CBE0 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_1: + symbol: texture_red_shell_1 + type: texture + mio0: true + offset: 0x4CE30 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_2: + symbol: texture_red_shell_2 + type: texture + mio0: true + offset: 0x4D080 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_3: + symbol: texture_red_shell_3 + type: texture + mio0: true + offset: 0x4D2D8 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_4: + symbol: texture_red_shell_4 + type: texture + mio0: true + offset: 0x4D538 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_5: + symbol: texture_red_shell_5 + type: texture + mio0: true + offset: 0x4D790 + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_6: + symbol: texture_red_shell_6 + type: texture + mio0: true + offset: 0x4D9FC + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_red_shell_7: + symbol: texture_red_shell_7 + type: texture + mio0: true + offset: 0x4DC5C + ctype: u8 + width: 32 + height: 32 + format: CI8 + tlut_symbol: common_tlut_green_shell +texture_blue_shell_0: + symbol: texture_blue_shell_0 type: texture mio0: true offset: 0x4DEB0 @@ -2665,8 +2745,8 @@ gTextureBlueShell0: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell1: - symbol: gTextureBlueShell1 +texture_blue_shell_1: + symbol: texture_blue_shell_1 type: texture mio0: true offset: 0x4E0DC @@ -2675,8 +2755,8 @@ gTextureBlueShell1: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell2: - symbol: gTextureBlueShell2 +texture_blue_shell_2: + symbol: texture_blue_shell_2 type: texture mio0: true offset: 0x4E314 @@ -2685,8 +2765,8 @@ gTextureBlueShell2: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell3: - symbol: gTextureBlueShell3 +texture_blue_shell_3: + symbol: texture_blue_shell_3 type: texture mio0: true offset: 0x4E554 @@ -2695,8 +2775,8 @@ gTextureBlueShell3: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell4: - symbol: gTextureBlueShell4 +texture_blue_shell_4: + symbol: texture_blue_shell_4 type: texture mio0: true offset: 0x4E798 @@ -2705,8 +2785,8 @@ gTextureBlueShell4: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell5: - symbol: gTextureBlueShell5 +texture_blue_shell_5: + symbol: texture_blue_shell_5 type: texture mio0: true offset: 0x4E9F0 @@ -2715,8 +2795,8 @@ gTextureBlueShell5: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell6: - symbol: gTextureBlueShell6 +texture_blue_shell_6: + symbol: texture_blue_shell_6 type: texture mio0: true offset: 0x4EC4C @@ -2725,8 +2805,8 @@ gTextureBlueShell6: height: 32 format: CI8 tlut_symbol: common_tlut_blue_shell -gTextureBlueShell7: - symbol: gTextureBlueShell7 +texture_blue_shell_7: + symbol: texture_blue_shell_7 type: texture mio0: true offset: 0x4EE88 @@ -2743,7 +2823,6 @@ question_mark_yellow: width: 32 height: 64 offset: 0x4F0C0 - mio0: true format: rgba16 gTextureTrees1: symbol: gTextureTrees1 @@ -2754,7 +2833,7 @@ gTextureTrees1: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees2: symbol: gTextureTrees2 type: texture @@ -2764,7 +2843,7 @@ gTextureTrees2: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees3: symbol: gTextureTrees3 type: texture @@ -2774,7 +2853,7 @@ gTextureTrees3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees4Left: symbol: gTextureTrees4Left type: texture @@ -2784,7 +2863,7 @@ gTextureTrees4Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees4Right: symbol: gTextureTrees4Right type: texture @@ -2794,7 +2873,7 @@ gTextureTrees4Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees5Left: symbol: gTextureTrees5Left type: texture @@ -2804,7 +2883,7 @@ gTextureTrees5Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees5Right: symbol: gTextureTrees5Right type: texture @@ -2814,7 +2893,7 @@ gTextureTrees5Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees6: symbol: gTextureTrees6 type: texture @@ -2824,7 +2903,7 @@ gTextureTrees6: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import gTextureTrees7: symbol: gTextureTrees7 type: texture @@ -2834,7 +2913,7 @@ gTextureTrees7: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTTrees + tlut_symbol: common_tlut_trees_import shrub: symbol: gTextureShrub type: texture @@ -2843,7 +2922,6 @@ shrub: width: 32 height: 32 offset: 0x50FCC - mio0: true format: rgba16 gTextureFrappeSnowlandTreeLeft: symbol: gTextureFrappeSnowlandTreeLeft @@ -2854,7 +2932,7 @@ gTextureFrappeSnowlandTreeLeft: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTFrappeSnowlandTree + tlut_symbol: d_course_frappe_snowland_tree_tlut gTextureFrappeSnowlandTreeRight: symbol: gTextureFrappeSnowlandTreeRight type: texture @@ -2864,7 +2942,7 @@ gTextureFrappeSnowlandTreeRight: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTFrappeSnowlandTree + tlut_symbol: d_course_frappe_snowland_tree_tlut gTextureCow01Left: symbol: gTextureCow01Left type: texture @@ -2874,7 +2952,7 @@ gTextureCow01Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow01Right: symbol: gTextureCow01Right type: texture @@ -2884,7 +2962,7 @@ gTextureCow01Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow02Left: symbol: gTextureCow02Left type: texture @@ -2894,7 +2972,7 @@ gTextureCow02Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow02Right: symbol: gTextureCow02Right type: texture @@ -2904,7 +2982,7 @@ gTextureCow02Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow03Left: symbol: gTextureCow03Left type: texture @@ -2914,7 +2992,7 @@ gTextureCow03Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow03Right: symbol: gTextureCow03Right type: texture @@ -2924,7 +3002,7 @@ gTextureCow03Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow04Left: symbol: gTextureCow04Left type: texture @@ -2934,7 +3012,7 @@ gTextureCow04Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow04Right: symbol: gTextureCow04Right type: texture @@ -2944,7 +3022,7 @@ gTextureCow04Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow05Left: symbol: gTextureCow05Left type: texture @@ -2954,7 +3032,7 @@ gTextureCow05Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCow05Right: symbol: gTextureCow05Right type: texture @@ -2964,7 +3042,7 @@ gTextureCow05Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCow + tlut_symbol: d_course_moo_moo_farm_cow_tlut gTextureCactus1Left: symbol: gTextureCactus1Left type: texture @@ -2974,7 +3052,7 @@ gTextureCactus1Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus1Right: symbol: gTextureCactus1Right type: texture @@ -2984,7 +3062,7 @@ gTextureCactus1Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus2Left: symbol: gTextureCactus2Left type: texture @@ -2994,7 +3072,7 @@ gTextureCactus2Left: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus2Right: symbol: gTextureCactus2Right type: texture @@ -3004,7 +3082,7 @@ gTextureCactus2Right: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureCactus3: symbol: gTextureCactus3 type: texture @@ -3014,7 +3092,7 @@ gTextureCactus3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTCactus + tlut_symbol: d_course_kalimari_desert_tree_tlut gTextureFinishLineBanner1: symbol: gTextureFinishLineBanner1 type: texture @@ -3104,7 +3182,7 @@ gTexturePiranhaPlant1: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant2: symbol: gTexturePiranhaPlant2 type: texture @@ -3114,7 +3192,7 @@ gTexturePiranhaPlant2: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant3: symbol: gTexturePiranhaPlant3 type: texture @@ -3124,7 +3202,7 @@ gTexturePiranhaPlant3: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant4: symbol: gTexturePiranhaPlant4 type: texture @@ -3134,7 +3212,7 @@ gTexturePiranhaPlant4: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant5: symbol: gTexturePiranhaPlant5 type: texture @@ -3144,7 +3222,7 @@ gTexturePiranhaPlant5: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant6: symbol: gTexturePiranhaPlant6 type: texture @@ -3154,7 +3232,7 @@ gTexturePiranhaPlant6: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant7: symbol: gTexturePiranhaPlant7 type: texture @@ -3164,7 +3242,7 @@ gTexturePiranhaPlant7: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant8: symbol: gTexturePiranhaPlant8 type: texture @@ -3174,7 +3252,7 @@ gTexturePiranhaPlant8: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut gTexturePiranhaPlant9: symbol: gTexturePiranhaPlant9 type: texture @@ -3184,7 +3262,7 @@ gTexturePiranhaPlant9: width: 32 height: 64 format: CI8 - tlut_symbol: gTLUTMarioRacewayPiranhaPlant + tlut_symbol: d_course_mario_raceway_piranha_plant_tlut texture_6997E0: symbol: gTexture6997E0 type: texture @@ -3203,7 +3281,7 @@ gTextureDksJungleParkwayKiwanoFruit1: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut gTextureDksJungleParkwayKiwanoFruit2: symbol: gTextureDksJungleParkwayKiwanoFruit2 type: texture @@ -3213,7 +3291,7 @@ gTextureDksJungleParkwayKiwanoFruit2: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut gTextureDksJungleParkwayKiwanoFruit3: symbol: gTextureDksJungleParkwayKiwanoFruit3 type: texture @@ -3223,7 +3301,7 @@ gTextureDksJungleParkwayKiwanoFruit3: width: 32 height: 32 format: CI8 - tlut_symbol: gTLUTDksJungleParkwayKiwanoFruit + tlut_symbol: d_course_dks_jungle_parkway_kiwano_tlut kart_shadow: symbol: gTextureKartShadow type: texture @@ -3251,8 +3329,8 @@ texture_69B140: height: 32 offset: 0x591D0 format: i8 -texture_69B378: - symbol: gTexture69B378 +gGrassParticle: + symbol: gGrassParticle type: texture mio0: true ctype: u16 @@ -3332,8 +3410,8 @@ texture_69C354: height: 32 offset: 0x5A3E4 format: ia8 -texture_69C4E4: - symbol: gTexture69C4E4 +gGroundDust: + symbol: gGroundDust type: texture mio0: true ctype: u16 @@ -4656,7 +4734,6 @@ exhaust_0: width: 32 height: 96 offset: 0xD5B14 - mio0: true format: ia8 exhaust_1: symbol: gTextureExhaust1 @@ -4666,7 +4743,6 @@ exhaust_1: width: 32 height: 96 offset: 0xD5F90 - mio0: true format: ia8 exhaust_2: symbol: gTextureExhaust2 @@ -4676,7 +4752,6 @@ exhaust_2: width: 32 height: 96 offset: 0xD6418 - mio0: true format: ia8 exhaust_3: symbol: gTextureExhaust3 @@ -4686,7 +4761,6 @@ exhaust_3: width: 32 height: 128 offset: 0xD690C - mio0: true format: ia8 exhaust_4: symbol: gTextureExhaust4 @@ -4696,7 +4770,6 @@ exhaust_4: width: 32 height: 128 offset: 0xD6CD4 - mio0: true format: ia8 exhaust_5: symbol: gTextureExhaust5 @@ -4706,20 +4779,18 @@ exhaust_5: width: 32 height: 128 offset: 0xD70CC - mio0: true format: ia8 logo_mario_kart_64: - symbol: gTextureLogoMarioKart64 + symbol: logo_mario_kart_64 type: texture mio0: true ctype: u32 width: 256 height: 128 offset: 0xD7510 - mio0: true format: rgba32 -gTextureCourseOutlineMarioRaceway: - symbol: gTextureCourseOutlineMarioRaceway +minimap_mario_raceway: + symbol: minimap_mario_raceway mio0: true type: texture offset: 0xDEC9C @@ -4727,8 +4798,8 @@ gTextureCourseOutlineMarioRaceway: width: 64 height: 64 format: I4 -gTextureCourseOutlineChocoMountain: - symbol: gTextureCourseOutlineChocoMountain +minimap_choco_mountain: + symbol: minimap_choco_mountain mio0: true type: texture offset: 0xDEF60 @@ -4736,8 +4807,8 @@ gTextureCourseOutlineChocoMountain: width: 64 height: 64 format: I4 -gTextureCourseOutlineBowsersCastle: - symbol: gTextureCourseOutlineBowsersCastle +minimap_bowsers_castle: + symbol: minimap_bowsers_castle mio0: true type: texture offset: 0xDF268 @@ -4745,8 +4816,8 @@ gTextureCourseOutlineBowsersCastle: width: 64 height: 64 format: I4 -gTextureCourseOutlineBansheeBoardwalk: - symbol: gTextureCourseOutlineBansheeBoardwalk +minimap_banshee_boardwalk: + symbol: minimap_banshee_boardwalk mio0: true type: texture offset: 0xDF4CC @@ -4754,8 +4825,8 @@ gTextureCourseOutlineBansheeBoardwalk: width: 64 height: 64 format: I4 -gTextureCourseOutlineYoshiValley: - symbol: gTextureCourseOutlineYoshiValley +minimap_yoshi_valley: + symbol: minimap_yoshi_valley mio0: true type: texture offset: 0xDF6C4 @@ -4763,8 +4834,8 @@ gTextureCourseOutlineYoshiValley: width: 64 height: 64 format: I4 -gTextureCourseOutlineFrappeSnowland: - symbol: gTextureCourseOutlineFrappeSnowland +minimap_frappe_snowland: + symbol: minimap_frappe_snowland mio0: true type: texture offset: 0xDFAE8 @@ -4772,8 +4843,8 @@ gTextureCourseOutlineFrappeSnowland: width: 64 height: 64 format: I4 -gTextureCourseOutlineKoopaTroopaBeach: - symbol: gTextureCourseOutlineKoopaTroopaBeach +minimap_koopa_troopa_beach: + symbol: minimap_koopa_troopa_beach mio0: true type: texture offset: 0xDFD60 @@ -4781,8 +4852,8 @@ gTextureCourseOutlineKoopaTroopaBeach: width: 64 height: 64 format: I4 -gTextureCourseOutlineRoyalRaceway: - symbol: gTextureCourseOutlineRoyalRaceway +minimap_royal_raceway: + symbol: minimap_royal_raceway mio0: true type: texture offset: 0xDFFC8 @@ -4790,8 +4861,8 @@ gTextureCourseOutlineRoyalRaceway: width: 64 height: 64 format: I4 -gTextureCourseOutlineLuigiRaceway: - symbol: gTextureCourseOutlineLuigiRaceway +minimap_luigi_raceway: + symbol: minimap_luigi_raceway mio0: true type: texture offset: 0xE02A0 @@ -4799,8 +4870,8 @@ gTextureCourseOutlineLuigiRaceway: width: 64 height: 96 format: I4 -gTextureCourseOutlineMooMooFarm: - symbol: gTextureCourseOutlineMooMooFarm +minimap_moo_moo_farm: + symbol: minimap_moo_moo_farm mio0: true type: texture offset: 0xE051C @@ -4808,8 +4879,8 @@ gTextureCourseOutlineMooMooFarm: width: 64 height: 64 format: I4 -gTextureCourseOutlineToadsTurnpike: - symbol: gTextureCourseOutlineToadsTurnpike +minimap_toads_turnpike: + symbol: minimap_toads_turnpike mio0: true type: texture offset: 0xE0754 @@ -4817,8 +4888,8 @@ gTextureCourseOutlineToadsTurnpike: width: 128 height: 64 format: I4 -gTextureCourseOutlineKalimariDesert: - symbol: gTextureCourseOutlineKalimariDesert +minimap_kalimari_desert: + symbol: minimap_kalimari_desert mio0: true type: texture offset: 0xE0A50 @@ -4826,8 +4897,8 @@ gTextureCourseOutlineKalimariDesert: width: 64 height: 96 format: I4 -gTextureCourseOutlineSherbetLand: - symbol: gTextureCourseOutlineSherbetLand +minimap_sherbet_land: + symbol: minimap_sherbet_land mio0: true type: texture offset: 0xE0DBC @@ -4835,8 +4906,8 @@ gTextureCourseOutlineSherbetLand: width: 64 height: 64 format: I4 -gTextureCourseOutlineRainbowRoad: - symbol: gTextureCourseOutlineRainbowRoad +minimap_rainbow_road: + symbol: minimap_rainbow_road mio0: true type: texture offset: 0xE10C4 @@ -4844,8 +4915,8 @@ gTextureCourseOutlineRainbowRoad: width: 64 height: 96 format: I4 -gTextureCourseOutlineWarioStadium: - symbol: gTextureCourseOutlineWarioStadium +minimap_wario_stadium: + symbol: minimap_wario_stadium mio0: true type: texture offset: 0xE1400 @@ -4853,8 +4924,8 @@ gTextureCourseOutlineWarioStadium: width: 64 height: 64 format: I4 -gTextureCourseOutlineBlockFort: - symbol: gTextureCourseOutlineBlockFort +minimap_block_fort: + symbol: minimap_block_fort mio0: true type: texture offset: 0xE16D4 @@ -4862,8 +4933,8 @@ gTextureCourseOutlineBlockFort: width: 64 height: 64 format: I4 -gTextureCourseOutlineSkyscraper: - symbol: gTextureCourseOutlineSkyscraper +minimap_skyscraper: + symbol: minimap_skyscraper mio0: true type: texture offset: 0xE1974 @@ -4871,8 +4942,8 @@ gTextureCourseOutlineSkyscraper: width: 64 height: 64 format: I4 -gTextureCourseOutlineDoubleDeck: - symbol: gTextureCourseOutlineDoubleDeck +minimap_double_deck: + symbol: minimap_double_deck mio0: true type: texture offset: 0xE1BA8 @@ -4880,8 +4951,8 @@ gTextureCourseOutlineDoubleDeck: width: 64 height: 64 format: I4 -gTextureCourseOutlineDksJungleParkway: - symbol: gTextureCourseOutlineDksJungleParkway +minimap_dks_jungle_parkway: + symbol: minimap_dks_jungle_parkway mio0: true type: texture offset: 0xE1D2C @@ -4889,8 +4960,8 @@ gTextureCourseOutlineDksJungleParkway: width: 64 height: 64 format: I4 -gTextureCourseOutlineBigDonut: - symbol: gTextureCourseOutlineBigDonut +minimap_big_donut: + symbol: minimap_big_donut mio0: true type: texture offset: 0xE2014 diff --git a/yamls/us/player_selection.yml b/yamls/us/player_selection.yml index 2dc6ed903..b57360636 100644 --- a/yamls/us/player_selection.yml +++ b/yamls/us/player_selection.yml @@ -4,13 +4,13 @@ no_compression: true header: code: - - '#include <macros.h>' - - '#include <defines.h>' - - '#include <assets/common_data.h>' + - "#include <macros.h>" + - "#include <defines.h>" + - "#include <assets/common_data.h>" header: - - '#include <libultraship.h>' - - '#include <common_structs.h>' - - '#include <align_asset_macro.h>' + - "#include <libultraship.h>" + - "#include <common_structs.h>" + - "#include <align_asset_macro.h>" mario_face_00: symbol: gTextureMarioFace00 type: texture @@ -1470,7 +1470,7 @@ cup_bronze: mio0: true format: rgba16 push_start_button: - symbol: gTexturePushStartButton + symbol: push_start_button type: texture ctype: u16 width: 159 @@ -1478,7 +1478,7 @@ push_start_button: offset: 0xB17B4 format: rgba16 copyright_1996: - symbol: gTextureCopyright1996 + symbol: copyright_1996 type: texture ctype: u16 width: 124 @@ -1517,8 +1517,8 @@ p4_border_green: height: 64 offset: 0xB9C0C format: rgba16 -small_green_triangle: - symbol: gTextureSmallGreenTriangle +texture_small_green_triangle: + symbol: texture_small_green_triangle type: texture ctype: u16 width: 12 diff --git a/yamls/us/texture_data_2.yml b/yamls/us/texture_data_2.yml index 640636545..784797b7b 100644 --- a/yamls/us/texture_data_2.yml +++ b/yamls/us/texture_data_2.yml @@ -4,12 +4,12 @@ no_compression: true header: code: - - '#include <assets/texture_data_2.h>' - - '#include <macros.h>' - - '#include <defines.h>' + - "#include <assets/texture_data_2.h>" + - "#include <macros.h>" + - "#include <defines.h>" header: - - '#include <libultraship.h>' - - '#include <align_asset_macro.h>' + - "#include <libultraship.h>" + - "#include <align_asset_macro.h>" small_letter_0: symbol: gTextureSmallFont0 type: texture @@ -667,7 +667,7 @@ tiny_font_minus: offset: 0xC5118 mio0: true format: ia16 -tiny_font_comma: +tiny_font_dot: symbol: gTextureTinyFontComma type: texture ctype: u16 @@ -1468,40 +1468,40 @@ texture_7F109C: offset: 0xC766C mio0: true format: ia16 -7F1124: - symbol: gTexture7F1124 +font_four_dote: + symbol: font_four_dote type: texture ctype: u16 width: 26 height: 16 offset: 0xC76F4 format: i4 -7F11F4: - symbol: gTexture7F11F4 +font_cc: + symbol: font_cc type: texture ctype: u16 width: 26 height: 16 offset: 0xC77C4 format: i4 -7F12C4: - symbol: gTexture7F12C4 +font_double_quote: + symbol: font_double_quote type: texture ctype: u16 width: 26 height: 16 offset: 0xC7894 format: i4 -7F1394: - symbol: gTexture7F1394 +font_exclamation_mark: + symbol: font_exclamation_mark type: texture ctype: u16 width: 26 height: 16 offset: 0xC7964 format: i4 -7F1464: - symbol: gTexture7F1464 +font_minus: + symbol: font_minus type: texture ctype: u16 width: 26 @@ -1509,15 +1509,15 @@ texture_7F109C: offset: 0xC7A34 format: i4 7F1534: - symbol: gTexture7F1534 + symbol: font_dot type: texture ctype: u16 width: 26 height: 16 offset: 0xC7B04 format: i4 -7F1604: - symbol: gTexture7F1604 +font_plus: + symbol: font_plus type: texture ctype: u16 width: 26 @@ -1525,7 +1525,7 @@ texture_7F109C: offset: 0xC7BD4 format: i4 7F16D4: - symbol: gTexture7F16D4 + symbol: font_interogation_mark type: texture ctype: u16 width: 26 @@ -1533,295 +1533,295 @@ texture_7F109C: offset: 0xC7CA4 format: i4 7F17A4: - symbol: gTexture7F17A4 + symbol: font_simple_quote type: texture ctype: u16 width: 26 height: 16 offset: 0xC7D74 format: i4 -7F1874: - symbol: gTexture7F1874 +font_number_zero: + symbol: font_number_zero type: texture ctype: u16 width: 26 height: 16 offset: 0xC7E44 format: i4 -7F1944: - symbol: gTexture7F1944 +font_number_one: + symbol: font_number_one type: texture ctype: u16 width: 26 height: 16 offset: 0xC7F14 format: i4 -7F1A14: - symbol: gTexture7F1A14 +font_number_two: + symbol: font_number_two type: texture ctype: u16 width: 26 height: 16 offset: 0xC7FE4 format: i4 -7F1AE4: - symbol: gTexture7F1AE4 +font_number_three: + symbol: font_number_three type: texture ctype: u16 width: 26 height: 16 offset: 0xC80B4 format: i4 -7F1BB4: - symbol: gTexture7F1BB4 +font_number_four: + symbol: font_number_four type: texture ctype: u16 width: 26 height: 16 offset: 0xC8184 format: i4 -7F1C84: - symbol: gTexture7F1C84 +font_number_five: + symbol: font_number_five type: texture ctype: u16 width: 26 height: 16 offset: 0xC8254 format: i4 -7F1D54: - symbol: gTexture7F1D54 +font_number_six: + symbol: font_number_six type: texture ctype: u16 width: 26 height: 16 offset: 0xC8324 format: i4 -7F1E24: - symbol: gTexture7F1E24 +font_number_seven: + symbol: font_number_seven type: texture ctype: u16 width: 26 height: 16 offset: 0xC83F4 format: i4 -7F1EF4: - symbol: gTexture7F1EF4 +font_number_eight: + symbol: font_number_eight type: texture ctype: u16 width: 26 height: 16 offset: 0xC84C4 format: i4 -7F1FC4: - symbol: gTexture7F1FC4 +font_number_nine: + symbol: font_number_nine type: texture ctype: u16 width: 26 height: 16 offset: 0xC8594 format: i4 -7F2094: - symbol: gTexture7F2094 +font_letter_A: + symbol: font_letter_A type: texture ctype: u16 width: 26 height: 16 offset: 0xC8664 format: i4 -7F2164: - symbol: gTexture7F2164 +font_letter_B: + symbol: font_letter_B type: texture ctype: u16 width: 26 height: 16 offset: 0xC8734 format: i4 -7F2234: - symbol: gTexture7F2234 +font_letter_C: + symbol: font_letter_C type: texture ctype: u16 width: 26 height: 16 offset: 0xC8804 format: i4 -7F2304: - symbol: gTexture7F2304 +font_letter_D: + symbol: font_letter_D type: texture ctype: u16 width: 26 height: 16 offset: 0xC88D4 format: i4 -7F23D4: - symbol: gTexture7F23D4 +font_letter_E: + symbol: font_letter_E type: texture ctype: u16 width: 26 height: 16 offset: 0xC89A4 format: i4 -7F24A4: - symbol: gTexture7F24A4 +font_letter_F: + symbol: font_letter_F type: texture ctype: u16 width: 26 height: 16 offset: 0xC8A74 format: i4 -7F2574: - symbol: gTexture7F2574 +font_letter_G: + symbol: font_letter_G type: texture ctype: u16 width: 26 height: 16 offset: 0xC8B44 format: i4 -7F2644: - symbol: gTexture7F2644 +font_letter_H: + symbol: font_letter_H type: texture ctype: u16 width: 26 height: 16 offset: 0xC8C14 format: i4 -7F2714: - symbol: gTexture7F2714 +font_letter_I: + symbol: font_letter_I type: texture ctype: u16 width: 26 height: 16 offset: 0xC8CE4 format: i4 -7F27E4: - symbol: gTexture7F27E4 +font_letter_J: + symbol: font_letter_J type: texture ctype: u16 width: 26 height: 16 offset: 0xC8DB4 format: i4 -7F28B4: - symbol: gTexture7F28B4 +font_letter_K: + symbol: font_letter_K type: texture ctype: u16 width: 26 height: 16 offset: 0xC8E84 format: i4 -7F2984: - symbol: gTexture7F2984 +font_letter_L: + symbol: font_letter_L type: texture ctype: u16 width: 26 height: 16 offset: 0xC8F54 format: i4 -7F2A54: - symbol: gTexture7F2A54 +font_letter_M: + symbol: font_letter_M type: texture ctype: u16 width: 26 height: 16 offset: 0xC9024 format: i4 -7F2B24: - symbol: gTexture7F2B24 +font_letter_N: + symbol: font_letter_N type: texture ctype: u16 width: 26 height: 16 offset: 0xC90F4 format: i4 -7F2BF4: - symbol: gTexture7F2BF4 +font_letter_O: + symbol: font_letter_O type: texture ctype: u16 width: 26 height: 16 offset: 0xC91C4 format: i4 -7F2CC4: - symbol: gTexture7F2CC4 +font_letter_P: + symbol: font_letter_P type: texture ctype: u16 width: 26 height: 16 offset: 0xC9294 format: i4 -7F2D94: - symbol: gTexture7F2D94 +font_letter_Q: + symbol: font_letter_Q type: texture ctype: u16 width: 26 height: 16 offset: 0xC9364 format: i4 -7F2E64: - symbol: gTexture7F2E64 +font_letter_R: + symbol: font_letter_R type: texture ctype: u16 width: 26 height: 16 offset: 0xC9434 format: i4 -7F2F34: - symbol: gTexture7F2F34 +font_letter_S: + symbol: font_letter_S type: texture ctype: u16 width: 26 height: 16 offset: 0xC9504 format: i4 -7F3004: - symbol: gTexture7F3004 +font_letter_T: + symbol: font_letter_T type: texture ctype: u16 width: 26 height: 16 offset: 0xC95D4 format: i4 -7F30D4: - symbol: gTexture7F30D4 +font_letter_U: + symbol: font_letter_U type: texture ctype: u16 width: 26 height: 16 offset: 0xC96A4 format: i4 -7F31A4: - symbol: gTexture7F31A4 +font_letter_V: + symbol: font_letter_V type: texture ctype: u16 width: 26 height: 16 offset: 0xC9774 format: i4 -7F3274: - symbol: gTexture7F3274 +font_letter_W: + symbol: font_letter_W type: texture ctype: u16 width: 26 height: 16 offset: 0xC9844 format: i4 -7F3344: - symbol: gTexture7F3344 +font_letter_X: + symbol: font_letter_X type: texture ctype: u16 width: 26 height: 16 offset: 0xC9914 format: i4 -7F3414: - symbol: gTexture7F3414 +font_letter_Y: + symbol: font_letter_Y type: texture ctype: u16 width: 26 height: 16 offset: 0xC99E4 format: i4 -7F34E4: - symbol: gTexture7F34E4 +font_letter_Z: + symbol: font_letter_Z type: texture ctype: u16 width: 26 @@ -3308,8 +3308,8 @@ texture_7F109C: height: 16 offset: 0xD0594 format: i4 -7FA044: - symbol: gTexture7FA044 +font_apostrophe: + symbol: font_apostrophe type: texture ctype: u16 width: 16 @@ -3341,7 +3341,7 @@ texture_7F109C: offset: 0xD0834 format: i4 7FA334: - symbol: gTexture7FA334 + symbol: font_comma type: texture ctype: u16 width: 16 diff --git a/yamls/us/texture_tkmk00.yml b/yamls/us/texture_tkmk00.yml index c75da0472..85c3dac42 100644 --- a/yamls/us/texture_tkmk00.yml +++ b/yamls/us/texture_tkmk00.yml @@ -4,14 +4,14 @@ no_compression: true header: code: - - '#include <assets/texture_tkmk00.h>' - - '#include <macros.h>' - - '#include <defines.h>' + - "#include <assets/texture_tkmk00.h>" + - "#include <macros.h>" + - "#include <defines.h>" header: - - '#include <libultraship.h>' - - '#include <align_asset_macro.h>' -gTexturePlayerSelect: - symbol: gTexturePlayerSelect + - "#include <libultraship.h>" + - "#include <align_asset_macro.h>" +texture_player_select: + symbol: texture_player_select type: texture ctype: u16 width: 220 @@ -20,8 +20,8 @@ gTexturePlayerSelect: tkmk00: true alpha: 0x1 format: rgba16 -gTextureOption: - symbol: gTextureOption +texture_option: + symbol: texture_option type: texture ctype: u16 width: 130 @@ -30,8 +30,8 @@ gTextureOption: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameDK: - symbol: gTextureNameDK +texture_name_dk: + symbol: texture_name_dk type: texture ctype: u16 width: 64 @@ -40,8 +40,8 @@ gTextureNameDK: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameToad: - symbol: gTextureNameToad +texture_name_toad: + symbol: texture_name_toad type: texture ctype: u16 width: 64 @@ -50,8 +50,8 @@ gTextureNameToad: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameBowser: - symbol: gTextureNameBowser +texture_name_bowser: + symbol: texture_name_bowser type: texture ctype: u16 width: 64 @@ -60,8 +60,8 @@ gTextureNameBowser: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameLuigi: - symbol: gTextureNameLuigi +texture_name_luigi: + symbol: texture_name_luigi type: texture ctype: u16 width: 64 @@ -70,8 +70,8 @@ gTextureNameLuigi: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameMario: - symbol: gTextureNameMario +texture_name_mario: + symbol: texture_name_mario type: texture ctype: u16 width: 64 @@ -80,8 +80,8 @@ gTextureNameMario: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNamePeach: - symbol: gTextureNamePeach +texture_name_peach: + symbol: texture_name_peach type: texture ctype: u16 width: 64 @@ -90,8 +90,8 @@ gTextureNamePeach: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameWario: - symbol: gTextureNameWario +texture_name_wario: + symbol: texture_name_wario type: texture ctype: u16 width: 64 @@ -100,8 +100,8 @@ gTextureNameWario: tkmk00: true alpha: 0x1 format: rgba16 -gTextureNameYoshi: - symbol: gTextureNameYoshi +texture_name_yoshi: + symbol: texture_name_yoshi type: texture ctype: u16 width: 64 @@ -360,8 +360,8 @@ gTextureMenuSpecialCup: tkmk00: true alpha: 0xBE format: rgba16 -gTextureGameSelect: - symbol: gTextureGameSelect +texture_game_select: + symbol: texture_game_select type: texture ctype: u16 width: 200 @@ -370,8 +370,8 @@ gTextureGameSelect: tkmk00: true alpha: 0x1 format: rgba16 -gTextureMenu1PGame: - symbol: gTextureMenu1PGame +texture_menu_1p_game: + symbol: texture_menu_1p_game type: texture ctype: u16 width: 64 @@ -380,8 +380,8 @@ gTextureMenu1PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu2PGame: - symbol: gTextureMenu2PGame +texture_menu_2p_game: + symbol: texture_menu_2p_game type: texture ctype: u16 width: 64 @@ -390,8 +390,8 @@ gTextureMenu2PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu3PGame: - symbol: gTextureMenu3PGame +texture_menu_3p_game: + symbol: texture_menu_3p_game type: texture ctype: u16 width: 64 @@ -400,8 +400,8 @@ gTextureMenu3PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu4PGame: - symbol: gTextureMenu4PGame +texture_menu_4p_game: + symbol: texture_menu_4p_game type: texture ctype: u16 width: 64 @@ -410,8 +410,8 @@ gTextureMenu4PGame: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeBattle: - symbol: gTextureMenuModeBattle +texture_mode_battle: + symbol: texture_mode_battle type: texture ctype: u16 width: 64 @@ -420,8 +420,8 @@ gTextureMenuModeBattle: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeTimeTrials: - symbol: gTextureMenuModeTimeTrials +texture_mode_time_trials: + symbol: texture_mode_time_trials type: texture ctype: u16 width: 64 @@ -430,8 +430,8 @@ gTextureMenuModeTimeTrials: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeMarioGP: - symbol: gTextureMenuModeMarioGP +texture_mode_mario_gp: + symbol: texture_mode_mario_gp type: texture ctype: u16 width: 64 @@ -440,8 +440,8 @@ gTextureMenuModeMarioGP: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuModeVS: - symbol: gTextureMenuModeVS +texture_mode_vs: + symbol: texture_mode_vs type: texture ctype: u16 width: 64 @@ -450,8 +450,8 @@ gTextureMenuModeVS: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuLOption: - symbol: gTextureMenuLOption +texture_l_option: + symbol: texture_l_option type: texture ctype: u16 width: 58 @@ -460,8 +460,8 @@ gTextureMenuLOption: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuRData: - symbol: gTextureMenuRData +texture_r_data: + symbol: texture_r_data type: texture ctype: u16 width: 58 @@ -470,8 +470,8 @@ gTextureMenuRData: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu50cc: - symbol: gTextureMenu50cc +texture_50cc: + symbol: texture_50cc type: texture ctype: u16 width: 64 @@ -480,8 +480,8 @@ gTextureMenu50cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu100cc: - symbol: gTextureMenu100cc +texture_100cc: + symbol: texture_100cc type: texture ctype: u16 width: 64 @@ -490,8 +490,8 @@ gTextureMenu100cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenu150cc: - symbol: gTextureMenu150cc +texture_150cc: + symbol: texture_150cc type: texture ctype: u16 width: 64 @@ -500,8 +500,8 @@ gTextureMenu150cc: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuExtra: - symbol: gTextureMenuExtra +texture_extra: + symbol: texture_extra type: texture ctype: u16 width: 64 @@ -530,8 +530,8 @@ gTextureMenuWithItem: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuBegin: - symbol: gTextureMenuBegin +texture_begin: + symbol: texture_begin type: texture ctype: u16 width: 64 @@ -540,8 +540,8 @@ gTextureMenuBegin: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuGhost: - symbol: gTextureMenuGhost +texture_menu_ghost: + symbol: texture_menu_ghost type: texture ctype: u16 width: 64 @@ -550,8 +550,8 @@ gTextureMenuGhost: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuData: - symbol: gTextureMenuData +texture_data: + symbol: texture_data type: texture ctype: u16 width: 64 @@ -560,8 +560,8 @@ gTextureMenuData: tkmk00: true alpha: 0xBE format: rgba16 -gTextureMenuOK: - symbol: gTextureMenuOK +texture_ok: + symbol: texture_ok type: texture ctype: u16 width: 31 @@ -570,8 +570,8 @@ gTextureMenuOK: tkmk00: true alpha: 0xBE format: rgba16 -gTextureBackgroundBlueSky: - symbol: gTextureBackgroundBlueSky +background_blue_sky: + symbol: background_blue_sky type: texture ctype: u16 width: 320 @@ -580,8 +580,8 @@ gTextureBackgroundBlueSky: tkmk00: true alpha: 0x1 format: rgba16 -gTextureBackgroundSunset: - symbol: gTextureBackgroundSunset +background_sunset: + symbol: background_sunset type: texture ctype: u16 width: 320 |
