diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-01-17 03:07:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 19:07:37 -0700 |
| commit | eb69ec24932b39ea4d5e3d6bbb199b64c326a5bf (patch) | |
| tree | 914c7374c2ee34eb7eae76ef5eb90feed266459f | |
| parent | 6114540359deca412959f01d8f651abec0bf9eb9 (diff) | |
rename some texture (#530)
* rename some texture
* format common_texture
51 files changed, 907 insertions, 903 deletions
diff --git a/asm/non_matchings/hud_renderer/func_8004F168.s b/asm/non_matchings/hud_renderer/func_8004F168.s index f52e1aefd..503ba1c7a 100644 --- a/asm/non_matchings/hud_renderer/func_8004F168.s +++ b/asm/non_matchings/hud_renderer/func_8004F168.s @@ -88,14 +88,14 @@ glabel func_8004F168 /* 04FEB8 8004F2B8 1041001B */ beq $v0, $at, .L8004F328 /* 04FEBC 8004F2BC 24010001 */ li $at, 1 /* 04FEC0 8004F2C0 10410019 */ beq $v0, $at, .L8004F328 -/* 04FEC4 8004F2C4 3C0A0D03 */ lui $t2, %hi(gMiniMapKartTextures) # $t2, 0xd03 +/* 04FEC4 8004F2C4 3C0A0D03 */ lui $t2, %hi(common_texture_minimap_kart_character) # $t2, 0xd03 /* 04FEC8 8004F2C8 8466002E */ lh $a2, 0x2e($v1) /* 04FECC 8004F2CC 34018000 */ li $at, 32768 /* 04FED0 8004F2D0 000869C0 */ sll $t5, $t0, 7 /* 04FED4 8004F2D4 00C13021 */ addu $a2, $a2, $at /* 04FED8 8004F2D8 30CCFFFF */ andi $t4, $a2, 0xffff /* 04FEDC 8004F2DC 01803025 */ move $a2, $t4 -/* 04FEE0 8004F2E0 254ACCD8 */ addiu $t2, %lo(gMiniMapKartTextures) # addiu $t2, $t2, -0x3328 +/* 04FEE0 8004F2E0 254ACCD8 */ addiu $t2, %lo(common_texture_minimap_kart_character) # addiu $t2, $t2, -0x3328 /* 04FEE4 8004F2E4 3C190D00 */ lui $t9, %hi(common_vtx_player_minimap_icon) # $t9, 0xd00 /* 04FEE8 8004F2E8 27395470 */ addiu $t9, %lo(common_vtx_player_minimap_icon) # addiu $t9, $t9, 0x5470 /* 04FEEC 8004F2EC 01AA7021 */ addu $t6, $t5, $t2 @@ -116,11 +116,11 @@ glabel func_8004F168 .L8004F328: /* 04FF28 8004F328 8466002E */ lh $a2, 0x2e($v1) /* 04FF2C 8004F32C 34018000 */ li $at, 32768 -/* 04FF30 8004F330 3C0E0D03 */ lui $t6, %hi(gMiniMapKartTextures) # $t6, 0xd03 +/* 04FF30 8004F330 3C0E0D03 */ lui $t6, %hi(common_texture_minimap_kart_character) # $t6, 0xd03 /* 04FF34 8004F334 00C13021 */ addu $a2, $a2, $at /* 04FF38 8004F338 30C8FFFF */ andi $t0, $a2, 0xffff /* 04FF3C 8004F33C 01003025 */ move $a2, $t0 -/* 04FF40 8004F340 25CECCD8 */ addiu $t6, %lo(gMiniMapKartTextures) # addiu $t6, $t6, -0x3328 +/* 04FF40 8004F340 25CECCD8 */ addiu $t6, %lo(common_texture_minimap_kart_character) # addiu $t6, $t6, -0x3328 /* 04FF44 8004F344 000D51C0 */ sll $t2, $t5, 7 /* 04FF48 8004F348 3C0F0D00 */ lui $t7, %hi(common_vtx_player_minimap_icon) # $t7, 0xd00 /* 04FF4C 8004F34C 25EF5470 */ addiu $t7, %lo(common_vtx_player_minimap_icon) # addiu $t7, $t7, 0x5470 diff --git a/asm/non_matchings/hud_renderer/func_80050E34.s b/asm/non_matchings/hud_renderer/func_80050E34.s index 9e0100f11..917397616 100644 --- a/asm/non_matchings/hud_renderer/func_80050E34.s +++ b/asm/non_matchings/hud_renderer/func_80050E34.s @@ -72,8 +72,8 @@ glabel func_80050E34 /* 051B38 80050F38 AC580000 */ sw $t8, ($v0) /* 051B3C 80050F3C AC590004 */ sw $t9, 4($v0) /* 051B40 80050F40 8E020000 */ lw $v0, ($s0) -/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(gTLUTPortraitBombKartAndQuestionMark) # $t8, 0xd02 -/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $t8, $t8, -0x4b28 +/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(common_tlut_portrait_bomb_kart_and_question_mark) # $t8, 0xd02 +/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(common_tlut_portrait_bomb_kart_and_question_mark) # addiu $t8, $t8, -0x4b28 /* 051B4C 80050F4C 244E0008 */ addiu $t6, $v0, 8 /* 051B50 80050F50 AE0E0000 */ sw $t6, ($s0) /* 051B54 80050F54 3C0FFD10 */ lui $t7, 0xfd10 @@ -109,13 +109,13 @@ glabel func_80050E34 /* 051BCC 80050FCC AC590000 */ sw $t9, ($v0) /* 051BD0 80050FD0 8E020000 */ lw $v0, ($s0) /* 051BD4 80050FD4 3C18E700 */ lui $t8, 0xe700 -/* 051BD8 80050FD8 3C040D02 */ lui $a0, %hi(gTexturePortraitQuestionMark) # $a0, 0xd02 +/* 051BD8 80050FD8 3C040D02 */ lui $a0, %hi(common_texture_portrait_question_mark) # $a0, 0xd02 /* 051BDC 80050FDC 244F0008 */ addiu $t7, $v0, 8 /* 051BE0 80050FE0 AE0F0000 */ sw $t7, ($s0) /* 051BE4 80050FE4 AC400004 */ sw $zero, 4($v0) /* 051BE8 80050FE8 AC580000 */ sw $t8, ($v0) /* 051BEC 80050FEC AFAD00D4 */ sw $t5, 0xd4($sp) -/* 051BF0 80050FF0 2484DAD8 */ addiu $a0, %lo(gTexturePortraitQuestionMark) # addiu $a0, $a0, -0x2528 +/* 051BF0 80050FF0 2484DAD8 */ addiu $a0, %lo(common_texture_portrait_question_mark) # addiu $a0, $a0, -0x2528 /* 051BF4 80050FF4 24050020 */ li $a1, 32 /* 051BF8 80050FF8 0C0114A9 */ jal rsp_load_texture /* 051BFC 80050FFC 24060020 */ li $a2, 32 @@ -300,8 +300,8 @@ glabel func_80050E34 /* 051EB8 800512B8 AC590000 */ sw $t9, ($v0) .L800512BC: /* 051EBC 800512BC 8E020000 */ lw $v0, ($s0) -/* 051EC0 800512C0 3C190D02 */ lui $t9, %hi(gTLUTHudTypeCRankTinyFont) # $t9, 0xd02 -/* 051EC4 800512C4 27399E58 */ addiu $t9, %lo(gTLUTHudTypeCRankTinyFont) # addiu $t9, $t9, -0x61a8 +/* 051EC0 800512C0 3C190D02 */ lui $t9, %hi(common_tlut_hud_type_C_rank_tiny_font) # $t9, 0xd02 +/* 051EC4 800512C4 27399E58 */ addiu $t9, %lo(common_tlut_hud_type_C_rank_tiny_font) # addiu $t9, $t9, -0x61a8 /* 051EC8 800512C8 244F0008 */ addiu $t7, $v0, 8 /* 051ECC 800512CC AE0F0000 */ sw $t7, ($s0) /* 051ED0 800512D0 3C18FD10 */ lui $t8, 0xfd10 @@ -343,8 +343,8 @@ glabel func_80050E34 /* 051F60 80051360 AC400004 */ sw $zero, 4($v0) /* 051F64 80051364 AC590000 */ sw $t9, ($v0) /* 051F68 80051368 8FAE00DC */ lw $t6, 0xdc($sp) -/* 051F6C 8005136C 3C190D02 */ lui $t9, %hi(gTextureHudTypeCRankTinyFont) # $t9, 0xd02 -/* 051F70 80051370 2739A058 */ addiu $t9, %lo(gTextureHudTypeCRankTinyFont) # addiu $t9, $t9, -0x5fa8 +/* 051F6C 8005136C 3C190D02 */ lui $t9, %hi(common_texture_hud_type_C_rank_tiny_font) # $t9, 0xd02 +/* 051F70 80051370 2739A058 */ addiu $t9, %lo(common_texture_hud_type_C_rank_tiny_font) # addiu $t9, $t9, -0x5fa8 /* 051F74 80051374 000E7980 */ sll $t7, $t6, 6 /* 051F78 80051378 25F80040 */ addiu $t8, $t7, 0x40 /* 051F7C 8005137C 0C0114A9 */ jal rsp_load_texture @@ -408,8 +408,8 @@ glabel func_80050E34 /* 05205C 8005145C AFB80034 */ sw $t8, 0x34($sp) /* 052060 80051460 0C012CD7 */ jal func_8004B35C /* 052064 80051464 240700FF */ li $a3, 255 -/* 052068 80051468 3C040D02 */ lui $a0, %hi(gTextureCharacterPortraitBorder) # $a0, 0xd02 -/* 05206C 8005146C 2484A2D8 */ addiu $a0, %lo(gTextureCharacterPortraitBorder) # addiu $a0, $a0, -0x5d28 +/* 052068 80051468 3C040D02 */ lui $a0, %hi(common_texture_character_portrait_border) # $a0, 0xd02 +/* 05206C 8005146C 2484A2D8 */ addiu $a0, %lo(common_texture_character_portrait_border) # addiu $a0, $a0, -0x5d28 /* 052070 80051470 24050020 */ li $a1, 32 /* 052074 80051474 0C011249 */ jal func_80044924 /* 052078 80051478 24060020 */ li $a2, 32 diff --git a/assets.json b/assets.json index 24e24869c..15ee0b679 100644 --- a/assets.json +++ b/assets.json @@ -201,51 +201,51 @@ "bin/gTexturePinkBar.rgba16.tkmk00": {"meta":{"size":"0x500"}, "offsets": {"us":["0x820AC0", "0x0"]}}, "bin/gTextureGoldBar.rgba16.tkmk00": {"meta":{"size":"0xD50"}, "offsets": {"us":["0x820FC0", "0x0"]}}, -"textures/common/132B50_00200.rgba16.png": {"meta":{"dims":[32,64]}, "offsets":{"us":["0x132B50","0x200"]}}, -"textures/common/132B50_01EE8.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x132B50", "0x01EE8"]}}, -"textures/common/132B50_03348.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x03348"]}}, -"textures/common/132B50_03B48.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x03B48"]}}, +"textures/common/common_texture_particle_fire.rgba16.png": {"meta":{"dims":[32,64]}, "offsets":{"us":["0x132B50","0x200"]}}, +"textures/common/common_texture_item_box_question_mark.rgba16.png": {"meta":{"dims":[32,64]}, "offsets": {"us":["0x132B50", "0x01EE8"]}}, +"textures/common/common_texture_banana.rgba16.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x03348"]}}, +"textures/common/common_texture_flat_banana.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x03B48"]}}, "textures/common/132B50_06A58.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x06A58"]}}, "textures/common/132B50_06AD8.ia8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x06AD8"]}}, -"textures/common/132B50_09958.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x132B50", "0x09958"]}}, -"textures/common/132B50_0A558.i4.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x0A558"]}}, -"textures/common/132B50_0A958.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0A958"]}}, -"textures/common/132B50_0AB58.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0AB58"]}}, -"textures/common/132B50_0AD58.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0AD58"]}}, -"textures/common/132B50_0B158.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B158"]}}, -"textures/common/132B50_0B558.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B558"]}}, -"textures/common/132B50_0B958.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B958"]}}, -"textures/common/132B50_0BD58.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0BD58"]}}, -"textures/common/132B50_0C158.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0C158"]}}, -"textures/common/132B50_0C558.rgba16.png": {"meta":{"dims":[104,16]}, "offsets": {"us":["0x132B50", "0x0C558"]}}, -"textures/common/132B50_0D258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0D258"]}}, -"textures/common/132B50_0E258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0E258"]}}, -"textures/common/132B50_0F258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0F258"]}}, -"textures/common/132B50_10258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x10258"]}}, -"textures/common/132B50_11258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x11258"]}}, -"textures/common/132B50_12258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x12258"]}}, -"textures/common/132B50_13258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x13258"]}}, -"textures/common/132B50_14258.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x14258"]}}, +"textures/common/common_texture_speedometer.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x132B50", "0x09958"]}}, +"textures/common/common_texture_speedometer_needle.i4.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x0A558"]}}, +"textures/common/common_texture_hud_lap.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0A958"]}}, +"textures/common/common_texture_hud_123.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0AB58"]}}, +"textures/common/common_texture_hud_lap_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0AD58"]}}, +"textures/common/common_texture_hud_lap_1_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B158"]}}, +"textures/common/common_texture_hud_lap_2_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B558"]}}, +"textures/common/common_texture_hud_lap_3_on_3.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0B958"]}}, +"textures/common/common_texture_hud_total_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0BD58"]}}, +"textures/common/common_texture_hud_time.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x0C158"]}}, +"textures/common/common_texture_hud_normal_digit.rgba16.png": {"meta":{"dims":[104,16]}, "offsets": {"us":["0x132B50", "0x0C558"]}}, +"textures/common/common_texture_hud_1st.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0D258"]}}, +"textures/common/common_texture_hud_2nd.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0E258"]}}, +"textures/common/common_texture_hud_3rd.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x0F258"]}}, +"textures/common/common_texture_hud_4th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x10258"]}}, +"textures/common/common_texture_hud_5th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x11258"]}}, +"textures/common/common_texture_hud_6th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x12258"]}}, +"textures/common/common_texture_hud_7th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x13258"]}}, +"textures/common/common_texture_hud_8th.i4.png": {"meta":{"dims":[128,64]}, "offsets": {"us":["0x132B50", "0x14258"]}}, "textures/common/132B50_15258.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x15258"]}}, "textures/common/132B50_15A58.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x15A58"]}}, "textures/common/132B50_16258.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x16258"]}}, "textures/common/132B50_16A58.i4.png": {"meta":{"dims":[64,64]}, "offsets": {"us":["0x132B50", "0x16A58"]}}, -"textures/common/132B50_28DD8.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x28DD8"]}}, -"textures/common/132B50_291D8.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x291D8"]}}, +"textures/common/common_texture_particle_leaf.rgba16.png": {"meta":{"dims":[32,16]}, "offsets": {"us":["0x132B50", "0x28DD8"]}}, +"textures/common/common_texture_unused_particle_leaf.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x291D8"]}}, "textures/common/132B50_293D8.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x293D8"]}}, "textures/common/132B50_29458.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x29458"]}}, "textures/common/132B50_2AA58.rgba16.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x2AA58"]}}, -"textures/common/132B50_2AC58.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2AC58"]}}, -"textures/common/132B50_2B058.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B058"]}}, -"textures/common/132B50_2B458.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B458"]}}, -"textures/common/132B50_2B858.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B858"]}}, -"textures/common/132B50_2BC58.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2BC58"]}}, -"textures/common/132B50_2C058.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C058"]}}, -"textures/common/132B50_2C458.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C458"]}}, -"textures/common/132B50_2C858.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C858"]}}, +"textures/common/common_texture_particle_spark_1.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2AC58"]}}, +"textures/common/common_texture_particle_spark_2.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B058"]}}, +"textures/common/common_texture_particle_spark_3.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B458"]}}, +"textures/common/common_texture_particle_spark_4.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2B858"]}}, +"textures/common/common_texture_particle_smoke_1.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2BC58"]}}, +"textures/common/common_texture_particle_smoke_2.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C058"]}}, +"textures/common/common_texture_particle_smoke_3.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C458"]}}, +"textures/common/common_texture_particle_smoke_4.i8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x2C858"]}}, "textures/standalone/sign_shell_shot_0.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x641F70", "0x00000"]}}, "textures/standalone/sign_shell_shot_1.rgba16.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x6422FC", "0x00000"]}}, diff --git a/assets/blueshell.json b/assets/blueshell.json index 555820087..c75ccf5ef 100644 --- a/assets/blueshell.json +++ b/assets/blueshell.json @@ -1,11 +1,11 @@ { -"gTLUTBlueShell": {"output_dir": "blueshell", "rom_offset": "0x132B50", "block_offset": "0x05038", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureBlueShell0": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell1": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell2": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell3": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell4": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell5": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell6": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"}, -"gTextureBlueShell7": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBlueShell"} +"common_tlut_blue_shell": {"output_dir": "blueshell", "rom_offset": "0x132B50", "block_offset": "0x05038", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureBlueShell0": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell1": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell2": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell3": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell4": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell5": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell6": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}, +"gTextureBlueShell7": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"} }
\ No newline at end of file diff --git a/assets/bomb.json b/assets/bomb.json index 79afe7437..2e29cd95b 100644 --- a/assets/bomb.json +++ b/assets/bomb.json @@ -1,7 +1,7 @@ { -"gTLUTBomb": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A858", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureBomb1": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x29858", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBomb"}, -"gTextureBomb2": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x29C58", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBomb"}, -"gTextureBomb3": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A058", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBomb"}, -"gTextureBomb4": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A458", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTBomb"} +"common_tlut_bomb": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A858", "width": 16, "height": 16, "type": "rgba16"}, +"common_texture_bomb_1": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x29858", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_bomb"}, +"common_texture_bomb_2": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x29C58", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_bomb"}, +"common_texture_bomb_3": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A058", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_bomb"}, +"common_texture_bomb_4": {"output_dir": "bomb", "rom_offset": "0x132B50", "block_offset": "0x2A458", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_bomb"} } diff --git a/assets/character_portraits.json b/assets/character_portraits.json index 7da181800..97b909e65 100644 --- a/assets/character_portraits.json +++ b/assets/character_portraits.json @@ -1,22 +1,22 @@ { -"gTLUTPortraitMario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A4D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitLuigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A6D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitPeach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A8D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitToad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AAD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitYoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1ACD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitDonkeyKong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AED8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitWario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B0D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitBowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B2D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTPortraitBombKartAndQuestionMark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B4D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_mario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A4D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_luigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A6D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_peach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1A8D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_toad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AAD8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_yoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1ACD8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_donkey_kong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1AED8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_wario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B0D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_bowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B2D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_portrait_bomb_kart_and_question_mark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B4D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTexturePortraitMario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitMario"}, -"gTexturePortraitLuigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitLuigi"}, -"gTexturePortraitPeach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BED8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitPeach"}, -"gTexturePortraitToad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitToad"}, -"gTexturePortraitYoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitYoshi"}, -"gTexturePortraitDonkeyKong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitDonkeyKong"}, -"gTexturePortraitWario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CED8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitWario"}, -"gTexturePortraitBowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBowser"}, -"gTexturePortraitBombKart": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBombKartAndQuestionMark"}, -"gTexturePortraitQuestionMark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1DAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTPortraitBombKartAndQuestionMark"} +"common_texture_portrait_mario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1B6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_mario"}, +"common_texture_portrait_luigi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_luigi"}, +"common_texture_portrait_peach": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1BED8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_peach"}, +"common_texture_portrait_toad": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_toad"}, +"common_texture_portrait_yoshi": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1C6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_yoshi"}, +"common_texture_portrait_donkey_kong": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_donkey_kong"}, +"common_texture_portrait_wario": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1CED8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_wario"}, +"common_texture_portrait_bowser": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D2D8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_bowser"}, +"common_texture_portrait_bomb_kart": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1D6D8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_bomb_kart_and_question_mark"}, +"common_texture_portrait_question_mark": {"output_dir": "character_portraits", "rom_offset": "0x132B50", "block_offset": "0x1DAD8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_portrait_bomb_kart_and_question_mark"} } diff --git a/assets/debug_font.json b/assets/debug_font.json index 1afd587f4..9ea759509 100644 --- a/assets/debug_font.json +++ b/assets/debug_font.json @@ -1,4 +1,4 @@ { -"gTLUTDebugFont": {"output_dir": "debug_font", "rom_offset": "0x132B50", "block_offset": "0x6ED8", "width": 4, "height": 4, "type": "rgba16"}, -"gTextureDebugFont": {"output_dir": "debug_font", "rom_offset": "0x132B50", "block_offset": "0x6EF8", "width": 128, "height": 32, "type": "ci4", "tlut": "gTLUTDebugFont"} +"common_tlut_debug_font": {"output_dir": "debug_font", "rom_offset": "0x132B50", "block_offset": "0x6ED8", "width": 4, "height": 4, "type": "rgba16"}, +"common_texture_debug_font": {"output_dir": "debug_font", "rom_offset": "0x132B50", "block_offset": "0x6EF8", "width": 128, "height": 32, "type": "ci4", "tlut": "common_tlut_debug_font"} } diff --git a/assets/finish_line_banner.json b/assets/finish_line_banner.json index 33efa9633..7d0d5a742 100644 --- a/assets/finish_line_banner.json +++ b/assets/finish_line_banner.json @@ -1,11 +1,11 @@ { -"gTLUTFinishLineBanner": {"output_dir": "finish_line_banner", "rom_offset": "0x132B50", "block_offset": "0x0", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureFinishLineBanner1": {"output_dir": "finish_line_banner", "rom_offset": "0x696BAC", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner2": {"output_dir": "finish_line_banner", "rom_offset": "0x696E3C", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner3": {"output_dir": "finish_line_banner", "rom_offset": "0x697138", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner4": {"output_dir": "finish_line_banner", "rom_offset": "0x69743C", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner5": {"output_dir": "finish_line_banner", "rom_offset": "0x6977F0", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner6": {"output_dir": "finish_line_banner", "rom_offset": "0x697B10", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner7": {"output_dir": "finish_line_banner", "rom_offset": "0x697E80", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"}, -"gTextureFinishLineBanner8": {"output_dir": "finish_line_banner", "rom_offset": "0x69811C", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTFinishLineBanner"} +"common_tlut_finish_line_banner": {"output_dir": "finish_line_banner", "rom_offset": "0x132B50", "block_offset": "0x0", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureFinishLineBanner1": {"output_dir": "finish_line_banner", "rom_offset": "0x696BAC", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner2": {"output_dir": "finish_line_banner", "rom_offset": "0x696E3C", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner3": {"output_dir": "finish_line_banner", "rom_offset": "0x697138", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner4": {"output_dir": "finish_line_banner", "rom_offset": "0x69743C", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner5": {"output_dir": "finish_line_banner", "rom_offset": "0x6977F0", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner6": {"output_dir": "finish_line_banner", "rom_offset": "0x697B10", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner7": {"output_dir": "finish_line_banner", "rom_offset": "0x697E80", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"}, +"gTextureFinishLineBanner8": {"output_dir": "finish_line_banner", "rom_offset": "0x69811C", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_finish_line_banner"} } diff --git a/assets/greenshell.json b/assets/greenshell.json index 7b804501e..d6feea734 100644 --- a/assets/greenshell.json +++ b/assets/greenshell.json @@ -1,11 +1,11 @@ { -"gTLUTGreenShell": {"output_dir": "greenshell", "rom_offset": "0x132B50", "block_offset": "0x04E38", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureGreenShell0": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell1": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell2": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell3": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell4": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell5": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell6": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"}, -"gTextureGreenShell7": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "gTLUTGreenShell"} +"common_tlut_green_shell": {"output_dir": "greenshell", "rom_offset": "0x132B50", "block_offset": "0x04E38", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureGreenShell0": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell1": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell2": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell3": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell4": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell5": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell6": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}, +"gTextureGreenShell7": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"} } diff --git a/assets/hud_type_c.json b/assets/hud_type_c.json index 7d6cb01df..f86f63d1f 100644 --- a/assets/hud_type_c.json +++ b/assets/hud_type_c.json @@ -1,25 +1,25 @@ { -"gTLUTHudTypeCRankFont": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19458", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureHudTypeCRankFont1": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19658", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont2": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19758", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont3": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19858", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont4": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19958", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont5": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19A58", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont6": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19B58", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont7": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19C58", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, -"gTextureHudTypeCRankFont8": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19D58", "width": 16, "height": 16, "type": "ci8", "tlut": "gTLUTHudTypeCRankFont"}, +"common_tlut_hud_type_C_rank_font": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19458", "width": 16, "height": 16, "type": "rgba16"}, +"common_texture_hud_type_C_rank_font_1": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19658", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_2": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19758", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_3": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19858", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_4": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19958", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_5": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19A58", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_6": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19B58", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_7": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19C58", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, +"common_texture_hud_type_C_rank_font_8": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19D58", "width": 16, "height": 16, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_font"}, -"gTLUTHudTypeCRankTinyFont": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19E58", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureHudTypeCRankTinyFont0": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A058", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont1": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A098", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont2": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A0D8", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont3": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A118", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont4": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A158", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont5": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A198", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont6": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A1D8", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont7": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A218", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont8": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A258", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, -"gTextureHudTypeCRankTinyFont9": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A298", "width": 8, "height": 8, "type": "ci8", "tlut": "gTLUTHudTypeCRankTinyFont"}, +"common_tlut_hud_type_C_rank_tiny_font": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x19E58", "width": 16, "height": 16, "type": "rgba16"}, +"common_texture_hud_type_C_rank_tiny_font_0": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A058", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_1": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A098", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_2": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A0D8", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_3": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A118", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_4": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A158", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_5": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A198", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_6": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A1D8", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_7": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A218", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_8": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A258", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, +"common_texture_hud_type_C_rank_tiny_font_9": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A298", "width": 8, "height": 8, "type": "ci8", "tlut": "common_tlut_hud_type_C_rank_tiny_font"}, -"gTextureCharacterPortraitBorder": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A2D8", "width": 32, "height": 32, "type": "ia4"} +"common_texture_character_portrait_border": {"output_dir": "hud_type_c", "rom_offset": "0x132B50", "block_offset": "0x1A2D8", "width": 32, "height": 32, "type": "ia4"} } diff --git a/assets/include/blueshell.mk b/assets/include/blueshell.mk index 31deb8771..57c8b128d 100644 --- a/assets/include/blueshell.mk +++ b/assets/include/blueshell.mk @@ -1,6 +1,6 @@ BLUESHELL_DIR := assets/blueshell -BLUESHELL_PALETTE := $(BLUESHELL_DIR)/gTLUTBlueShell.png +BLUESHELL_PALETTE := $(BLUESHELL_DIR)/common_tlut_blue_shell.png BLUESHELL_FRAMES := \ $(BLUESHELL_DIR)/gTextureBlueShell0.png \ diff --git a/assets/include/bomb.mk b/assets/include/bomb.mk index 0b3a37df6..12c48df46 100644 --- a/assets/include/bomb.mk +++ b/assets/include/bomb.mk @@ -1,12 +1,12 @@ BOMB_DIR := assets/bomb -BOMB_PALETTE := $(BOMB_DIR)/gTLUTBomb.png +BOMB_PALETTE := $(BOMB_DIR)/common_tlut_bomb.png BOMB_FRAMES := \ -$(BOMB_DIR)/gTextureBomb1.png \ -$(BOMB_DIR)/gTextureBomb2.png \ -$(BOMB_DIR)/gTextureBomb3.png \ -$(BOMB_DIR)/gTextureBomb4.png +$(BOMB_DIR)/common_texture_bomb_1.png \ +$(BOMB_DIR)/common_texture_bomb_2.png \ +$(BOMB_DIR)/common_texture_bomb_3.png \ +$(BOMB_DIR)/common_texture_bomb_4.png BOMB_EXPORT_SENTINEL := $(BOMB_DIR)/.export diff --git a/assets/include/character_portraits.mk b/assets/include/character_portraits.mk index 88529535c..2154aaaf9 100644 --- a/assets/include/character_portraits.mk +++ b/assets/include/character_portraits.mk @@ -1,43 +1,43 @@ PORTRAITS_DIR := assets/character_portraits PORTRAIT_PALETTES := \ -$(PORTRAITS_DIR)/gTLUTPortraitMario.png \ -$(PORTRAITS_DIR)/gTLUTPortraitLuigi.png \ -$(PORTRAITS_DIR)/gTLUTPortraitPeach.png \ -$(PORTRAITS_DIR)/gTLUTPortraitToad.png \ -$(PORTRAITS_DIR)/gTLUTPortraitYoshi.png \ -$(PORTRAITS_DIR)/gTLUTPortraitDonkeyKong.png \ -$(PORTRAITS_DIR)/gTLUTPortraitWario.png \ -$(PORTRAITS_DIR)/gTLUTPortraitBowser.png +$(PORTRAITS_DIR)/common_tlut_portrait_mario.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_luigi.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_peach.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_toad.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_yoshi.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_donkey_kong.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_wario.png \ +$(PORTRAITS_DIR)/common_tlut_portrait_bowser.png PORTRAIT_PNG := \ -$(PORTRAITS_DIR)/gTexturePortraitMario.png \ -$(PORTRAITS_DIR)/gTexturePortraitLuigi.png \ -$(PORTRAITS_DIR)/gTexturePortraitPeach.png \ -$(PORTRAITS_DIR)/gTexturePortraitToad.png \ -$(PORTRAITS_DIR)/gTexturePortraitYoshi.png \ -$(PORTRAITS_DIR)/gTexturePortraitDonkeyKong.png \ -$(PORTRAITS_DIR)/gTexturePortraitWario.png \ -$(PORTRAITS_DIR)/gTexturePortraitBowser.png +$(PORTRAITS_DIR)/common_texture_portrait_mario.png \ +$(PORTRAITS_DIR)/common_texture_portrait_luigi.png \ +$(PORTRAITS_DIR)/common_texture_portrait_peach.png \ +$(PORTRAITS_DIR)/common_texture_portrait_toad.png \ +$(PORTRAITS_DIR)/common_texture_portrait_yoshi.png \ +$(PORTRAITS_DIR)/common_texture_portrait_donkey_kong.png \ +$(PORTRAITS_DIR)/common_texture_portrait_wario.png \ +$(PORTRAITS_DIR)/common_texture_portrait_bowser.png # This is kind of ugly. I think the only fix for it would be to put these two portraits # and their palette in a separate .mk file. But I think that's even uglier -SPECIAL_PORTRAIT_PALETTE := $(PORTRAITS_DIR)/gTLUTPortraitBombKartAndQuestionMark.png +SPECIAL_PORTRAIT_PALETTE := $(PORTRAITS_DIR)/common_tlut_portrait_bomb_kart_and_question_mark.png SPECIAL_PORTRAIT_PNG := \ -$(PORTRAITS_DIR)/gTexturePortraitBombKart.png \ -$(PORTRAITS_DIR)/gTexturePortraitQuestionMark.png +$(PORTRAITS_DIR)/common_texture_portrait_bomb_kart.png \ +$(PORTRAITS_DIR)/common_texture_portrait_question_mark.png PORTRAIT_EXPORT_SENTINEL := $(PORTRAITS_DIR)/.export $(BUILD_DIR)/src/data/common_textures.inc.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAIT_PALETTES:%.png=%.inc.c) $(BUILD_DIR)/src/data/common_textures.inc.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c) -$(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/gTexturePortrait%.inc.c : $(PORTRAITS_DIR)/gTexturePortrait%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/gTLUTPortrait$*.png +$(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png + $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png -$(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/gTexturePortrait%.inc.c : $(PORTRAITS_DIR)/gTexturePortrait%.png +$(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE) $(PORTRAIT_PALETTES:%.png=%.inc.c): %.inc.c : %.png diff --git a/assets/include/debug_font.mk b/assets/include/debug_font.mk index 026f973cd..8f66d1765 100644 --- a/assets/include/debug_font.mk +++ b/assets/include/debug_font.mk @@ -1,8 +1,8 @@ DEBUG_FONT_DIR := assets/debug_font -DEBUG_FONT_PALETTE := $(DEBUG_FONT_DIR)/gTLUTDebugFont.png +DEBUG_FONT_PALETTE := $(DEBUG_FONT_DIR)/common_tlut_debug_font.png -DEBUG_FONT_PNG := $(DEBUG_FONT_DIR)/gTextureDebugFont.png +DEBUG_FONT_PNG := $(DEBUG_FONT_DIR)/common_texture_debug_font.png DEBUG_FONT_EXPORT_SENTINEL := $(DEBUG_FONT_DIR)/.export diff --git a/assets/include/finish_line_banner.mk b/assets/include/finish_line_banner.mk index e787171e4..a2d3b1886 100644 --- a/assets/include/finish_line_banner.mk +++ b/assets/include/finish_line_banner.mk @@ -1,6 +1,6 @@ FINISH_LINE_BANNER_DIR := assets/finish_line_banner -FINISH_LINE_BANNER_PALETTE := $(FINISH_LINE_BANNER_DIR)/gTLUTFinishLineBanner.png +FINISH_LINE_BANNER_PALETTE := $(FINISH_LINE_BANNER_DIR)/common_tlut_finish_line_banner.png FINISH_LINE_BANNER_PNG := \ $(FINISH_LINE_BANNER_DIR)/gTextureFinishLineBanner1.png \ diff --git a/assets/include/greenshell.mk b/assets/include/greenshell.mk index b763cb985..e329db203 100644 --- a/assets/include/greenshell.mk +++ b/assets/include/greenshell.mk @@ -1,6 +1,6 @@ GREENSHELL_DIR := assets/greenshell -GREENSHELL_PALETTE := $(GREENSHELL_DIR)/gTLUTGreenShell.png +GREENSHELL_PALETTE := $(GREENSHELL_DIR)/common_tlut_green_shell.png GREENSHELL_FRAMES := \ $(GREENSHELL_DIR)/gTextureGreenShell0.png \ diff --git a/assets/include/hud_type_c.mk b/assets/include/hud_type_c.mk index f8190c7ea..c9e1e06db 100644 --- a/assets/include/hud_type_c.mk +++ b/assets/include/hud_type_c.mk @@ -1,32 +1,32 @@ HUD_TYPE_C_DIR := assets/hud_type_c -HUD_TYPE_C_FONT_PALETTE := $(HUD_TYPE_C_DIR)/gTLUTHudTypeCRankFont.png +HUD_TYPE_C_FONT_PALETTE := $(HUD_TYPE_C_DIR)/common_tlut_hud_type_C_rank_font.png HUD_TYPE_C_FONT_PNG := \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont1.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont2.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont3.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont4.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont5.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont6.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont7.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankFont8.png +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_1.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_2.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_3.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_4.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_5.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_6.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_7.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_font_8.png -HUD_TYPE_C_TINY_FONT_PALETTE := $(HUD_TYPE_C_DIR)/gTLUTHudTypeCRankTinyFont.png +HUD_TYPE_C_TINY_FONT_PALETTE := $(HUD_TYPE_C_DIR)/common_tlut_hud_type_C_rank_tiny_font.png HUD_TYPE_C_TINY_FONT_PNG := \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont0.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont1.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont2.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont3.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont4.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont5.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont6.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont7.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont8.png \ -$(HUD_TYPE_C_DIR)/gTextureHudTypeCRankTinyFont9.png - -HUD_TYPE_C_PORTRAIT_BORDER_PNG := $(HUD_TYPE_C_DIR)/gTextureCharacterPortraitBorder.png +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_0.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_1.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_2.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_3.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_4.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_5.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_6.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_7.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_8.png \ +$(HUD_TYPE_C_DIR)/common_texture_hud_type_C_rank_tiny_font_9.png + +HUD_TYPE_C_PORTRAIT_BORDER_PNG := $(HUD_TYPE_C_DIR)/common_texture_character_portrait_border.png HUD_TYPE_C_EXPORT_SENTINEL := $(HUD_TYPE_C_DIR)/.export diff --git a/assets/include/item_window.mk b/assets/include/item_window.mk index efd131f11..cd41b2a9e 100644 --- a/assets/include/item_window.mk +++ b/assets/include/item_window.mk @@ -1,47 +1,47 @@ ITEM_WINDOW_DIR := assets/item_window ITEM_WINDOW_PALETTES := \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowNone.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowBanana.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowBananaBunch.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowMushroom.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowDoubleMushroom.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowTripleMushroom.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowSuperMushroom.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowBlueShell.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowBoo.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowGreenShell.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowTripleGreenShell.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowRedShell.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowTripleRedShell.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowStar.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowThunderBolt.png \ -$(ITEM_WINDOW_DIR)/gTLUTItemWindowFakeItemBox.png +$(ITEM_WINDOW_DIR)/common_tlut_item_window_none.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_banana.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_banana_bunch.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_double_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_triple_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_super_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_blue_shell.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_boo.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_green_shell.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_triple_green_shell.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_red_shell.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_triple_red_shell.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_star.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_thunder_bolt.png \ +$(ITEM_WINDOW_DIR)/common_tlut_item_window_fake_item_box.png ITEM_WINDOW_PNG := \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowNone.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowBanana.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowBananaBunch.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowMushroom.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowDoubleMushroom.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowTripleMushroom.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowSuperMushroom.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowBlueShell.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowBoo.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowGreenShell.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowTripleGreenShell.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowRedShell.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowTripleRedShell.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowStar.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowThunderBolt.png \ -$(ITEM_WINDOW_DIR)/gTextureItemWindowFakeItemBox.png +$(ITEM_WINDOW_DIR)/common_texture_item_window_none.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_banana.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_banana_bunch.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_double_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_triple_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_super_mushroom.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_blue_shell.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_boo.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_green_shell.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_triple_green_shell.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_red_shell.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_triple_red_shell.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_star.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_thunder_bolt.png \ +$(ITEM_WINDOW_DIR)/common_texture_item_window_fake_item_box.png ITEM_WINDOW_EXPORT_SENTINEL := $(ITEM_WINDOW_DIR)/.export $(BUILD_DIR)/src/data/common_textures.inc.o: $(ITEM_WINDOW_PNG:%.png=%.inc.c) $(ITEM_WINDOW_PALETTES:%.png=%.inc.c) -$(ITEM_WINDOW_DIR)/gTexture%.inc.c: $(ITEM_WINDOW_DIR)/gTexture%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/gTLUT$*.png +$(ITEM_WINDOW_DIR)/common_texture_%.inc.c: $(ITEM_WINDOW_DIR)/common_texture_%.png + $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/common_tlut_$*.png $(ITEM_WINDOW_PALETTES:%.png=%.inc.c): %.inc.c : %.png $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 diff --git a/assets/include/lakitu/bluelight.mk b/assets/include/lakitu/bluelight.mk index bdea64c63..df498e765 100644 --- a/assets/include/lakitu/bluelight.mk +++ b/assets/include/lakitu/bluelight.mk @@ -1,6 +1,6 @@ BLUELIGHT_DIR := assets/lakitu/bluelight -BLUELIGHT_PALETTE := $(BLUELIGHT_DIR)/gTLUTLakituBlueLight.png +BLUELIGHT_PALETTE := $(BLUELIGHT_DIR)/common_tlut_lakitu_blue_lights.png BLUELIGHT_FRAMES := \ $(BLUELIGHT_DIR)/gTextureLakituBlueLight1.png \ diff --git a/assets/include/lakitu/checkeredflag.mk b/assets/include/lakitu/checkeredflag.mk index c9ebcc35c..9fb4ab99b 100644 --- a/assets/include/lakitu/checkeredflag.mk +++ b/assets/include/lakitu/checkeredflag.mk @@ -1,6 +1,6 @@ CHECKEREDFLAG_DIR := assets/lakitu/checkeredflag -CHECKEREDFLAG_PALETTE := $(CHECKEREDFLAG_DIR)/gTLUTLakituCheckeredFlag.png +CHECKEREDFLAG_PALETTE := $(CHECKEREDFLAG_DIR)/common_tlut_lakitu_checkered_flag.png CHECKEREDFLAG_FRAMES := \ $(CHECKEREDFLAG_DIR)/gTextureLakituCheckeredFlag01.png \ diff --git a/assets/include/lakitu/finallap.mk b/assets/include/lakitu/finallap.mk index 821d071c5..153af322f 100644 --- a/assets/include/lakitu/finallap.mk +++ b/assets/include/lakitu/finallap.mk @@ -1,6 +1,6 @@ FINALLAP_DIR := assets/lakitu/finallap -FINALLAP_PALETTE := $(FINALLAP_DIR)/gTLUTLakituFinalLap.png +FINALLAP_PALETTE := $(FINALLAP_DIR)/common_tlut_lakitu_final_lap.png FINALLAP_FRAMES := \ $(FINALLAP_DIR)/gTextureLakituFinalLap01.png \ diff --git a/assets/include/lakitu/fishing.mk b/assets/include/lakitu/fishing.mk index e390f73ab..fe20afb80 100644 --- a/assets/include/lakitu/fishing.mk +++ b/assets/include/lakitu/fishing.mk @@ -1,6 +1,6 @@ FISHING_DIR := assets/lakitu/fishing -FISHING_PALETTE := $(FISHING_DIR)/gTLUTLakituFishing.png +FISHING_PALETTE := $(FISHING_DIR)/common_tlut_lakitu_fishing.png FISHING_FRAMES := \ $(FISHING_DIR)/gTextureLakituFishing1.png \ diff --git a/assets/include/lakitu/nolights.mk b/assets/include/lakitu/nolights.mk index 78220797b..90ad06933 100644 --- a/assets/include/lakitu/nolights.mk +++ b/assets/include/lakitu/nolights.mk @@ -1,6 +1,6 @@ NOLIGHTS_DIR := assets/lakitu/nolights -NOLIGHTS_PALETTE := $(NOLIGHTS_DIR)/gTLUTLakituNoLights.png +NOLIGHTS_PALETTE := $(NOLIGHTS_DIR)/common_tlut_lakitu_no_lights.png NOLIGHTS_FRAMES := \ $(NOLIGHTS_DIR)/gTextureLakituNoLights1.png \ diff --git a/assets/include/lakitu/redlights.mk b/assets/include/lakitu/redlights.mk index 62d10ee34..dd8a4976b 100644 --- a/assets/include/lakitu/redlights.mk +++ b/assets/include/lakitu/redlights.mk @@ -1,6 +1,6 @@ REDLIGHTS_DIR := assets/lakitu/redlights -REDLIGHTS_PALETTE := $(REDLIGHTS_DIR)/gTLUTLakituRedLights.png +REDLIGHTS_PALETTE := $(REDLIGHTS_DIR)/common_tlut_lakitu_red_lights.png REDLIGHTS_FRAMES := \ $(REDLIGHTS_DIR)/gTextureLakituRedLights01.png \ diff --git a/assets/include/lakitu/reverse.mk b/assets/include/lakitu/reverse.mk index 16128a233..74aadbf95 100644 --- a/assets/include/lakitu/reverse.mk +++ b/assets/include/lakitu/reverse.mk @@ -1,6 +1,6 @@ REVERSE_DIR := assets/lakitu/reverse -REVERSE_PALETTE := $(REVERSE_DIR)/gTLUTLakituReverse.png +REVERSE_PALETTE := $(REVERSE_DIR)/common_tlut_lakitu_reverse.png REVERSE_FRAMES := \ $(REVERSE_DIR)/gTextureLakituReverse01.png \ diff --git a/assets/include/lakitu/secondlap.mk b/assets/include/lakitu/secondlap.mk index 56630d503..d31d3be99 100644 --- a/assets/include/lakitu/secondlap.mk +++ b/assets/include/lakitu/secondlap.mk @@ -1,6 +1,6 @@ SECONDLAP_DIR := assets/lakitu/secondlap -SECONDLAP_PALETTE := $(SECONDLAP_DIR)/gTLUTLakituSecondLap.png +SECONDLAP_PALETTE := $(SECONDLAP_DIR)/common_tlut_lakitu_second_lap.png SECONDLAP_FRAMES := \ $(SECONDLAP_DIR)/gTextureLakituSecondLap01.png \ diff --git a/assets/include/minimap_icons.mk b/assets/include/minimap_icons.mk index 75d739c0b..b1fb9c298 100644 --- a/assets/include/minimap_icons.mk +++ b/assets/include/minimap_icons.mk @@ -1,15 +1,15 @@ MINIMAP_ICONS_DIR := assets/minimap_icons MINIMAP_ICONS_PNG := \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapFinishLine.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartMario.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartLuigi.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartYoshi.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartToad.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartDonkeyKong.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartWario.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartPeach.png \ -$(MINIMAP_ICONS_DIR)/gTextureMiniMapKartBowser.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_finish_line.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_mario.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_luigi.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_yoshi.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_toad.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_donkey_kong.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_wario.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_peach.png \ +$(MINIMAP_ICONS_DIR)/common_texture_minimap_kart_bowser.png \ $(MINIMAP_ICONS_DIR)/common_texture_minimap_progress_dot.png MINIMAP_ICONS_EXPORT_SENTINEL := $(MINIMAP_ICONS_DIR)/.export diff --git a/assets/include/player_emblems.mk b/assets/include/player_emblems.mk index f07e4301a..e1578cadd 100644 --- a/assets/include/player_emblems.mk +++ b/assets/include/player_emblems.mk @@ -1,12 +1,12 @@ PLAYER_EMBLEM_DIR := assets/player_emblems -PLAYER_EMBLEM_PALETTE := $(PLAYER_EMBLEM_DIR)/gTLUTPlayerEmblem.png +PLAYER_EMBLEM_PALETTE := $(PLAYER_EMBLEM_DIR)/common_tlut_player_emblem.png PLAYER_EMBLEM_PNGS := \ -$(PLAYER_EMBLEM_DIR)/gTexturePlayerEmblem1p.png \ -$(PLAYER_EMBLEM_DIR)/gTexturePlayerEmblem2p.png \ -$(PLAYER_EMBLEM_DIR)/gTexturePlayerEmblem3p.png \ -$(PLAYER_EMBLEM_DIR)/gTexturePlayerEmblem4p.png +$(PLAYER_EMBLEM_DIR)/common_texture_player_emblem_1p.png \ +$(PLAYER_EMBLEM_DIR)/common_texture_player_emblem_2p.png \ +$(PLAYER_EMBLEM_DIR)/common_texture_player_emblem_3p.png \ +$(PLAYER_EMBLEM_DIR)/common_texture_player_emblem_4p.png PLAYER_EMBLEM_EXPORT_SENTINEL := $(PLAYER_EMBLEM_DIR)/.export diff --git a/assets/include/trees.mk b/assets/include/trees.mk index 262df0f0e..a75ff5614 100644 --- a/assets/include/trees.mk +++ b/assets/include/trees.mk @@ -4,8 +4,8 @@ TREES_DIR := assets/trees # So we do something a little strange. We extract 2 versions of the TLUT. # gTLUTTrees is 16x16, meaning that is has some other TLUT data filling out the backend. This is the one used to extract/import the rest of # the tree pictures -# gTLUTTreesImport is 8x29. Only used as an inc.c file. -TREES_PALETTE_IMPORT := $(TREES_DIR)/gTLUTTreesImport.png +# common_tlut_trees_import is 8x29. Only used as an inc.c file. +TREES_PALETTE_IMPORT := $(TREES_DIR)/common_tlut_trees_import.png TREES_PALETTE := $(TREES_DIR)/gTLUTTrees.png TREES_PNG := \ diff --git a/assets/include/unused_traffic_light.mk b/assets/include/unused_traffic_light.mk index 6cad8b1ac..673de4f47 100644 --- a/assets/include/unused_traffic_light.mk +++ b/assets/include/unused_traffic_light.mk @@ -1,18 +1,18 @@ UNUSED_TRAFFIC_LIGHT_DIR := assets/unused_traffic_light -UNUSED_TRAFFIC_LIGHT_PALETTE := $(UNUSED_TRAFFIC_LIGHT_DIR)/gTLUTUnusedTrafficLight.png +UNUSED_TRAFFIC_LIGHT_PALETTE := $(UNUSED_TRAFFIC_LIGHT_DIR)/common_tlut_traffic_light.png UNUSED_TRAFFIC_LIGHT_PNG := \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight01.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight02.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight03.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight04.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight05.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight06.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight07.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight08.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight09.png \ -$(UNUSED_TRAFFIC_LIGHT_DIR)/gTextureUnusedTrafficLight10.png +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_01.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_02.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_03.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_04.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_05.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_06.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_07.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_08.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_09.png \ +$(UNUSED_TRAFFIC_LIGHT_DIR)/common_texture_traffic_light_10.png UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL := $(UNUSED_TRAFFIC_LIGHT_DIR)/.export diff --git a/assets/item_window.json b/assets/item_window.json index bafbae44f..13cab6fc5 100644 --- a/assets/item_window.json +++ b/assets/item_window.json @@ -1,35 +1,35 @@ { -"gTextureItemWindowNone": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FED8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowNone"}, -"gTextureItemWindowBanana": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x203D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowBanana"}, -"gTextureItemWindowBananaBunch": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x208D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowBananaBunch"}, -"gTextureItemWindowMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x20DD8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowMushroom"}, -"gTextureItemWindowDoubleMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x212D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowDoubleMushroom"}, -"gTextureItemWindowTripleMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x217D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowTripleMushroom"}, -"gTextureItemWindowSuperMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x21CD8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowSuperMushroom"}, -"gTextureItemWindowBlueShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x221D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowBlueShell"}, -"gTextureItemWindowBoo": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x226D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowBoo"}, -"gTextureItemWindowGreenShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x22BD8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowGreenShell"}, -"gTextureItemWindowTripleGreenShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x230D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowTripleGreenShell"}, -"gTextureItemWindowRedShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x235D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowRedShell"}, -"gTextureItemWindowTripleRedShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x23AD8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowTripleRedShell"}, -"gTextureItemWindowStar": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x23FD8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowStar"}, -"gTextureItemWindowThunderBolt": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x244D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowThunderBolt"}, -"gTextureItemWindowFakeItemBox": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x249D8", "width": 40, "height": 32, "type": "ci8", "tlut": "gTLUTItemWindowFakeItemBox"}, +"common_texture_item_window_none": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FED8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_none"}, +"common_texture_item_window_banana": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x203D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_banana"}, +"common_texture_item_window_banana_bunch": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x208D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_banana_bunch"}, +"common_texture_item_window_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x20DD8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_mushroom"}, +"common_texture_item_window_double_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x212D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_double_mushroom"}, +"common_texture_item_window_triple_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x217D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_triple_mushroom"}, +"common_texture_item_window_super_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x21CD8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_super_mushroom"}, +"common_texture_item_window_blue_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x221D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_blue_shell"}, +"common_texture_item_window_boo": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x226D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_boo"}, +"common_texture_item_window_green_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x22BD8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_green_shell"}, +"common_texture_item_window_triple_green_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x230D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_triple_green_shell"}, +"common_texture_item_window_red_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x235D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_red_shell"}, +"common_texture_item_window_triple_red_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x23AD8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_triple_red_shell"}, +"common_texture_item_window_star": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x23FD8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_star"}, +"common_texture_item_window_thunder_bolt": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x244D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_thunder_bolt"}, +"common_texture_item_window_fake_item_box": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x249D8", "width": 40, "height": 32, "type": "ci8", "tlut": "common_tlut_item_window_fake_item_box"}, -"gTLUTItemWindowNone": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1DED8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowBanana": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E0D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowBananaBunch": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E2D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E4D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowDoubleMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E6D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowTripleMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E8D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowSuperMushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1EAD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowBlueShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1ECD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowBoo": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1EED8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowGreenShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F0D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowTripleGreenShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F2D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowRedShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F4D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowTripleRedShell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F6D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowStar": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F8D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowThunderBolt": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FAD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTLUTItemWindowFakeItemBox": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FCD8", "width": 16, "height": 16, "type": "rgba16"} +"common_tlut_item_window_none": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1DED8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_banana": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E0D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_banana_bunch": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E2D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E4D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_double_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E6D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_triple_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1E8D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_super_mushroom": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1EAD8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_blue_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1ECD8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_boo": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1EED8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_green_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F0D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_triple_green_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F2D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_red_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F4D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_triple_red_shell": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F6D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_star": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1F8D8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_thunder_bolt": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FAD8", "width": 16, "height": 16, "type": "rgba16"}, +"common_tlut_item_window_fake_item_box": {"output_dir": "item_window", "rom_offset": "0x132B50", "block_offset": "0x1FCD8", "width": 16, "height": 16, "type": "rgba16"} } diff --git a/assets/lakitu/bluelight.json b/assets/lakitu/bluelight.json index 26dff1bda..803da7299 100644 --- a/assets/lakitu/bluelight.json +++ b/assets/lakitu/bluelight.json @@ -1,11 +1,11 @@ { -"gTLUTLakituBlueLight": {"output_dir": "bluelight", "rom_offset": "0x132B50", "block_offset": "0x252D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituBlueLight1": {"output_dir": "bluelight", "rom_offset": "0x6B84C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight2": {"output_dir": "bluelight", "rom_offset": "0x6B9480", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight3": {"output_dir": "bluelight", "rom_offset": "0x6BA440", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight4": {"output_dir": "bluelight", "rom_offset": "0x6BB400", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight5": {"output_dir": "bluelight", "rom_offset": "0x6BC3C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight6": {"output_dir": "bluelight", "rom_offset": "0x6BD380", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight7": {"output_dir": "bluelight", "rom_offset": "0x6BE340", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"}, -"gTextureLakituBlueLight8": {"output_dir": "bluelight", "rom_offset": "0x6BF300", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituBlueLight"} +"common_tlut_lakitu_blue_lights": {"output_dir": "bluelight", "rom_offset": "0x132B50", "block_offset": "0x252D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituBlueLight1": {"output_dir": "bluelight", "rom_offset": "0x6B84C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight2": {"output_dir": "bluelight", "rom_offset": "0x6B9480", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight3": {"output_dir": "bluelight", "rom_offset": "0x6BA440", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight4": {"output_dir": "bluelight", "rom_offset": "0x6BB400", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight5": {"output_dir": "bluelight", "rom_offset": "0x6BC3C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight6": {"output_dir": "bluelight", "rom_offset": "0x6BD380", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight7": {"output_dir": "bluelight", "rom_offset": "0x6BE340", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"}, +"gTextureLakituBlueLight8": {"output_dir": "bluelight", "rom_offset": "0x6BF300", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_blue_lights"} } diff --git a/assets/lakitu/checkeredflag.json b/assets/lakitu/checkeredflag.json index 61f631dc9..f440f7050 100644 --- a/assets/lakitu/checkeredflag.json +++ b/assets/lakitu/checkeredflag.json @@ -1,35 +1,35 @@ { -"gTLUTLakituCheckeredFlag": {"output_dir": "checkeredflag", "rom_offset": "0x132B50", "block_offset": "0x254D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituCheckeredFlag01": {"output_dir": "checkeredflag", "rom_offset": "0x6C02C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag02": {"output_dir": "checkeredflag", "rom_offset": "0x6C1280", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag03": {"output_dir": "checkeredflag", "rom_offset": "0x6C2240", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag04": {"output_dir": "checkeredflag", "rom_offset": "0x6C3200", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag05": {"output_dir": "checkeredflag", "rom_offset": "0x6C41C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag06": {"output_dir": "checkeredflag", "rom_offset": "0x6C5180", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag07": {"output_dir": "checkeredflag", "rom_offset": "0x6C6140", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag08": {"output_dir": "checkeredflag", "rom_offset": "0x6C7100", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag09": {"output_dir": "checkeredflag", "rom_offset": "0x6C80C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag10": {"output_dir": "checkeredflag", "rom_offset": "0x6C9080", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag11": {"output_dir": "checkeredflag", "rom_offset": "0x6CA040", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag12": {"output_dir": "checkeredflag", "rom_offset": "0x6CB000", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag13": {"output_dir": "checkeredflag", "rom_offset": "0x6CBFC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag14": {"output_dir": "checkeredflag", "rom_offset": "0x6CCF80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag15": {"output_dir": "checkeredflag", "rom_offset": "0x6CDF40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag16": {"output_dir": "checkeredflag", "rom_offset": "0x6CEF00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag17": {"output_dir": "checkeredflag", "rom_offset": "0x6CFEC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag18": {"output_dir": "checkeredflag", "rom_offset": "0x6D0E80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag19": {"output_dir": "checkeredflag", "rom_offset": "0x6D1E40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag20": {"output_dir": "checkeredflag", "rom_offset": "0x6D2E00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag21": {"output_dir": "checkeredflag", "rom_offset": "0x6D3DC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag22": {"output_dir": "checkeredflag", "rom_offset": "0x6D4D80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag23": {"output_dir": "checkeredflag", "rom_offset": "0x6D5D40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag24": {"output_dir": "checkeredflag", "rom_offset": "0x6D6D00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag25": {"output_dir": "checkeredflag", "rom_offset": "0x6D7CC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag26": {"output_dir": "checkeredflag", "rom_offset": "0x6D8C80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag27": {"output_dir": "checkeredflag", "rom_offset": "0x6D9C40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag28": {"output_dir": "checkeredflag", "rom_offset": "0x6DAC00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag29": {"output_dir": "checkeredflag", "rom_offset": "0x6DBBC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag30": {"output_dir": "checkeredflag", "rom_offset": "0x6DCB80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag31": {"output_dir": "checkeredflag", "rom_offset": "0x6DDB40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"}, -"gTextureLakituCheckeredFlag32": {"output_dir": "checkeredflag", "rom_offset": "0x6DEB00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituCheckeredFlag"} +"common_tlut_lakitu_checkered_flag": {"output_dir": "checkeredflag", "rom_offset": "0x132B50", "block_offset": "0x254D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituCheckeredFlag01": {"output_dir": "checkeredflag", "rom_offset": "0x6C02C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag02": {"output_dir": "checkeredflag", "rom_offset": "0x6C1280", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag03": {"output_dir": "checkeredflag", "rom_offset": "0x6C2240", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag04": {"output_dir": "checkeredflag", "rom_offset": "0x6C3200", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag05": {"output_dir": "checkeredflag", "rom_offset": "0x6C41C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag06": {"output_dir": "checkeredflag", "rom_offset": "0x6C5180", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag07": {"output_dir": "checkeredflag", "rom_offset": "0x6C6140", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag08": {"output_dir": "checkeredflag", "rom_offset": "0x6C7100", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag09": {"output_dir": "checkeredflag", "rom_offset": "0x6C80C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag10": {"output_dir": "checkeredflag", "rom_offset": "0x6C9080", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag11": {"output_dir": "checkeredflag", "rom_offset": "0x6CA040", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag12": {"output_dir": "checkeredflag", "rom_offset": "0x6CB000", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag13": {"output_dir": "checkeredflag", "rom_offset": "0x6CBFC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag14": {"output_dir": "checkeredflag", "rom_offset": "0x6CCF80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag15": {"output_dir": "checkeredflag", "rom_offset": "0x6CDF40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag16": {"output_dir": "checkeredflag", "rom_offset": "0x6CEF00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag17": {"output_dir": "checkeredflag", "rom_offset": "0x6CFEC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag18": {"output_dir": "checkeredflag", "rom_offset": "0x6D0E80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag19": {"output_dir": "checkeredflag", "rom_offset": "0x6D1E40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag20": {"output_dir": "checkeredflag", "rom_offset": "0x6D2E00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag21": {"output_dir": "checkeredflag", "rom_offset": "0x6D3DC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag22": {"output_dir": "checkeredflag", "rom_offset": "0x6D4D80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag23": {"output_dir": "checkeredflag", "rom_offset": "0x6D5D40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag24": {"output_dir": "checkeredflag", "rom_offset": "0x6D6D00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag25": {"output_dir": "checkeredflag", "rom_offset": "0x6D7CC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag26": {"output_dir": "checkeredflag", "rom_offset": "0x6D8C80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag27": {"output_dir": "checkeredflag", "rom_offset": "0x6D9C40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag28": {"output_dir": "checkeredflag", "rom_offset": "0x6DAC00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag29": {"output_dir": "checkeredflag", "rom_offset": "0x6DBBC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag30": {"output_dir": "checkeredflag", "rom_offset": "0x6DCB80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag31": {"output_dir": "checkeredflag", "rom_offset": "0x6DDB40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"}, +"gTextureLakituCheckeredFlag32": {"output_dir": "checkeredflag", "rom_offset": "0x6DEB00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_checkered_flag"} } diff --git a/assets/lakitu/finallap.json b/assets/lakitu/finallap.json index 34e15963f..47129a4a2 100644 --- a/assets/lakitu/finallap.json +++ b/assets/lakitu/finallap.json @@ -1,19 +1,19 @@ { -"gTLUTLakituFinalLap": {"output_dir": "finallap", "rom_offset": "0x132B50", "block_offset": "0x258D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituFinalLap01": {"output_dir": "finallap", "rom_offset": "0x6EF6C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap02": {"output_dir": "finallap", "rom_offset": "0x6F0680", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap03": {"output_dir": "finallap", "rom_offset": "0x6F1640", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap04": {"output_dir": "finallap", "rom_offset": "0x6F2600", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap05": {"output_dir": "finallap", "rom_offset": "0x6F35C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap06": {"output_dir": "finallap", "rom_offset": "0x6F4580", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap07": {"output_dir": "finallap", "rom_offset": "0x6F5540", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap08": {"output_dir": "finallap", "rom_offset": "0x6F6500", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap09": {"output_dir": "finallap", "rom_offset": "0x6F74C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap10": {"output_dir": "finallap", "rom_offset": "0x6F8480", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap11": {"output_dir": "finallap", "rom_offset": "0x6F9440", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap12": {"output_dir": "finallap", "rom_offset": "0x6FA400", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap13": {"output_dir": "finallap", "rom_offset": "0x6FB3C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap14": {"output_dir": "finallap", "rom_offset": "0x6FC380", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap15": {"output_dir": "finallap", "rom_offset": "0x6FD340", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"}, -"gTextureLakituFinalLap16": {"output_dir": "finallap", "rom_offset": "0x6FE300", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituFinalLap"} +"common_tlut_lakitu_final_lap": {"output_dir": "finallap", "rom_offset": "0x132B50", "block_offset": "0x258D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituFinalLap01": {"output_dir": "finallap", "rom_offset": "0x6EF6C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap02": {"output_dir": "finallap", "rom_offset": "0x6F0680", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap03": {"output_dir": "finallap", "rom_offset": "0x6F1640", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap04": {"output_dir": "finallap", "rom_offset": "0x6F2600", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap05": {"output_dir": "finallap", "rom_offset": "0x6F35C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap06": {"output_dir": "finallap", "rom_offset": "0x6F4580", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap07": {"output_dir": "finallap", "rom_offset": "0x6F5540", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap08": {"output_dir": "finallap", "rom_offset": "0x6F6500", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap09": {"output_dir": "finallap", "rom_offset": "0x6F74C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap10": {"output_dir": "finallap", "rom_offset": "0x6F8480", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap11": {"output_dir": "finallap", "rom_offset": "0x6F9440", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap12": {"output_dir": "finallap", "rom_offset": "0x6FA400", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap13": {"output_dir": "finallap", "rom_offset": "0x6FB3C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap14": {"output_dir": "finallap", "rom_offset": "0x6FC380", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap15": {"output_dir": "finallap", "rom_offset": "0x6FD340", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"}, +"gTextureLakituFinalLap16": {"output_dir": "finallap", "rom_offset": "0x6FE300", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_final_lap"} } diff --git a/assets/lakitu/fishing.json b/assets/lakitu/fishing.json index de76cca14..2229fa190 100644 --- a/assets/lakitu/fishing.json +++ b/assets/lakitu/fishing.json @@ -1,7 +1,7 @@ { -"gTLUTLakituFishing": {"output_dir": "fishing", "rom_offset": "0x132B50", "block_offset": "0x25CD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituFishing1": {"output_dir": "fishing", "rom_offset": "0x70EEC0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituFishing"}, -"gTextureLakituFishing2": {"output_dir": "fishing", "rom_offset": "0x70FE80", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituFishing"}, -"gTextureLakituFishing3": {"output_dir": "fishing", "rom_offset": "0x710E40", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituFishing"}, -"gTextureLakituFishing4": {"output_dir": "fishing", "rom_offset": "0x711E00", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituFishing"} +"common_tlut_lakitu_fishing": {"output_dir": "fishing", "rom_offset": "0x132B50", "block_offset": "0x25CD8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituFishing1": {"output_dir": "fishing", "rom_offset": "0x70EEC0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_fishing"}, +"gTextureLakituFishing2": {"output_dir": "fishing", "rom_offset": "0x70FE80", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_fishing"}, +"gTextureLakituFishing3": {"output_dir": "fishing", "rom_offset": "0x710E40", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_fishing"}, +"gTextureLakituFishing4": {"output_dir": "fishing", "rom_offset": "0x711E00", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_fishing"} } diff --git a/assets/lakitu/nolights.json b/assets/lakitu/nolights.json index 23abaafb4..d076e6590 100644 --- a/assets/lakitu/nolights.json +++ b/assets/lakitu/nolights.json @@ -1,11 +1,11 @@ { -"gTLUTLakituNoLights": {"output_dir": "nolights", "rom_offset": "0x132B50", "block_offset": "0x24ED8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituNoLights1": {"output_dir": "nolights", "rom_offset": "0x6A0AC0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights2": {"output_dir": "nolights", "rom_offset": "0x6A1A80", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights3": {"output_dir": "nolights", "rom_offset": "0x6A2A40", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights4": {"output_dir": "nolights", "rom_offset": "0x6A3A00", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights5": {"output_dir": "nolights", "rom_offset": "0x6A49C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights6": {"output_dir": "nolights", "rom_offset": "0x6A5980", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights7": {"output_dir": "nolights", "rom_offset": "0x6A6940", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"}, -"gTextureLakituNoLights8": {"output_dir": "nolights", "rom_offset": "0x6A7900", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituNoLights"} +"common_tlut_lakitu_no_lights": {"output_dir": "nolights", "rom_offset": "0x132B50", "block_offset": "0x24ED8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituNoLights1": {"output_dir": "nolights", "rom_offset": "0x6A0AC0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights2": {"output_dir": "nolights", "rom_offset": "0x6A1A80", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights3": {"output_dir": "nolights", "rom_offset": "0x6A2A40", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights4": {"output_dir": "nolights", "rom_offset": "0x6A3A00", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights5": {"output_dir": "nolights", "rom_offset": "0x6A49C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights6": {"output_dir": "nolights", "rom_offset": "0x6A5980", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights7": {"output_dir": "nolights", "rom_offset": "0x6A6940", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"}, +"gTextureLakituNoLights8": {"output_dir": "nolights", "rom_offset": "0x6A7900", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_no_lights"} } diff --git a/assets/lakitu/redlights.json b/assets/lakitu/redlights.json index ff038baad..50c9d3392 100644 --- a/assets/lakitu/redlights.json +++ b/assets/lakitu/redlights.json @@ -1,19 +1,19 @@ { -"gTLUTLakituRedLights": {"output_dir": "redlights", "rom_offset": "0x132B50", "block_offset": "0x250D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituRedLights01": {"output_dir": "redlights", "rom_offset": "0x6A88C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights02": {"output_dir": "redlights", "rom_offset": "0x6A9880", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights03": {"output_dir": "redlights", "rom_offset": "0x6AA840", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights04": {"output_dir": "redlights", "rom_offset": "0x6AB800", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights05": {"output_dir": "redlights", "rom_offset": "0x6AC7C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights06": {"output_dir": "redlights", "rom_offset": "0x6AD780", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights07": {"output_dir": "redlights", "rom_offset": "0x6AE740", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights08": {"output_dir": "redlights", "rom_offset": "0x6AF700", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights09": {"output_dir": "redlights", "rom_offset": "0x6B06C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights10": {"output_dir": "redlights", "rom_offset": "0x6B1680", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights11": {"output_dir": "redlights", "rom_offset": "0x6B2640", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights12": {"output_dir": "redlights", "rom_offset": "0x6B3600", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights13": {"output_dir": "redlights", "rom_offset": "0x6B45C0", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights14": {"output_dir": "redlights", "rom_offset": "0x6B5580", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights15": {"output_dir": "redlights", "rom_offset": "0x6B6540", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"}, -"gTextureLakituRedLights16": {"output_dir": "redlights", "rom_offset": "0x6B7500", "width": 56, "height": 72, "type": "ci8", "tlut": "gTLUTLakituRedLights"} +"common_tlut_lakitu_red_lights": {"output_dir": "redlights", "rom_offset": "0x132B50", "block_offset": "0x250D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituRedLights01": {"output_dir": "redlights", "rom_offset": "0x6A88C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights02": {"output_dir": "redlights", "rom_offset": "0x6A9880", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights03": {"output_dir": "redlights", "rom_offset": "0x6AA840", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights04": {"output_dir": "redlights", "rom_offset": "0x6AB800", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights05": {"output_dir": "redlights", "rom_offset": "0x6AC7C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights06": {"output_dir": "redlights", "rom_offset": "0x6AD780", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights07": {"output_dir": "redlights", "rom_offset": "0x6AE740", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights08": {"output_dir": "redlights", "rom_offset": "0x6AF700", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights09": {"output_dir": "redlights", "rom_offset": "0x6B06C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights10": {"output_dir": "redlights", "rom_offset": "0x6B1680", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights11": {"output_dir": "redlights", "rom_offset": "0x6B2640", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights12": {"output_dir": "redlights", "rom_offset": "0x6B3600", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights13": {"output_dir": "redlights", "rom_offset": "0x6B45C0", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights14": {"output_dir": "redlights", "rom_offset": "0x6B5580", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights15": {"output_dir": "redlights", "rom_offset": "0x6B6540", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"}, +"gTextureLakituRedLights16": {"output_dir": "redlights", "rom_offset": "0x6B7500", "width": 56, "height": 72, "type": "ci8", "tlut": "common_tlut_lakitu_red_lights"} } diff --git a/assets/lakitu/reverse.json b/assets/lakitu/reverse.json index 040f95e0c..512b51f3c 100644 --- a/assets/lakitu/reverse.json +++ b/assets/lakitu/reverse.json @@ -1,19 +1,19 @@ { -"gTLUTLakituReverse": {"output_dir": "reverse", "rom_offset": "0x132B50", "block_offset": "0x25AD8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituReverse01": {"output_dir": "reverse", "rom_offset": "0x6FF2C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse02": {"output_dir": "reverse", "rom_offset": "0x700280", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse03": {"output_dir": "reverse", "rom_offset": "0x701240", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse04": {"output_dir": "reverse", "rom_offset": "0x702200", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse05": {"output_dir": "reverse", "rom_offset": "0x7031C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse06": {"output_dir": "reverse", "rom_offset": "0x704180", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse07": {"output_dir": "reverse", "rom_offset": "0x705140", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse08": {"output_dir": "reverse", "rom_offset": "0x706100", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse09": {"output_dir": "reverse", "rom_offset": "0x7070C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse10": {"output_dir": "reverse", "rom_offset": "0x708080", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse11": {"output_dir": "reverse", "rom_offset": "0x709040", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse12": {"output_dir": "reverse", "rom_offset": "0x70A000", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse13": {"output_dir": "reverse", "rom_offset": "0x70AFC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse14": {"output_dir": "reverse", "rom_offset": "0x70BF80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse15": {"output_dir": "reverse", "rom_offset": "0x70CF40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"}, -"gTextureLakituReverse16": {"output_dir": "reverse", "rom_offset": "0x70DF00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituReverse"} +"common_tlut_lakitu_reverse": {"output_dir": "reverse", "rom_offset": "0x132B50", "block_offset": "0x25AD8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituReverse01": {"output_dir": "reverse", "rom_offset": "0x6FF2C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse02": {"output_dir": "reverse", "rom_offset": "0x700280", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse03": {"output_dir": "reverse", "rom_offset": "0x701240", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse04": {"output_dir": "reverse", "rom_offset": "0x702200", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse05": {"output_dir": "reverse", "rom_offset": "0x7031C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse06": {"output_dir": "reverse", "rom_offset": "0x704180", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse07": {"output_dir": "reverse", "rom_offset": "0x705140", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse08": {"output_dir": "reverse", "rom_offset": "0x706100", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse09": {"output_dir": "reverse", "rom_offset": "0x7070C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse10": {"output_dir": "reverse", "rom_offset": "0x708080", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse11": {"output_dir": "reverse", "rom_offset": "0x709040", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse12": {"output_dir": "reverse", "rom_offset": "0x70A000", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse13": {"output_dir": "reverse", "rom_offset": "0x70AFC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse14": {"output_dir": "reverse", "rom_offset": "0x70BF80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse15": {"output_dir": "reverse", "rom_offset": "0x70CF40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"}, +"gTextureLakituReverse16": {"output_dir": "reverse", "rom_offset": "0x70DF00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_reverse"} } diff --git a/assets/lakitu/secondlap.json b/assets/lakitu/secondlap.json index 0d52afb83..ffc292a50 100644 --- a/assets/lakitu/secondlap.json +++ b/assets/lakitu/secondlap.json @@ -1,19 +1,19 @@ { -"gTLUTLakituSecondLap": {"output_dir": "secondlap", "rom_offset": "0x132B50", "block_offset": "0x256D8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureLakituSecondLap01": {"output_dir": "secondlap", "rom_offset": "0x6DFAC0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap02": {"output_dir": "secondlap", "rom_offset": "0x6E0A80", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap03": {"output_dir": "secondlap", "rom_offset": "0x6E1A40", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap04": {"output_dir": "secondlap", "rom_offset": "0x6E2A00", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap05": {"output_dir": "secondlap", "rom_offset": "0x6E39C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap06": {"output_dir": "secondlap", "rom_offset": "0x6E4980", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap07": {"output_dir": "secondlap", "rom_offset": "0x6E5940", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap08": {"output_dir": "secondlap", "rom_offset": "0x6E6900", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap09": {"output_dir": "secondlap", "rom_offset": "0x6E78C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap10": {"output_dir": "secondlap", "rom_offset": "0x6E8880", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap11": {"output_dir": "secondlap", "rom_offset": "0x6E9840", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap12": {"output_dir": "secondlap", "rom_offset": "0x6EA800", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap13": {"output_dir": "secondlap", "rom_offset": "0x6EB7C0", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap14": {"output_dir": "secondlap", "rom_offset": "0x6EC780", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap15": {"output_dir": "secondlap", "rom_offset": "0x6ED740", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"}, -"gTextureLakituSecondLap16": {"output_dir": "secondlap", "rom_offset": "0x6EE700", "width": 72, "height": 56, "type": "ci8", "tlut": "gTLUTLakituSecondLap"} +"common_tlut_lakitu_second_lap": {"output_dir": "secondlap", "rom_offset": "0x132B50", "block_offset": "0x256D8", "width": 16, "height": 16, "type": "rgba16"}, +"gTextureLakituSecondLap01": {"output_dir": "secondlap", "rom_offset": "0x6DFAC0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap02": {"output_dir": "secondlap", "rom_offset": "0x6E0A80", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap03": {"output_dir": "secondlap", "rom_offset": "0x6E1A40", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap04": {"output_dir": "secondlap", "rom_offset": "0x6E2A00", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap05": {"output_dir": "secondlap", "rom_offset": "0x6E39C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap06": {"output_dir": "secondlap", "rom_offset": "0x6E4980", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap07": {"output_dir": "secondlap", "rom_offset": "0x6E5940", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap08": {"output_dir": "secondlap", "rom_offset": "0x6E6900", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap09": {"output_dir": "secondlap", "rom_offset": "0x6E78C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap10": {"output_dir": "secondlap", "rom_offset": "0x6E8880", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap11": {"output_dir": "secondlap", "rom_offset": "0x6E9840", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap12": {"output_dir": "secondlap", "rom_offset": "0x6EA800", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap13": {"output_dir": "secondlap", "rom_offset": "0x6EB7C0", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap14": {"output_dir": "secondlap", "rom_offset": "0x6EC780", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap15": {"output_dir": "secondlap", "rom_offset": "0x6ED740", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"}, +"gTextureLakituSecondLap16": {"output_dir": "secondlap", "rom_offset": "0x6EE700", "width": 72, "height": 56, "type": "ci8", "tlut": "common_tlut_lakitu_second_lap"} } diff --git a/assets/minimap_icons.json b/assets/minimap_icons.json index aa105b692..d8a7709b4 100644 --- a/assets/minimap_icons.json +++ b/assets/minimap_icons.json @@ -1,12 +1,12 @@ { -"gTextureMiniMapFinishLine": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CC58", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartMario": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CCD8", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartLuigi": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CD58", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartYoshi": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CDD8", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartToad": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CE58", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartDonkeyKong": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CED8", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartWario": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CF58", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartPeach": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CFD8", "width": 8, "height": 8, "type": "rgba16"}, -"gTextureMiniMapKartBowser": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2D058", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_finish_line": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CC58", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_mario": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CCD8", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_luigi": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CD58", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_yoshi": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CDD8", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_toad": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CE58", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_donkey_kong": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CED8", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_wario": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CF58", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_peach": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2CFD8", "width": 8, "height": 8, "type": "rgba16"}, +"common_texture_minimap_kart_bowser": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2D058", "width": 8, "height": 8, "type": "rgba16"}, "common_texture_minimap_progress_dot": {"output_dir": "minimap_icons", "rom_offset": "0x132B50", "block_offset": "0x2D0D8", "width": 8, "height": 8, "type": "rgba16"} }
\ No newline at end of file diff --git a/assets/player_emblems.json b/assets/player_emblems.json index 69f8ff02d..1fba58970 100644 --- a/assets/player_emblems.json +++ b/assets/player_emblems.json @@ -1,7 +1,7 @@ { -"gTLUTPlayerEmblem": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17258", "width": 16, "height": 16, "type": "rgba16"}, -"gTexturePlayerEmblem1p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17458", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTPlayerEmblem"}, -"gTexturePlayerEmblem2p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17C58", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTPlayerEmblem"}, -"gTexturePlayerEmblem3p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x18458", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTPlayerEmblem"}, -"gTexturePlayerEmblem4p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x18C58", "width": 64, "height": 32, "type": "ci8", "tlut": "gTLUTPlayerEmblem"} +"common_tlut_player_emblem": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17258", "width": 16, "height": 16, "type": "rgba16"}, +"common_texture_player_emblem_1p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17458", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_player_emblem"}, +"common_texture_player_emblem_2p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x17C58", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_player_emblem"}, +"common_texture_player_emblem_3p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x18458", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_player_emblem"}, +"common_texture_player_emblem_4p": {"output_dir": "player_emblems", "rom_offset": "0x132B50", "block_offset": "0x18C58", "width": 64, "height": 32, "type": "ci8", "tlut": "common_tlut_player_emblem"} } diff --git a/assets/trees.json b/assets/trees.json index affc1d5f5..b63ec8df8 100644 --- a/assets/trees.json +++ b/assets/trees.json @@ -1,5 +1,5 @@ { -"gTLUTTreesImport": {"output_dir": "trees", "rom_offset": "0x132B50", "block_offset": "0x04C68", "width": 8, "height": 29, "type": "rgba16"}, +"common_tlut_trees_import": {"output_dir": "trees", "rom_offset": "0x132B50", "block_offset": "0x04C68", "width": 8, "height": 29, "type": "rgba16"}, "gTLUTTrees": {"output_dir": "trees", "rom_offset": "0x132B50", "block_offset": "0x04C68", "width": 16, "height": 16, "type": "rgba16"}, "gTextureTrees1": {"output_dir": "trees", "rom_offset": "0x6913CC", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"}, "gTextureTrees2": {"output_dir": "trees", "rom_offset": "0x691714", "width": 32, "height": 64, "type": "ci8", "tlut": "gTLUTTrees"}, diff --git a/assets/unused_traffic_light.json b/assets/unused_traffic_light.json index 49a652bc4..9c54f1ecb 100644 --- a/assets/unused_traffic_light.json +++ b/assets/unused_traffic_light.json @@ -1,13 +1,13 @@ { -"gTLUTUnusedTrafficLight": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x25ED8", "width": 16, "height": 16, "type": "rgba16"}, -"gTextureUnusedTrafficLight01": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x260D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight02": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26558", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight03": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x269D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight04": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26E58", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight05": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x272D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight06": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27758", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight07": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27BD8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight08": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28058", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight09": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x284D8", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"}, -"gTextureUnusedTrafficLight10": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28958", "width": 24, "height": 48, "type": "ci8", "tlut": "gTLUTUnusedTrafficLight"} +"common_tlut_traffic_light": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x25ED8", "width": 16, "height": 16, "type": "rgba16"}, +"common_texture_traffic_light_01": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x260D8", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_02": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26558", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_03": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x269D8", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_04": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x26E58", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_05": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x272D8", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_06": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27758", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_07": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x27BD8", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_08": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28058", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_09": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x284D8", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"}, +"common_texture_traffic_light_10": {"output_dir": "unused_traffic_light", "rom_offset": "0x132B50", "block_offset": "0x28958", "width": 24, "height": 48, "type": "ci8", "tlut": "common_tlut_traffic_light"} } diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 4f78f2317..af5725b25 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -1080,7 +1080,7 @@ void func_80059360(void) { if (D_801657B0 == 0) { func_8004FA78(0); if (playerHUD[PLAYER_ONE].lapCount != 3) { - func_8004CB60(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, D_0D00A958); + func_8004CB60(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, common_texture_hud_lap); func_8004FC78(playerHUD[PLAYER_ONE].lapX + 0xC, playerHUD[PLAYER_ONE].lapY - 4, playerHUD[PLAYER_ONE].alsoLapCount); func_8004E638(0); } @@ -1095,7 +1095,7 @@ void func_800593F8(void) { if (D_801657B0 == 0) { func_8004FA78(1); if (playerHUD[PLAYER_TWO].lapCount != 3) { - func_8004CB60(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, D_0D00A958); + func_8004CB60(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, common_texture_hud_lap); func_8004FC78(playerHUD[PLAYER_TWO].lapX + 0xC, playerHUD[PLAYER_TWO].lapY - 4, playerHUD[PLAYER_TWO].alsoLapCount); func_8004E638(1); } @@ -1133,12 +1133,12 @@ void func_80059530(void) { void func_80059560(s32 playerId) { if (gModeSelection != BATTLE) { if (D_801657F8 && gIsHUDVisible) { - func_8004CB60(playerHUD[playerId].lapX, playerHUD[playerId].lapY, D_0D00A958); + func_8004CB60(playerHUD[playerId].lapX, playerHUD[playerId].lapY, common_texture_hud_lap); func_8004FC78(playerHUD[playerId].lapX - 12, playerHUD[playerId].lapY + 4, playerHUD[playerId].alsoLapCount); } if (D_801657E4 == 2) { if (playerHUD[playerId].unk_74 && D_80165608) { - func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f, gTLUTPortraitBombKartAndQuestionMark, gTexturePortraitBombKart, D_0D005AE0, 0x20, 0x20, 0x20, 0x20); + func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f, common_tlut_portrait_bomb_kart_and_question_mark, common_texture_portrait_bomb_kart, D_0D005AE0, 0x20, 0x20, 0x20, 0x20); } } } @@ -4840,7 +4840,7 @@ void func_8006538C(Player *player, s8 arg1, s16 arg2, s8 arg3) { primAlpha = player->unk_258[arg2].unk_03E; func_800652D4(spB4, spAC, ((player->unk_258[arg2].unk_00C * player->size) * 1.4)); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_0D02BC58[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER); gSPDisplayList(gDisplayListHead++, D_0D008E48); @@ -4854,7 +4854,7 @@ void func_8006538C(Player *player, s8 arg1, s16 arg2, s8 arg3) { primAlpha = player->unk_258[arg2].unk_03E; func_800652D4(spB4, spAC, player->unk_258[arg2].unk_00C * player->size); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_0D02BC58[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha); gSPDisplayList(gDisplayListHead++, D_0D008E48); } @@ -5059,7 +5059,7 @@ void func_80066714(Player *player, UNUSED s32 arg1, s16 arg2, s8 arg3) { func_800652D4(sp5C, sp54, player->unk_258[10 + arg2].unk_00C * player->size); gSPDisplayList(gDisplayListHead++, D_0D008C90); gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); - gDPLoadTextureBlock(gDisplayListHead++, D_0D000200, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_fire, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B35C(red, green, blue, alpha); gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); gSPVertex(gDisplayListHead++, D_800E8B00, 4, 0); @@ -5194,12 +5194,12 @@ void func_80067604(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3) { func_800652D4(sp8C, sp84, player->unk_258[30 + arg2].unk_00C * player->size); if (player->unk_258[30 + arg2].unk_010 == 1) { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060); gSPDisplayList(gDisplayListHead++, D_0D008E70); } else { gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060); gSPDisplayList(gDisplayListHead++, D_0D008E48); } @@ -5978,7 +5978,7 @@ void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4) { sp44[2] = 0; func_800652D4(sp4C, sp44, arg1); gSPDisplayList(gDisplayListHead++, D_0D008DB8); - gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58[arg4], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark[arg4], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); func_8004B414(red, green, blue, alpha); gSPDisplayList(gDisplayListHead++, D_0D008E48); gMatrixEffectCount += 1; diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 73d24e70e..e33513231 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -150,10 +150,10 @@ void init_item_window(s32 objectIndex) { temp_v0 = &gObjectList[objectIndex]; temp_v0->currentItem = ITEM_NONE; temp_v0->itemDisplay = temp_v0->currentItem; - temp_v0->tlutList = (s32 *) gTLUTItemWindowNone; - temp_v0->activeTLUT = (s32 *) gTLUTItemWindowNone; - temp_v0->textureList = gTextureItemWindowNone; - temp_v0->activeTexture = gTextureItemWindowNone; + temp_v0->tlutList = (s32 *) common_tlut_item_window_none; + temp_v0->activeTLUT = (s32 *) common_tlut_item_window_none; + temp_v0->textureList = common_texture_item_window_none; + temp_v0->activeTexture = common_texture_item_window_none; temp_v0->unk_04C = -1; temp_v0->unk_09C = 0x00A0; // Screen X position temp_v0->unk_09E = -0x0020; // Screen Y position diff --git a/src/code_80071F00.c b/src/code_80071F00.c index a402005ad..e5e32542f 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -67,31 +67,31 @@ Vtx D_800E44B0[] = { }; u8 *gItemWindowTLUTs[] = { - gTLUTItemWindowNone, gTLUTItemWindowBanana, gTLUTItemWindowBananaBunch, gTLUTItemWindowGreenShell, - gTLUTItemWindowTripleGreenShell, gTLUTItemWindowRedShell, gTLUTItemWindowTripleRedShell, gTLUTItemWindowBlueShell, - gTLUTItemWindowThunderBolt, gTLUTItemWindowFakeItemBox, gTLUTItemWindowStar, gTLUTItemWindowBoo, - gTLUTItemWindowMushroom, gTLUTItemWindowDoubleMushroom, gTLUTItemWindowTripleMushroom, gTLUTItemWindowSuperMushroom + common_tlut_item_window_none, common_tlut_item_window_banana, common_tlut_item_window_banana_bunch, common_tlut_item_window_green_shell, + common_tlut_item_window_triple_green_shell, common_tlut_item_window_red_shell, common_tlut_item_window_triple_red_shell, common_tlut_item_window_blue_shell, + common_tlut_item_window_thunder_bolt, common_tlut_item_window_fake_item_box, common_tlut_item_window_star, common_tlut_item_window_boo, + common_tlut_item_window_mushroom, common_tlut_item_window_double_mushroom, common_tlut_item_window_triple_mushroom, common_tlut_item_window_super_mushroom }; u8 *gItemWindowTextures[] = { - gTextureItemWindowNone, gTextureItemWindowBanana, gTextureItemWindowBananaBunch, gTextureItemWindowGreenShell, - gTextureItemWindowTripleGreenShell, gTextureItemWindowRedShell, gTextureItemWindowTripleRedShell, gTextureItemWindowBlueShell, - gTextureItemWindowThunderBolt, gTextureItemWindowFakeItemBox, gTextureItemWindowStar, gTextureItemWindowBoo, - gTextureItemWindowMushroom, gTextureItemWindowDoubleMushroom, gTextureItemWindowTripleMushroom, gTextureItemWindowSuperMushroom + common_texture_item_window_none, common_texture_item_window_banana, common_texture_item_window_banana_bunch, common_texture_item_window_green_shell, + common_texture_item_window_triple_green_shell, common_texture_item_window_red_shell, common_texture_item_window_triple_red_shell, common_texture_item_window_blue_shell, + common_texture_item_window_thunder_bolt, common_texture_item_window_fake_item_box, common_texture_item_window_star, common_texture_item_window_boo, + common_texture_item_window_mushroom, common_texture_item_window_double_mushroom, common_texture_item_window_triple_mushroom, common_texture_item_window_super_mushroom }; u8 *D_800E4570[] = { - D_0D00B158, D_0D00B558, D_0D00B958 + common_texture_hud_lap_1_on_3, common_texture_hud_lap_2_on_3, common_texture_hud_lap_3_on_3 }; u8 *gPortraitTLUTs[] = { - gTLUTPortraitMario, gTLUTPortraitLuigi, gTLUTPortraitYoshi, gTLUTPortraitToad, - gTLUTPortraitDonkeyKong, gTLUTPortraitWario, gTLUTPortraitPeach, gTLUTPortraitBowser + common_tlut_portrait_mario, common_tlut_portrait_luigi, common_tlut_portrait_yoshi, common_tlut_portrait_toad, + common_tlut_portrait_donkey_kong, common_tlut_portrait_wario, common_tlut_portrait_peach, common_tlut_portrait_bowser }; u8 *gPortraitTextures[] = { - gTexturePortraitMario, gTexturePortraitLuigi, gTexturePortraitYoshi, gTexturePortraitToad, - gTexturePortraitDonkeyKong, gTexturePortraitWario, gTexturePortraitPeach, gTexturePortraitBowser + common_texture_portrait_mario, common_texture_portrait_luigi, common_texture_portrait_yoshi, common_texture_portrait_toad, + common_texture_portrait_donkey_kong, common_texture_portrait_wario, common_texture_portrait_peach, common_texture_portrait_bowser }; s32 find_unused_obj_index(s32* arg0) { @@ -1881,8 +1881,8 @@ void func_8007634C(s32 objectIndex) { Objects *temp_v0; temp_v0 = &gObjectList[objectIndex]; - temp_v0->activeTexture = D_0D02BC58; - temp_v0->textureList = D_0D02BC58; + temp_v0->activeTexture = common_texture_particle_smoke; + temp_v0->textureList = common_texture_particle_smoke; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); @@ -2051,8 +2051,8 @@ void func_80076958(s32 objectIndex) { Objects *temp_v0; temp_v0 = &gObjectList[objectIndex]; - temp_v0->activeTexture = D_0D02BC58; - temp_v0->textureList = D_0D02BC58; + temp_v0->activeTexture = common_texture_particle_smoke; + temp_v0->textureList = common_texture_particle_smoke; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); @@ -2144,8 +2144,8 @@ void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { init_object(objectIndex, (s32) arg2); temp_v0 = &gObjectList[objectIndex]; temp_v0->unk_0D5 = 0x0A; - temp_v0->activeTexture = D_0D02BC58; - temp_v0->textureList = D_0D02BC58; + temp_v0->activeTexture = common_texture_particle_smoke; + temp_v0->textureList = common_texture_particle_smoke; temp_v0->sizeScaling = 0.3f; func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]); temp_v0->type = 0x00FF; @@ -2220,8 +2220,8 @@ void func_80076FEC(s32 objectIndex, s32 flameIndex) { init_object(objectIndex, 3); gObjectList[objectIndex].unk_0D5 = 0xB; - gObjectList[objectIndex].activeTexture = D_0D02BC58; - gObjectList[objectIndex].textureList = D_0D02BC58; + gObjectList[objectIndex].activeTexture = common_texture_particle_smoke; + gObjectList[objectIndex].textureList = common_texture_particle_smoke; gObjectList[objectIndex].sizeScaling = 0.8f; gObjectList[objectIndex].unk_010[0] = (f32)*(gTorchSpawns + (flameIndex * 3) + 0) * xOrientation; @@ -2380,8 +2380,8 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { init_object(objectIndex, 0); gObjectList[objectIndex].unk_0D5 = 7; - gObjectList[objectIndex].activeTLUT = (u32 *) D_0D028DD8; - gObjectList[objectIndex].tlutList = (u32 *) D_0D028DD8; + gObjectList[objectIndex].activeTLUT = (u32 *) common_texture_particle_leaf; + gObjectList[objectIndex].tlutList = (u32 *) common_texture_particle_leaf; gObjectList[objectIndex].sizeScaling = 0.1f; gObjectList[objectIndex].unk_044 = arg1[1]; switch (gCurrentCourseId) { @@ -2976,7 +2976,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) { D_801656F0 = 0; D_8018D168 = 0; } - init_texture_object(objectIndex, (u8 *) gTLUTLakituCountdown, gTextureLakituNoLights1, 0x38U, (u16) 0x00000048); + init_texture_object(objectIndex, (u8 *) common_tlut_lakitu_countdown, gTextureLakituNoLights1, 0x38U, (u16) 0x00000048); gObjectList[objectIndex].vertex = D_0D005EB0; gObjectList[objectIndex].sizeScaling = 0.15f; set_object_flag_unk_054_false(objectIndex, 0x00000010); @@ -3067,7 +3067,7 @@ void func_8007963C(s32 objectIndex, s32 playerIndex) { Objects *temp_v0; func_800791F0(objectIndex, playerIndex); - init_texture_object(objectIndex, gTLUTLakituCheckeredFlag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038); + init_texture_object(objectIndex, common_tlut_lakitu_checkered_flag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038); temp_v0 = &gObjectList[objectIndex]; temp_v0->activeTexture = D_8018C028; temp_v0->vertex = D_0D006730; @@ -3144,7 +3144,7 @@ void func_8007993C(s32 objectIndex, Player *player) { void func_800799A8(s32 objectIndex, s32 arg1) { func_800791F0(objectIndex, arg1); - init_texture_object(objectIndex, gTLUTLakituFishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048); + init_texture_object(objectIndex, common_tlut_lakitu_fishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048); gObjectList[objectIndex].vertex = D_0D005F30; gObjectList[objectIndex].sizeScaling = 0.15f; func_80086E70(objectIndex); @@ -3317,7 +3317,7 @@ void func_8007A060(s32 objectIndex, s32 playerIndex) { Objects *temp_v0; func_800791F0(objectIndex, playerIndex); - init_texture_object(objectIndex, gTLUTLakituSecondLap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038); + init_texture_object(objectIndex, common_tlut_lakitu_second_lap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038); temp_v0 = &gObjectList[objectIndex]; temp_v0->activeTexture = D_8018C028; temp_v0->vertex = D_0D006730; @@ -3365,7 +3365,7 @@ void func_8007A228(s32 objectIndex, s32 playerIndex) { Objects *temp_v0; func_800791F0(objectIndex, playerIndex); - init_texture_object(objectIndex, gTLUTLakituFinalLap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038); + init_texture_object(objectIndex, common_tlut_lakitu_final_lap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038); temp_v0 = &gObjectList[objectIndex]; temp_v0->activeTexture = D_8018C028; temp_v0->vertex = D_0D006730; @@ -3412,7 +3412,7 @@ void func_8007A2EC(s32 objectIndex, s32 playerIndex) { void func_8007A3F0(s32 objectIndex, s32 arg1) { f32 var = 5000.0f; func_800791F0(objectIndex, arg1); - init_texture_object(objectIndex, gTLUTLakituReverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038); + init_texture_object(objectIndex, common_tlut_lakitu_reverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038); gObjectList[objectIndex].activeTexture = D_8018C028; gObjectList[objectIndex].vertex = D_0D006730; gObjectList[objectIndex].pos[2] = var; @@ -3641,26 +3641,26 @@ u8 gen_random_item(s16 rank, s16 isCpu) if (gModeSelection == VERSUS) { switch (gPlayerCountSelection1) { case TWO_PLAYERS_SELECTED: - curve = segmented_to_virtual((void *) gVersus2PlayerItemCurve); + curve = segmented_to_virtual((void *) common_versus_2_player_item_curve); break; case THREE_PLAYERS_SELECTED: - curve = segmented_to_virtual((void *) gVersus3PlayerItemCurve); + curve = segmented_to_virtual((void *) common_versus_3_player_item_curve); break; case FOUR_PLAYERS_SELECTED: - curve = segmented_to_virtual((void *) gVersus4PlayerItemCurve); + curve = segmented_to_virtual((void *) common_versus_4_player_item_curve); break; } randomItem = *((rank * 100) + curve + sRandomItemIndex); } else if (gModeSelection == BATTLE) { - curve = segmented_to_virtual((void *) gBattleItemCurve); + curve = segmented_to_virtual((void *) common_battle_item_curve); randomItem = curve[sRandomItemIndex]; } else { // GP Mode if (isCpu == 0) { - curve = segmented_to_virtual((void *) gGrandPrixHumanItemCurve); + curve = segmented_to_virtual((void *) common_grand_prix_human_item_curve); } else { - curve = segmented_to_virtual((void *) gGrandPrixCPUItemCurve); + curve = segmented_to_virtual((void *) common_grand_prix_cpu_item_curve); } randomItem = *((rank * 100) + curve + sRandomItemIndex); } @@ -3762,8 +3762,8 @@ void func_8007B254(s32 objectIndex, s32 arg1) { func_80072428(objectIndex); gObjectList[objectIndex].state = 2; gObjectList[objectIndex].type = 0; - gObjectList[objectIndex].tlutList = (u8 *) gTLUTItemWindowNone; - gObjectList[objectIndex].textureList = gTextureItemWindowNone; + gObjectList[objectIndex].tlutList = (u8 *) common_tlut_item_window_none; + gObjectList[objectIndex].textureList = common_texture_item_window_none; gObjectList[objectIndex].textureWidth = 0x28; gObjectList[objectIndex].textureHeight = 0x20; gObjectList[objectIndex].unk_04C = 0x00000032; diff --git a/src/common_textures.h b/src/common_textures.h index ac71e92d2..ca306736e 100644 --- a/src/common_textures.h +++ b/src/common_textures.h @@ -10,8 +10,10 @@ typedef struct { /* 0x4 */ s32 unk4; } UnkCommonTextureStruct0; // size = 0x8 -extern s8 gTLUTFinishLineBanner[]; -extern s8 D_0D000200[]; +/** @cond */ + +extern s8 common_tlut_finish_line_banner[]; +extern s8 common_texture_particle_fire[]; extern Vtx D_0D001200[]; extern Vtx D_0D001210[]; extern Vtx D_0D001240[]; @@ -50,7 +52,7 @@ extern Vtx D_0D001E28[]; extern Vtx D_0D001E58[]; extern Vtx D_0D001E88[]; extern Vtx D_0D001EB8[]; -extern s8 gItemBoxQuestionMark_Texture[]; +extern s8 common_texture_item_box_question_mark[]; extern Gfx D_0D002EE8[]; extern Vtx common_fake_item_box_question_mark_vertices[]; extern Gfx common_model_fake_itembox[]; @@ -68,13 +70,13 @@ extern Gfx D_0D003278[]; extern Gfx D_0D003288[]; extern Vtx common_vtx_banana[]; extern Vtx common_vtx_flat_banana[]; -extern s8 gBananaTexture[]; +extern s8 common_texture_banana[]; extern s8 common_texture_flat_banana[]; extern Gfx common_model_banana[]; extern Gfx common_model_flat_banana[]; -extern s8 D_0D004C68[]; -extern s8 gTLUTGreenShell[]; -extern s8 gTLUTBlueShell[]; +extern s8 common_tlut_trees_import[]; +extern s8 common_tlut_green_shell[]; +extern s8 common_tlut_blue_shell[]; extern Vtx D_0D005238[]; extern Vtx D_0D005278[]; extern Gfx D_0D0052B8[]; @@ -141,8 +143,8 @@ extern Gfx D_0D006A28[]; extern Gfx D_0D006A40[]; extern s8 D_0D006A58[]; extern s8 D_0D006AD8[]; -extern s8 gTLUTDebugFont[]; -extern s8 gTextureDebugFont[]; +extern s8 common_tlut_debug_font[]; +extern s8 common_texture_debug_font[]; extern Gfx D_0D0076F8[]; extern Gfx D_0D007780[]; extern Gfx D_0D0077A0[]; @@ -207,12 +209,12 @@ extern Gfx D_0D008080[]; extern Gfx D_0D008108[]; extern Gfx D_0D008120[]; extern Gfx D_0D008138[]; -extern u8 gGrandPrixHumanItemCurve[][100]; -extern u8 gGrandPrixCPUItemCurve[][100]; -extern u8 gVersus2PlayerItemCurve[][100]; -extern u8 gVersus3PlayerItemCurve[][100]; -extern u8 gVersus4PlayerItemCurve[][100]; -extern u8 gBattleItemCurve[][100]; +extern u8 common_grand_prix_human_item_curve[][100]; +extern u8 common_grand_prix_cpu_item_curve[][100]; +extern u8 common_versus_2_player_item_curve[][100]; +extern u8 common_versus_3_player_item_curve[][100]; +extern u8 common_versus_4_player_item_curve[][100]; +extern u8 common_battle_item_curve[][100]; extern Vtx D_0D008B78[]; extern Vtx D_0D008BB8[]; extern Vtx D_0D008BF8[]; @@ -252,18 +254,18 @@ extern f32 D_0D009568[][4]; extern f32 D_0D0096B8[][4]; extern f32 D_0D009808[][4]; extern s32 unkPad; -extern s8 D_0D009958[]; -extern s8 D_0D00A558[]; -extern s8 D_0D00A958[]; -extern u8 D_0D00AB58[]; -extern s8 D_0D00AD58[]; -extern s8 D_0D00B158[]; -extern s8 D_0D00B558[]; -extern s8 D_0D00B958[]; -extern s8 D_0D00BD58[]; -extern s8 D_0D00C158[]; -extern u8 D_0D00C558[]; -extern u8 D_0D00D258[][4096]; +extern s8 common_texture_speedometer[]; +extern s8 common_texture_speedometer_needle[]; +extern s8 common_texture_hud_lap[]; +extern u8 common_texture_hud_123[]; +extern s8 common_texture_hud_lap_time[]; +extern s8 common_texture_hud_lap_1_on_3[]; +extern s8 common_texture_hud_lap_2_on_3[]; +extern s8 common_texture_hud_lap_3_on_3[]; +extern s8 common_texture_hud_total_time[]; +extern s8 common_texture_hud_time[]; +extern u8 common_texture_hud_normal_digit[]; +extern u8 common_texture_hud_place[][4096]; extern s8 D_0D00E258[]; extern s8 D_0D00F258[]; extern s8 D_0D010258[]; @@ -275,97 +277,99 @@ extern u8 D_0D015258[][2048]; extern s8 D_0D015A58[]; extern s8 D_0D016258[]; extern s8 D_0D016A58[]; -extern u8 D_0D017258[]; +extern u8 common_tlut_player_emblem[]; extern s16 tlutPad[]; -extern u8 D_0D017458[][2048]; -extern u8 gTLUTHudTypeCRankFont[]; -extern u8 gTextureHudTypeCRankFont[][256]; -extern u8 gTLUTHudTypeCRankTinyFont[]; -extern u8 gTextureHudTypeCRankTinyFont[][64]; -extern u8 gTextureCharacterPortraitBorder[]; -extern s8 gTLUTPortraitMario[]; -extern s8 gTLUTPortraitLuigi[]; -extern s8 gTLUTPortraitPeach[]; -extern s8 gTLUTPortraitToad[]; -extern s8 gTLUTPortraitYoshi[]; -extern s8 gTLUTPortraitDonkeyKong[]; -extern s8 gTLUTPortraitWario[]; -extern s8 gTLUTPortraitBowser[]; -extern s8 gTLUTPortraitBombKartAndQuestionMark[]; -extern s8 gTexturePortraitMario[]; -extern s8 gTexturePortraitLuigi[]; -extern s8 gTexturePortraitPeach[]; -extern s8 gTexturePortraitToad[]; -extern s8 gTexturePortraitYoshi[]; -extern s8 gTexturePortraitDonkeyKong[]; -extern s8 gTexturePortraitWario[]; -extern u8 gTexturePortraitBowser[]; -extern u8 gTexturePortraitBombKart[]; -extern u8 gTexturePortraitQuestionMark[]; -extern s8 gTLUTItemWindowNone[]; -extern s8 gTLUTItemWindowBanana[]; -extern s8 gTLUTItemWindowBananaBunch[]; -extern s8 gTLUTItemWindowMushroom[]; -extern s8 gTLUTItemWindowDoubleMushroom[]; -extern s8 gTLUTItemWindowTripleMushroom[]; -extern s8 gTLUTItemWindowSuperMushroom[]; -extern s8 gTLUTItemWindowBlueShell[]; -extern s8 gTLUTItemWindowBoo[]; -extern s8 gTLUTItemWindowGreenShell[]; -extern s8 gTLUTItemWindowTripleGreenShell[]; -extern s8 gTLUTItemWindowRedShell[]; -extern s8 gTLUTItemWindowTripleRedShell[]; -extern s8 gTLUTItemWindowStar[]; -extern s8 gTLUTItemWindowThunderBolt[]; -extern s8 gTLUTItemWindowFakeItemBox[]; -extern u8 gTextureItemWindowNone[]; -extern s8 gTextureItemWindowBanana[]; -extern s8 gTextureItemWindowBananaBunch[]; -extern s8 gTextureItemWindowMushroom[]; -extern s8 gTextureItemWindowDoubleMushroom[]; -extern s8 gTextureItemWindowTripleMushroom[]; -extern s8 gTextureItemWindowSuperMushroom[]; -extern s8 gTextureItemWindowBlueShell[]; -extern s8 gTextureItemWindowBoo[]; -extern s8 gTextureItemWindowGreenShell[]; -extern s8 gTextureItemWindowTripleGreenShell[]; -extern s8 gTextureItemWindowRedShell[]; -extern s8 gTextureItemWindowTripleRedShell[]; -extern s8 gTextureItemWindowStar[]; -extern s8 gTextureItemWindowThunderBolt[]; -extern s8 gTextureItemWindowFakeItemBox[]; -extern u8 gTLUTLakituCountdown[][512]; -extern u8 gTLUTLakituCheckeredFlag[]; -extern u8 gTLUTLakituSecondLap[]; -extern u8 gTLUTLakituFinalLap[]; -extern u8 gTLUTLakituReverse[]; -extern u8 gTLUTLakituFishing[]; +extern u8 common_texture_player_emblem[][2048]; +extern u8 common_tlut_hud_type_C_rank_font[]; +extern u8 common_texture_hud_type_C_rank_font[][256]; +extern u8 common_tlut_hud_type_C_rank_tiny_font[]; +extern u8 common_texture_hud_type_C_rank_tiny_font[][64]; +extern u8 common_texture_character_portrait_border[]; +extern s8 common_tlut_portrait_mario[]; +extern s8 common_tlut_portrait_luigi[]; +extern s8 common_tlut_portrait_peach[]; +extern s8 common_tlut_portrait_toad[]; +extern s8 common_tlut_portrait_yoshi[]; +extern s8 common_tlut_portrait_donkey_kong[]; +extern s8 common_tlut_portrait_wario[]; +extern s8 common_tlut_portrait_bowser[]; +extern s8 common_tlut_portrait_bomb_kart_and_question_mark[]; +extern s8 common_texture_portrait_mario[]; +extern s8 common_texture_portrait_luigi[]; +extern s8 common_texture_portrait_peach[]; +extern s8 common_texture_portrait_toad[]; +extern s8 common_texture_portrait_yoshi[]; +extern s8 common_texture_portrait_donkey_kong[]; +extern s8 common_texture_portrait_wario[]; +extern u8 common_texture_portrait_bowser[]; +extern u8 common_texture_portrait_bomb_kart[]; +extern u8 common_texture_portrait_question_mark[]; +extern s8 common_tlut_item_window_none[]; +extern s8 common_tlut_item_window_banana[]; +extern s8 common_tlut_item_window_banana_bunch[]; +extern s8 common_tlut_item_window_mushroom[]; +extern s8 common_tlut_item_window_double_mushroom[]; +extern s8 common_tlut_item_window_triple_mushroom[]; +extern s8 common_tlut_item_window_super_mushroom[]; +extern s8 common_tlut_item_window_blue_shell[]; +extern s8 common_tlut_item_window_boo[]; +extern s8 common_tlut_item_window_green_shell[]; +extern s8 common_tlut_item_window_triple_green_shell[]; +extern s8 common_tlut_item_window_red_shell[]; +extern s8 common_tlut_item_window_triple_red_shell[]; +extern s8 common_tlut_item_window_star[]; +extern s8 common_tlut_item_window_thunder_bolt[]; +extern s8 common_tlut_item_window_fake_item_box[]; +extern u8 common_texture_item_window_none[]; +extern s8 common_texture_item_window_banana[]; +extern s8 common_texture_item_window_banana_bunch[]; +extern s8 common_texture_item_window_mushroom[]; +extern s8 common_texture_item_window_double_mushroom[]; +extern s8 common_texture_item_window_triple_mushroom[]; +extern s8 common_texture_item_window_super_mushroom[]; +extern s8 common_texture_item_window_blue_shell[]; +extern s8 common_texture_item_window_boo[]; +extern s8 common_texture_item_window_green_shell[]; +extern s8 common_texture_item_window_triple_green_shell[]; +extern s8 common_texture_item_window_red_shell[]; +extern s8 common_texture_item_window_triple_red_shell[]; +extern s8 common_texture_item_window_star[]; +extern s8 common_texture_item_window_thunder_bolt[]; +extern s8 common_texture_item_window_fake_item_box[]; +extern u8 common_tlut_lakitu_countdown[][512]; +extern u8 common_tlut_lakitu_checkered_flag[]; +extern u8 common_tlut_lakitu_second_lap[]; +extern u8 common_tlut_lakitu_final_lap[]; +extern u8 common_tlut_lakitu_reverse[]; +extern u8 common_tlut_lakitu_fishing[]; -extern u8 D_0D028DD8[]; -extern s8 D_0D025ED8[]; -extern s8 D_0D0260D8[]; -extern s8 D_0D026558[]; -extern s8 D_0D0269D8[]; -extern s8 D_0D026E58[]; -extern s8 D_0D0272D8[]; -extern s8 D_0D027758[]; -extern s8 D_0D027BD8[]; -extern s8 D_0D028058[]; -extern s8 D_0D0284D8[]; -extern s8 D_0D028958[]; -extern s8 D_0D0291D8[]; +extern u8 common_texture_particle_leaf[]; +extern s8 common_tlut_traffic_light[]; +extern s8 common_texture_traffic_light_01[]; +extern s8 common_texture_traffic_light_02[]; +extern s8 common_texture_traffic_light_03[]; +extern s8 common_texture_traffic_light_04[]; +extern s8 common_texture_traffic_light_05[]; +extern s8 common_texture_traffic_light_06[]; +extern s8 common_texture_traffic_light_07[]; +extern s8 common_texture_traffic_light_08[]; +extern s8 common_texture_traffic_light_09[]; +extern s8 common_texture_traffic_light_10[]; +extern s8 common_texture_unused_particle_leaf[]; extern u8 D_0D0293D8[]; extern s8 D_0D029458[]; -extern u8 D_0D029858[][1024]; +extern u8 common_texture_bomb[][1024]; extern s8 D_0D029C58[]; extern s8 D_0D02A058[]; extern s8 D_0D02A458[]; -extern u8 D_0D02A858[]; +extern u8 common_tlut_bomb[]; extern u8 D_0D02AA58[]; -extern u8 D_0D02AC58[][1024]; -extern u8 D_0D02BC58[][1024]; -extern s8 gTextureMiniMapFinishLine[]; -extern s8 gMiniMapKartTextures[][128]; +extern u8 common_texture_particle_spark[][1024]; +extern u8 common_texture_particle_smoke[][1024]; +extern s8 common_texture_minimap_finish_line[]; +extern s8 common_texture_minimap_kart_character[][128]; extern s8 common_texture_minimap_progress_dot[]; +/** @endcond */ + #endif diff --git a/src/data/common_textures.inc.c b/src/data/common_textures.inc.c index d0a3e8649..39c9389c5 100644 --- a/src/data/common_textures.inc.c +++ b/src/data/common_textures.inc.c @@ -30,12 +30,12 @@ extern s8 D_03008000[]; extern s8 D_03008800[]; */ -s8 gTLUTFinishLineBanner[] = { // tlut - #include "assets/finish_line_banner/gTLUTFinishLineBanner.inc.c" +s8 common_tlut_finish_line_banner[] = { // tlut + #include "assets/finish_line_banner/common_tlut_finish_line_banner.inc.c" }; -s8 D_0D000200[] = { // tlut - #include "textures/common/132B50_00200.rgba16.inc.c" +s8 common_texture_particle_fire[] = { // tlut + #include "textures/common/common_texture_particle_fire.rgba16.inc.c" }; Vtx D_0D001200[] = { @@ -218,7 +218,7 @@ Gfx D_0D001828[] = { Gfx D_0D001840[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), - gsDPLoadTLUT_pal256(gTLUTFinishLineBanner), + gsDPLoadTLUT_pal256(common_tlut_finish_line_banner), gsDPSetTextureLUT(G_TT_RGBA16), gsDPTileSync(), gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), @@ -396,8 +396,8 @@ Vtx D_0D001EB8[] = { }; // D_0D001EE8 -s8 gItemBoxQuestionMark_Texture[] = { - #include "textures/common/132B50_01EE8.rgba16.inc.c" +s8 common_texture_item_box_question_mark[] = { + #include "textures/common/common_texture_item_box_question_mark.rgba16.inc.c" }; Gfx D_0D002EE8[] = { @@ -430,7 +430,7 @@ Gfx common_model_fake_itembox[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 252), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gItemBoxQuestionMark_Texture), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, common_texture_item_box_question_mark), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), @@ -450,7 +450,7 @@ Gfx itemBoxQuestionMarkModel[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 252), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gItemBoxQuestionMark_Texture), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, common_texture_item_box_question_mark), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), @@ -578,12 +578,12 @@ Vtx common_vtx_flat_banana[] = { // D_0D003348 -s8 gBananaTexture[] = { - #include "textures/common/132B50_03348.rgba16.inc.c" +s8 common_texture_banana[] = { + #include "textures/common/common_texture_banana.rgba16.inc.c" }; s8 common_texture_flat_banana[] = { - #include "textures/common/132B50_03B48.rgba16.inc.c" + #include "textures/common/common_texture_flat_banana.rgba16.inc.c" }; // 0x4B48 @@ -595,7 +595,7 @@ Gfx common_model_banana[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 124, 124), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBananaTexture), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, common_texture_banana), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), @@ -632,16 +632,16 @@ Gfx common_model_flat_banana[] = { // tlut size 8x29 //! @todo What is this? -s8 D_0D004C68[] = { - #include "assets/trees/gTLUTTreesImport.inc.c" +s8 common_tlut_trees_import[] = { + #include "assets/trees/common_tlut_trees_import.inc.c" }; -s8 gTLUTGreenShell[] = { - #include "assets/greenshell/gTLUTGreenShell.inc.c" +s8 common_tlut_green_shell[] = { + #include "assets/greenshell/common_tlut_green_shell.inc.c" }; // 5038 -s8 gTLUTBlueShell[] = { - #include "assets/blueshell/gTLUTBlueShell.inc.c" +s8 common_tlut_blue_shell[] = { + #include "assets/blueshell/common_tlut_blue_shell.inc.c" }; Vtx D_0D005238[] = { @@ -1278,12 +1278,12 @@ s8 D_0D006AD8[] = { }; // tlut -s8 gTLUTDebugFont[] = { - #include "assets/debug_font/gTLUTDebugFont.inc.c" +s8 common_tlut_debug_font[] = { + #include "assets/debug_font/common_tlut_debug_font.inc.c" }; -s8 gTextureDebugFont[] = { - #include "assets/debug_font/gTextureDebugFont.inc.c" +s8 common_texture_debug_font[] = { + #include "assets/debug_font/common_texture_debug_font.inc.c" }; // 0x76F8 @@ -1757,9 +1757,9 @@ Gfx D_0D008060[] = { Gfx D_0D008080[] = { gsSPDisplayList(D_0D007EF8), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, gTLUTDebugFont), + gsDPLoadTLUT_pal16(0, common_tlut_debug_font), gsDPLoadSync(), - gsDPLoadTextureBlock_4b(gTextureDebugFont, G_IM_FMT_CI, 128, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsDPLoadTextureBlock_4b(common_texture_debug_font, G_IM_FMT_CI, 128, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPEndDisplayList(), }; @@ -1782,7 +1782,7 @@ Gfx D_0D008138[] = { }; // Curve graphs for generating a random item based on player race position. -u8 gGrandPrixHumanItemCurve[8][100] = { +u8 common_grand_prix_human_item_curve[8][100] = { { // 1st ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -1881,7 +1881,7 @@ u8 gGrandPrixHumanItemCurve[8][100] = { }, }; -u8 gGrandPrixCPUItemCurve[8][100] = { +u8 common_grand_prix_cpu_item_curve[8][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -1980,7 +1980,7 @@ u8 gGrandPrixCPUItemCurve[8][100] = { }, }; -u8 gVersus2PlayerItemCurve[2][100] = { +u8 common_versus_2_player_item_curve[2][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BOO, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -2007,7 +2007,7 @@ u8 gVersus2PlayerItemCurve[2][100] = { }, }; -u8 gVersus3PlayerItemCurve[3][100] = { +u8 common_versus_3_player_item_curve[3][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -2046,7 +2046,7 @@ u8 gVersus3PlayerItemCurve[3][100] = { }, }; -u8 gVersus4PlayerItemCurve[4][100] = { +u8 common_versus_4_player_item_curve[4][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, @@ -2097,7 +2097,7 @@ u8 gVersus4PlayerItemCurve[4][100] = { }, }; -u8 gBattleItemCurve[1][100] = { +u8 common_battle_item_curve[1][100] = { { ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA, ITEM_BANANA_BUNCH, ITEM_BANANA_BUNCH, ITEM_BANANA_BUNCH, ITEM_BANANA_BUNCH, ITEM_BANANA_BUNCH, ITEM_GREEN_SHELL, ITEM_GREEN_SHELL, ITEM_GREEN_SHELL, ITEM_GREEN_SHELL, ITEM_GREEN_SHELL, @@ -2566,92 +2566,92 @@ f32 D_0D009808[][4] = { }; // Odometer speedometer -s8 D_0D009958[] = { - #include "textures/common/132B50_09958.i4.inc.c" +s8 common_texture_speedometer[] = { + #include "textures/common/common_texture_speedometer.i4.inc.c" }; // i8? odometer needle -s8 D_0D00A558[] = { - #include "textures/common/132B50_0A558.i4.inc.c" +s8 common_texture_speedometer_needle[] = { + #include "textures/common/common_texture_speedometer_needle.i4.inc.c" }; // Lap UI Texture -s8 D_0D00A958[] = { - #include "textures/common/132B50_0A958.rgba16.inc.c" +s8 common_texture_hud_lap[] = { + #include "textures/common/common_texture_hud_lap.rgba16.inc.c" }; // 123/ -u8 D_0D00AB58[] = { - #include "textures/common/132B50_0AB58.rgba16.inc.c" +u8 common_texture_hud_123[] = { + #include "textures/common/common_texture_hud_123.rgba16.inc.c" }; // Lap -s8 D_0D00AD58[] = { - #include "textures/common/132B50_0AD58.rgba16.inc.c" +s8 common_texture_hud_lap_time[] = { + #include "textures/common/common_texture_hud_lap_time.rgba16.inc.c" }; // 1/3 -s8 D_0D00B158[] = { - #include "textures/common/132B50_0B158.rgba16.inc.c" +s8 common_texture_hud_lap_1_on_3[] = { + #include "textures/common/common_texture_hud_lap_1_on_3.rgba16.inc.c" }; // 2/3 -s8 D_0D00B558[] = { - #include "textures/common/132B50_0B558.rgba16.inc.c" +s8 common_texture_hud_lap_2_on_3[] = { + #include "textures/common/common_texture_hud_lap_2_on_3.rgba16.inc.c" }; // 3/3 -s8 D_0D00B958[] = { - #include "textures/common/132B50_0B958.rgba16.inc.c" +s8 common_texture_hud_lap_3_on_3[] = { + #include "textures/common/common_texture_hud_lap_3_on_3.rgba16.inc.c" }; // total -s8 D_0D00BD58[] = { - #include "textures/common/132B50_0BD58.rgba16.inc.c" +s8 common_texture_hud_total_time[] = { + #include "textures/common/common_texture_hud_total_time.rgba16.inc.c" }; // time -s8 D_0D00C158[] = { - #include "textures/common/132B50_0C158.rgba16.inc.c" +s8 common_texture_hud_time[] = { + #include "textures/common/common_texture_hud_time.rgba16.inc.c" }; // 0123456789'"! -u8 D_0D00C558[] = { - #include "textures/common/132B50_0C558.rgba16.inc.c" +u8 common_texture_hud_normal_digit[] = { + #include "textures/common/common_texture_hud_normal_digit.rgba16.inc.c" }; -u8 D_0D00D258[][4096] = { +u8 common_texture_hud_place[][4096] = { // first place { - #include "textures/common/132B50_0D258.i4.inc.c" + #include "textures/common/common_texture_hud_1st.i4.inc.c" }, // second place { - #include "textures/common/132B50_0E258.i4.inc.c" + #include "textures/common/common_texture_hud_2nd.i4.inc.c" }, // third place { - #include "textures/common/132B50_0F258.i4.inc.c" + #include "textures/common/common_texture_hud_3rd.i4.inc.c" }, // fourth place { - #include "textures/common/132B50_10258.i4.inc.c" + #include "textures/common/common_texture_hud_4th.i4.inc.c" }, // fifth place { - #include "textures/common/132B50_11258.i4.inc.c" + #include "textures/common/common_texture_hud_5th.i4.inc.c" }, // sixth place { - #include "textures/common/132B50_12258.i4.inc.c" + #include "textures/common/common_texture_hud_6th.i4.inc.c" }, // seventh place { - #include "textures/common/132B50_13258.i4.inc.c" + #include "textures/common/common_texture_hud_7th.i4.inc.c" }, // eighth place { - #include "textures/common/132B50_14258.i4.inc.c" + #include "textures/common/common_texture_hud_8th.i4.inc.c" }, }; @@ -2675,424 +2675,424 @@ u8 D_0D015258[][2048] = { }; // tlut for 1p, 2p, 3p, 4p -u8 D_0D017258[] = { - #include "assets/player_emblems/gTLUTPlayerEmblem.inc.c" +u8 common_tlut_player_emblem[] = { + #include "assets/player_emblems/common_tlut_player_emblem.inc.c" }; // 1p, 2p, 3p, 4p -u8 D_0D017458[][2048] = { +u8 common_texture_player_emblem[][2048] = { { - #include "assets/player_emblems/gTexturePlayerEmblem1p.inc.c" + #include "assets/player_emblems/common_texture_player_emblem_1p.inc.c" }, { - #include "assets/player_emblems/gTexturePlayerEmblem2p.inc.c" + #include "assets/player_emblems/common_texture_player_emblem_2p.inc.c" }, { - #include "assets/player_emblems/gTexturePlayerEmblem3p.inc.c" + #include "assets/player_emblems/common_texture_player_emblem_3p.inc.c" }, { - #include "assets/player_emblems/gTexturePlayerEmblem4p.inc.c" + #include "assets/player_emblems/common_texture_player_emblem_4p.inc.c" }, }; // font tlut for 12345678 -u8 gTLUTHudTypeCRankFont[] = { - #include "assets/hud_type_c/gTLUTHudTypeCRankFont.inc.c" +u8 common_tlut_hud_type_C_rank_font[] = { + #include "assets/hud_type_c/common_tlut_hud_type_C_rank_font.inc.c" }; // font 12345678 -u8 gTextureHudTypeCRankFont[][256] = { +u8 common_texture_hud_type_C_rank_font[][256] = { { - #include "assets/hud_type_c/gTextureHudTypeCRankFont1.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_1.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont2.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_2.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont3.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_3.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont4.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_4.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont5.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_5.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont6.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_6.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont7.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_7.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankFont8.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_font_8.inc.c" }, }; // font tlut for 0123456789 -u8 gTLUTHudTypeCRankTinyFont[] = { - #include "assets/hud_type_c/gTLUTHudTypeCRankTinyFont.inc.c" +u8 common_tlut_hud_type_C_rank_tiny_font[] = { + #include "assets/hud_type_c/common_tlut_hud_type_C_rank_tiny_font.inc.c" }; // 0123456789 -u8 gTextureHudTypeCRankTinyFont[][64] = { +u8 common_texture_hud_type_C_rank_tiny_font[][64] = { { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont0.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_0.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont1.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_1.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont2.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_2.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont3.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_3.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont4.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_4.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont5.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_5.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont6.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_6.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont7.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_7.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont8.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_8.inc.c" }, { - #include "assets/hud_type_c/gTextureHudTypeCRankTinyFont9.inc.c" + #include "assets/hud_type_c/common_texture_hud_type_C_rank_tiny_font_9.inc.c" }, }; // Square -u8 gTextureCharacterPortraitBorder[] = { - #include "assets/hud_type_c/gTextureCharacterPortraitBorder.inc.c" +u8 common_texture_character_portrait_border[] = { + #include "assets/hud_type_c/common_texture_character_portrait_border.inc.c" }; // 1A4D8 mario tlut -s8 gTLUTPortraitMario[] = { - #include "assets/character_portraits/gTLUTPortraitMario.inc.c" +s8 common_tlut_portrait_mario[] = { + #include "assets/character_portraits/common_tlut_portrait_mario.inc.c" }; // 1A6D8 luigi tlut -s8 gTLUTPortraitLuigi[] = { - #include "assets/character_portraits/gTLUTPortraitLuigi.inc.c" +s8 common_tlut_portrait_luigi[] = { + #include "assets/character_portraits/common_tlut_portrait_luigi.inc.c" }; // 1A8D8 peach tlut -s8 gTLUTPortraitPeach[] = { - #include "assets/character_portraits/gTLUTPortraitPeach.inc.c" +s8 common_tlut_portrait_peach[] = { + #include "assets/character_portraits/common_tlut_portrait_peach.inc.c" }; // 1AAD8 toad tlut -s8 gTLUTPortraitToad[] = { - #include "assets/character_portraits/gTLUTPortraitToad.inc.c" +s8 common_tlut_portrait_toad[] = { + #include "assets/character_portraits/common_tlut_portrait_toad.inc.c" }; // 1ACD8 yoshi tlut -s8 gTLUTPortraitYoshi[] = { - #include "assets/character_portraits/gTLUTPortraitYoshi.inc.c" +s8 common_tlut_portrait_yoshi[] = { + #include "assets/character_portraits/common_tlut_portrait_yoshi.inc.c" }; // 1AED8 dk tlut -s8 gTLUTPortraitDonkeyKong[] = { - #include "assets/character_portraits/gTLUTPortraitDonkeyKong.inc.c" +s8 common_tlut_portrait_donkey_kong[] = { + #include "assets/character_portraits/common_tlut_portrait_donkey_kong.inc.c" }; // 1B0D8 wario tlut -s8 gTLUTPortraitWario[] = { - #include "assets/character_portraits/gTLUTPortraitWario.inc.c" +s8 common_tlut_portrait_wario[] = { + #include "assets/character_portraits/common_tlut_portrait_wario.inc.c" }; // 1B2D8 bowser tlut -s8 gTLUTPortraitBowser[] = { - #include "assets/character_portraits/gTLUTPortraitBowser.inc.c" +s8 common_tlut_portrait_bowser[] = { + #include "assets/character_portraits/common_tlut_portrait_bowser.inc.c" }; // 1B4D8 bob-omb tlut and question mark? -s8 gTLUTPortraitBombKartAndQuestionMark[] = { - #include "assets/character_portraits/gTLUTPortraitBombKartAndQuestionMark.inc.c" +s8 common_tlut_portrait_bomb_kart_and_question_mark[] = { + #include "assets/character_portraits/common_tlut_portrait_bomb_kart_and_question_mark.inc.c" }; // Mario -s8 gTexturePortraitMario[] = { - #include "assets/character_portraits/gTexturePortraitMario.inc.c" +s8 common_texture_portrait_mario[] = { + #include "assets/character_portraits/common_texture_portrait_mario.inc.c" }; // Luigi -s8 gTexturePortraitLuigi[] = { - #include "assets/character_portraits/gTexturePortraitLuigi.inc.c" +s8 common_texture_portrait_luigi[] = { + #include "assets/character_portraits/common_texture_portrait_luigi.inc.c" }; // Peach -s8 gTexturePortraitPeach[] = { - #include "assets/character_portraits/gTexturePortraitPeach.inc.c" +s8 common_texture_portrait_peach[] = { + #include "assets/character_portraits/common_texture_portrait_peach.inc.c" }; // Toad -s8 gTexturePortraitToad[] = { - #include "assets/character_portraits/gTexturePortraitToad.inc.c" +s8 common_texture_portrait_toad[] = { + #include "assets/character_portraits/common_texture_portrait_toad.inc.c" }; // Yoshi -s8 gTexturePortraitYoshi[] = { - #include "assets/character_portraits/gTexturePortraitYoshi.inc.c" +s8 common_texture_portrait_yoshi[] = { + #include "assets/character_portraits/common_texture_portrait_yoshi.inc.c" }; // Donkey Kong -s8 gTexturePortraitDonkeyKong[] = { - #include "assets/character_portraits/gTexturePortraitDonkeyKong.inc.c" +s8 common_texture_portrait_donkey_kong[] = { + #include "assets/character_portraits/common_texture_portrait_donkey_kong.inc.c" }; // Wario -s8 gTexturePortraitWario[] = { - #include "assets/character_portraits/gTexturePortraitWario.inc.c" +s8 common_texture_portrait_wario[] = { + #include "assets/character_portraits/common_texture_portrait_wario.inc.c" }; // Bowser -u8 gTexturePortraitBowser[] = { - #include "assets/character_portraits/gTexturePortraitBowser.inc.c" +u8 common_texture_portrait_bowser[] = { + #include "assets/character_portraits/common_texture_portrait_bowser.inc.c" }; // Mini Bomb Kart -u8 gTexturePortraitBombKart[] = { - #include "assets/character_portraits/gTexturePortraitBombKart.inc.c" +u8 common_texture_portrait_bomb_kart[] = { + #include "assets/character_portraits/common_texture_portrait_bomb_kart.inc.c" }; // Question Mark -u8 gTexturePortraitQuestionMark[] = { - #include "assets/character_portraits/gTexturePortraitQuestionMark.inc.c" +u8 common_texture_portrait_question_mark[] = { + #include "assets/character_portraits/common_texture_portrait_question_mark.inc.c" }; // 1DED8 tlut item frames -s8 gTLUTItemWindowNone[] = { - #include "assets/item_window/gTLUTItemWindowNone.inc.c" +s8 common_tlut_item_window_none[] = { + #include "assets/item_window/common_tlut_item_window_none.inc.c" }; -s8 gTLUTItemWindowBanana[] = { - #include "assets/item_window/gTLUTItemWindowBanana.inc.c" +s8 common_tlut_item_window_banana[] = { + #include "assets/item_window/common_tlut_item_window_banana.inc.c" }; -s8 gTLUTItemWindowBananaBunch[] = { - #include "assets/item_window/gTLUTItemWindowBananaBunch.inc.c" +s8 common_tlut_item_window_banana_bunch[] = { + #include "assets/item_window/common_tlut_item_window_banana_bunch.inc.c" }; -s8 gTLUTItemWindowMushroom[] = { - #include "assets/item_window/gTLUTItemWindowMushroom.inc.c" +s8 common_tlut_item_window_mushroom[] = { + #include "assets/item_window/common_tlut_item_window_mushroom.inc.c" }; -s8 gTLUTItemWindowDoubleMushroom[] = { - #include "assets/item_window/gTLUTItemWindowDoubleMushroom.inc.c" +s8 common_tlut_item_window_double_mushroom[] = { + #include "assets/item_window/common_tlut_item_window_double_mushroom.inc.c" }; -s8 gTLUTItemWindowTripleMushroom[] = { - #include "assets/item_window/gTLUTItemWindowTripleMushroom.inc.c" +s8 common_tlut_item_window_triple_mushroom[] = { + #include "assets/item_window/common_tlut_item_window_triple_mushroom.inc.c" }; -s8 gTLUTItemWindowSuperMushroom[] = { - #include "assets/item_window/gTLUTItemWindowSuperMushroom.inc.c" +s8 common_tlut_item_window_super_mushroom[] = { + #include "assets/item_window/common_tlut_item_window_super_mushroom.inc.c" }; -s8 gTLUTItemWindowBlueShell[] = { - #include "assets/item_window/gTLUTItemWindowBlueShell.inc.c" +s8 common_tlut_item_window_blue_shell[] = { + #include "assets/item_window/common_tlut_item_window_blue_shell.inc.c" }; -s8 gTLUTItemWindowBoo[] = { - #include "assets/item_window/gTLUTItemWindowBoo.inc.c" +s8 common_tlut_item_window_boo[] = { + #include "assets/item_window/common_tlut_item_window_boo.inc.c" }; -s8 gTLUTItemWindowGreenShell[] = { - #include "assets/item_window/gTLUTItemWindowGreenShell.inc.c" +s8 common_tlut_item_window_green_shell[] = { + #include "assets/item_window/common_tlut_item_window_green_shell.inc.c" }; -s8 gTLUTItemWindowTripleGreenShell[] = { - #include "assets/item_window/gTLUTItemWindowTripleGreenShell.inc.c" +s8 common_tlut_item_window_triple_green_shell[] = { + #include "assets/item_window/common_tlut_item_window_triple_green_shell.inc.c" }; -s8 gTLUTItemWindowRedShell[] = { - #include "assets/item_window/gTLUTItemWindowRedShell.inc.c" +s8 common_tlut_item_window_red_shell[] = { + #include "assets/item_window/common_tlut_item_window_red_shell.inc.c" }; -s8 gTLUTItemWindowTripleRedShell[] = { - #include "assets/item_window/gTLUTItemWindowTripleRedShell.inc.c" +s8 common_tlut_item_window_triple_red_shell[] = { + #include "assets/item_window/common_tlut_item_window_triple_red_shell.inc.c" }; -s8 gTLUTItemWindowStar[] = { - #include "assets/item_window/gTLUTItemWindowStar.inc.c" +s8 common_tlut_item_window_star[] = { + #include "assets/item_window/common_tlut_item_window_star.inc.c" }; -s8 gTLUTItemWindowThunderBolt[] = { - #include "assets/item_window/gTLUTItemWindowThunderBolt.inc.c" +s8 common_tlut_item_window_thunder_bolt[] = { + #include "assets/item_window/common_tlut_item_window_thunder_bolt.inc.c" }; -s8 gTLUTItemWindowFakeItemBox[] = { - #include "assets/item_window/gTLUTItemWindowFakeItemBox.inc.c" +s8 common_tlut_item_window_fake_item_box[] = { + #include "assets/item_window/common_tlut_item_window_fake_item_box.inc.c" }; // UI Item Frames -u8 gTextureItemWindowNone[] = { - #include "assets/item_window/gTextureItemWindowNone.inc.c" +u8 common_texture_item_window_none[] = { + #include "assets/item_window/common_texture_item_window_none.inc.c" }; -s8 gTextureItemWindowBanana[] = { - #include "assets/item_window/gTextureItemWindowBanana.inc.c" +s8 common_texture_item_window_banana[] = { + #include "assets/item_window/common_texture_item_window_banana.inc.c" }; -s8 gTextureItemWindowBananaBunch[] = { - #include "assets/item_window/gTextureItemWindowBananaBunch.inc.c" +s8 common_texture_item_window_banana_bunch[] = { + #include "assets/item_window/common_texture_item_window_banana_bunch.inc.c" }; -s8 gTextureItemWindowMushroom[] = { - #include "assets/item_window/gTextureItemWindowMushroom.inc.c" +s8 common_texture_item_window_mushroom[] = { + #include "assets/item_window/common_texture_item_window_mushroom.inc.c" }; -s8 gTextureItemWindowDoubleMushroom[] = { - #include "assets/item_window/gTextureItemWindowDoubleMushroom.inc.c" +s8 common_texture_item_window_double_mushroom[] = { + #include "assets/item_window/common_texture_item_window_double_mushroom.inc.c" }; -s8 gTextureItemWindowTripleMushroom[] = { - #include "assets/item_window/gTextureItemWindowTripleMushroom.inc.c" +s8 common_texture_item_window_triple_mushroom[] = { + #include "assets/item_window/common_texture_item_window_triple_mushroom.inc.c" }; -s8 gTextureItemWindowSuperMushroom[] = { - #include "assets/item_window/gTextureItemWindowSuperMushroom.inc.c" +s8 common_texture_item_window_super_mushroom[] = { + #include "assets/item_window/common_texture_item_window_super_mushroom.inc.c" }; -s8 gTextureItemWindowBlueShell[] = { - #include "assets/item_window/gTextureItemWindowBlueShell.inc.c" +s8 common_texture_item_window_blue_shell[] = { + #include "assets/item_window/common_texture_item_window_blue_shell.inc.c" }; -s8 gTextureItemWindowBoo[] = { - #include "assets/item_window/gTextureItemWindowBoo.inc.c" +s8 common_texture_item_window_boo[] = { + #include "assets/item_window/common_texture_item_window_boo.inc.c" }; -s8 gTextureItemWindowGreenShell[] = { - #include "assets/item_window/gTextureItemWindowGreenShell.inc.c" +s8 common_texture_item_window_green_shell[] = { + #include "assets/item_window/common_texture_item_window_green_shell.inc.c" }; -s8 gTextureItemWindowTripleGreenShell[] = { - #include "assets/item_window/gTextureItemWindowTripleGreenShell.inc.c" +s8 common_texture_item_window_triple_green_shell[] = { + #include "assets/item_window/common_texture_item_window_triple_green_shell.inc.c" }; -s8 gTextureItemWindowRedShell[] = { - #include "assets/item_window/gTextureItemWindowRedShell.inc.c" +s8 common_texture_item_window_red_shell[] = { + #include "assets/item_window/common_texture_item_window_red_shell.inc.c" }; -s8 gTextureItemWindowTripleRedShell[] = { - #include "assets/item_window/gTextureItemWindowTripleRedShell.inc.c" +s8 common_texture_item_window_triple_red_shell[] = { + #include "assets/item_window/common_texture_item_window_triple_red_shell.inc.c" }; -s8 gTextureItemWindowStar[] = { - #include "assets/item_window/gTextureItemWindowStar.inc.c" +s8 common_texture_item_window_star[] = { + #include "assets/item_window/common_texture_item_window_star.inc.c" }; -s8 gTextureItemWindowThunderBolt[] = { - #include "assets/item_window/gTextureItemWindowThunderBolt.inc.c" +s8 common_texture_item_window_thunder_bolt[] = { + #include "assets/item_window/common_texture_item_window_thunder_bolt.inc.c" }; -s8 gTextureItemWindowFakeItemBox[] = { - #include "assets/item_window/gTextureItemWindowFakeItemBox.inc.c" +s8 common_texture_item_window_fake_item_box[] = { + #include "assets/item_window/common_texture_item_window_fake_item_box.inc.c" }; -u8 gTLUTLakituCountdown[][512] = { +u8 common_tlut_lakitu_countdown[][512] = { { - #include "assets/lakitu/nolights/gTLUTLakituNoLights.inc.c" + #include "assets/lakitu/nolights/common_tlut_lakitu_no_lights.inc.c" }, { - #include "assets/lakitu/redlights/gTLUTLakituRedLights.inc.c" + #include "assets/lakitu/redlights/common_tlut_lakitu_red_lights.inc.c" }, { - #include "assets/lakitu/bluelight/gTLUTLakituBlueLight.inc.c" + #include "assets/lakitu/bluelight/common_tlut_lakitu_blue_lights.inc.c" } }; /** * @todo Generate tlut based on the actual texture. * The textures these tluts are for are not in common_textures.inc.c - * This applies to gTLUTLakituCheckeredFlag, gTLUTLakituSecondLap, - * gTLUTLakituFinalLap, gTLUTLakituReverse, gTLUTLakituFishing + * This applies to common_tlut_lakitu_checkered_flag, common_tlut_lakitu_second_lap, + * common_tlut_lakitu_final_lap, common_tlut_lakitu_reverse, common_tlut_lakitu_fishing * Appears to be animation textures. */ -u8 gTLUTLakituCheckeredFlag[] = { - #include "assets/lakitu/checkeredflag/gTLUTLakituCheckeredFlag.inc.c" +u8 common_tlut_lakitu_checkered_flag[] = { + #include "assets/lakitu/checkeredflag/common_tlut_lakitu_checkered_flag.inc.c" }; -u8 gTLUTLakituSecondLap[] = { - #include "assets/lakitu/secondlap/gTLUTLakituSecondLap.inc.c" +u8 common_tlut_lakitu_second_lap[] = { + #include "assets/lakitu/secondlap/common_tlut_lakitu_second_lap.inc.c" }; -u8 gTLUTLakituFinalLap[] = { - #include "assets/lakitu/finallap/gTLUTLakituFinalLap.inc.c" +u8 common_tlut_lakitu_final_lap[] = { + #include "assets/lakitu/finallap/common_tlut_lakitu_final_lap.inc.c" }; -u8 gTLUTLakituReverse[] = { - #include "assets/lakitu/reverse/gTLUTLakituReverse.inc.c" +u8 common_tlut_lakitu_reverse[] = { + #include "assets/lakitu/reverse/common_tlut_lakitu_reverse.inc.c" }; -u8 gTLUTLakituFishing[] = { - #include "assets/lakitu/fishing/gTLUTLakituFishing.inc.c" +u8 common_tlut_lakitu_fishing[] = { + #include "assets/lakitu/fishing/common_tlut_lakitu_fishing.inc.c" }; // unused traffic light tlut -UNUSED s8 D_0D025ED8[] = { - #include "assets/unused_traffic_light/gTLUTUnusedTrafficLight.inc.c" +UNUSED s8 common_tlut_traffic_light[] = { + #include "assets/unused_traffic_light/common_tlut_traffic_light.inc.c" }; // unused traffic light textures -UNUSED s8 D_0D0260D8[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight01.inc.c" +UNUSED s8 common_texture_traffic_light_01[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_01.inc.c" }; -UNUSED s8 D_0D026558[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight02.inc.c" +UNUSED s8 common_texture_traffic_light_02[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_02.inc.c" }; -UNUSED s8 D_0D0269D8[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight03.inc.c" +UNUSED s8 common_texture_traffic_light_03[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_03.inc.c" }; -UNUSED s8 D_0D026E58[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight04.inc.c" +UNUSED s8 common_texture_traffic_light_04[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_04.inc.c" }; -UNUSED s8 D_0D0272D8[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight05.inc.c" +UNUSED s8 common_texture_traffic_light_05[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_05.inc.c" }; -UNUSED s8 D_0D027758[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight06.inc.c" +UNUSED s8 common_texture_traffic_light_06[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_06.inc.c" }; -UNUSED s8 D_0D027BD8[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight07.inc.c" +UNUSED s8 common_texture_traffic_light_07[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_07.inc.c" }; -UNUSED s8 D_0D028058[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight08.inc.c" +UNUSED s8 common_texture_traffic_light_08[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_08.inc.c" }; -UNUSED s8 D_0D0284D8[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight09.inc.c" +UNUSED s8 common_texture_traffic_light_09[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_09.inc.c" }; -UNUSED s8 D_0D028958[] = { - #include "assets/unused_traffic_light/gTextureUnusedTrafficLight10.inc.c" +UNUSED s8 common_texture_traffic_light_10[] = { + #include "assets/unused_traffic_light/common_texture_traffic_light_10.inc.c" }; // leaf -u8 D_0D028DD8[] = { - #include "textures/common/132B50_28DD8.rgba16.inc.c" +u8 common_texture_particle_leaf[] = { + #include "textures/common/common_texture_particle_leaf.rgba16.inc.c" }; // leaf -s8 D_0D0291D8[] = { - #include "textures/common/132B50_291D8.rgba16.inc.c" +UNUSED s8 common_texture_unused_particle_leaf[] = { + #include "textures/common/common_texture_unused_particle_leaf.rgba16.inc.c" }; @@ -3107,90 +3107,90 @@ s8 D_0D029458[] = { }; // Uses 2A858 as tlut -u8 D_0D029858[][1024] = { +u8 common_texture_bomb[][1024] = { { - #include "assets/bomb/gTextureBomb1.inc.c" + #include "assets/bomb/common_texture_bomb_1.inc.c" }, { - #include "assets/bomb/gTextureBomb2.inc.c" + #include "assets/bomb/common_texture_bomb_2.inc.c" }, { - #include "assets/bomb/gTextureBomb3.inc.c" + #include "assets/bomb/common_texture_bomb_3.inc.c" }, { - #include "assets/bomb/gTextureBomb4.inc.c" + #include "assets/bomb/common_texture_bomb_4.inc.c" }, }; // Special tlut that uses 0xFFFF as a transparent tail instead of 0x0 or 0x07FE. // tlut for 29858 -u8 D_0D02A858[] = { - #include "assets/bomb/gTLUTBomb.inc.c" +u8 common_tlut_bomb[] = { + #include "assets/bomb/common_tlut_bomb.inc.c" }; u8 D_0D02AA58[] = { #include "textures/common/132B50_2AA58.rgba16.inc.c" }; -u8 D_0D02AC58[][1024] = { +u8 common_texture_particle_spark[][1024] = { { - #include "textures/common/132B50_2AC58.i8.inc.c" + #include "textures/common/common_texture_particle_spark_1.i8.inc.c" }, { - #include "textures/common/132B50_2B058.i8.inc.c" + #include "textures/common/common_texture_particle_spark_2.i8.inc.c" }, { - #include "textures/common/132B50_2B458.i8.inc.c" + #include "textures/common/common_texture_particle_spark_3.i8.inc.c" }, { - #include "textures/common/132B50_2B858.i8.inc.c" + #include "textures/common/common_texture_particle_spark_4.i8.inc.c" }, }; -u8 D_0D02BC58[][1024] = { +u8 common_texture_particle_smoke[][1024] = { { - #include "textures/common/132B50_2BC58.i8.inc.c" + #include "textures/common/common_texture_particle_smoke_1.i8.inc.c" }, { - #include "textures/common/132B50_2C058.i8.inc.c" + #include "textures/common/common_texture_particle_smoke_2.i8.inc.c" }, { - #include "textures/common/132B50_2C458.i8.inc.c" + #include "textures/common/common_texture_particle_smoke_3.i8.inc.c" }, { - #include "textures/common/132B50_2C858.i8.inc.c" + #include "textures/common/common_texture_particle_smoke_4.i8.inc.c" }, }; // minimap cars -s8 gTextureMiniMapFinishLine[] = { - #include "assets/minimap_icons/gTextureMiniMapFinishLine.inc.c" +s8 common_texture_minimap_finish_line[] = { + #include "assets/minimap_icons/common_texture_minimap_finish_line.inc.c" }; -s8 gMiniMapKartTextures[][128] = { +s8 common_texture_minimap_kart_character[][128] = { { // Mario - #include "assets/minimap_icons/gTextureMiniMapKartMario.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_mario.inc.c" }, { // Luigi - #include "assets/minimap_icons/gTextureMiniMapKartLuigi.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_luigi.inc.c" }, { // Yoshi - #include "assets/minimap_icons/gTextureMiniMapKartYoshi.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_yoshi.inc.c" }, { // Toad - #include "assets/minimap_icons/gTextureMiniMapKartToad.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_toad.inc.c" }, { // Donkey Kong - #include "assets/minimap_icons/gTextureMiniMapKartDonkeyKong.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_donkey_kong.inc.c" }, { // Wario - #include "assets/minimap_icons/gTextureMiniMapKartWario.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_wario.inc.c" }, { // Peach - #include "assets/minimap_icons/gTextureMiniMapKartPeach.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_peach.inc.c" }, { // Bowser - #include "assets/minimap_icons/gTextureMiniMapKartBowser.inc.c" + #include "assets/minimap_icons/common_texture_minimap_kart_bowser.inc.c" }, }; diff --git a/src/hud_renderer.c b/src/hud_renderer.c index 708c5d7b6..dd445b0a8 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -2229,7 +2229,7 @@ void func_8004E6C4(s32 playerId) { } void func_8004E78C(s32 playerId) { - func_8004CB60((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, (s32) D_0D00A958); + func_8004CB60((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, (s32) common_texture_hud_lap); func_8004CB90(playerHUD[playerId].lapX + 0x1C, (s32) playerHUD[playerId].lapY, D_800E4570[playerHUD[playerId].alsoLapCount]); } @@ -2237,11 +2237,11 @@ void func_8004E800(s32 playerId) { if (playerHUD[playerId].unk_81 != 0) { if (playerHUD[playerId].lapCount != 3) { func_8004A384(playerHUD[playerId].rankX + playerHUD[playerId].slideRankX, playerHUD[playerId].rankY + playerHUD[playerId].slideRankY, 0U, - playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_8018CF98[playerId]], 0, 0x000000FF, D_0D00D258[D_8018CF98[playerId]], + playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_8018CF98[playerId]], 0, 0x000000FF, common_texture_hud_place[D_8018CF98[playerId]], D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); } else { func_8004A384(playerHUD[playerId].rankX + playerHUD[playerId].slideRankX, playerHUD[playerId].rankY + playerHUD[playerId].slideRankY, 0U, - playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, D_0D00D258[gGPCurrentRaceRankByPlayerId[playerId]], + playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, common_texture_hud_place[gGPCurrentRaceRankByPlayerId[playerId]], D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); } } @@ -2270,26 +2270,26 @@ void func_8004EB38(s32 playerId) { temp_s0 = &playerHUD[playerId]; if ((u8) temp_s0->unk_7B != 0) { - func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, (s32) D_0D00C158, 0x00000020, 0x00000010, 0x00000020, 0x00000010); + func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, (s32) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010); func_8004F950((s32) temp_s0->lap1CompletionTimeX, (s32) temp_s0->timerY, 0x00000080, (s32) temp_s0->someTimer); } if ((u8) temp_s0->unk_7C != 0) { - func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, (s32) D_0D00C158, 0x00000020, 0x00000010, 0x00000020, 0x00000010); + func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, (s32) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010); func_8004F950((s32) temp_s0->lap2CompletionTimeX, (s32) temp_s0->timerY, 0x00000050, (s32) temp_s0->someTimer); } if ((u8) temp_s0->unk_7E != 0) { - func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, (s32) D_0D00A958, 0x00000020, 8, 0x00000020, 8); + func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, (s32) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8); func_8004C9D8(temp_s0->lapAfterImage1X + 0x1C, (s32) temp_s0->lapY, 0x00000080, D_800E4570[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010); } if ((u8) temp_s0->unk_7F != 0) { - func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, (s32) D_0D00A958, 0x00000020, 8, 0x00000020, 8); + func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, (s32) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8); func_8004C9D8(temp_s0->lapAfterImage2X + 0x1C, (s32) temp_s0->lapY, 0x00000050, D_800E4570[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010); } } void func_8004ED40(s32 arg0) { - func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, (u8* ) D_0D009958, D_0D0064B0, 0x40, 0x60, 0x40, 0x30); - func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, (u8* ) D_0D00A558, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20); + func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, (u8* ) common_texture_speedometer, D_0D0064B0, 0x40, 0x60, 0x40, 0x30); + func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, (u8* ) common_texture_speedometer_needle, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20); } void func_8004EE54(s32 arg0) { @@ -2326,7 +2326,7 @@ void func_8004F020(s32 arg0) { var_f0 = var_f0 + 4.0; break; } - func_8004CAD0(var_f2, var_f0, gTextureMiniMapFinishLine); + func_8004CAD0(var_f2, var_f0, common_texture_minimap_finish_line); } #ifdef NON_MATCHING @@ -2344,10 +2344,10 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) { temp_a1 = ((D_8018D2D8[arg0] + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (player->pos[2] * D_8018D2A0); if (characterId != 8) { if ((gGPCurrentRaceRankByPlayerId[playerId] == 0) && (gModeSelection != BATTLE) && (gModeSelection != TIME_TRIALS)) { - func_80046424((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); + func_80046424((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); // return; } else { - func_800463B0((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); + func_800463B0((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8); } //return; } else { @@ -2457,7 +2457,7 @@ void print_timer(s32 arg0, s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D008108); gSPDisplayList(gDisplayListHead++, D_0D007EF8); gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); - func_80043D50(D_0D00C558, 104, 16); + func_80043D50(common_texture_hud_normal_digit, 104, 16); func_8004F6D0(arg2); func_8004F774(arg0, arg1); gSPDisplayList(gDisplayListHead++, D_0D007EB8); @@ -2476,7 +2476,7 @@ void func_8004F8CC(s32 arg0, s32 arg1) { void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { gSPDisplayList(gDisplayListHead++, D_0D007F38); set_transparency(arg2); - func_80043D50(D_0D00C558, 104, 16); + func_80043D50(common_texture_hud_normal_digit, 104, 16); func_8004F6D0(arg3); func_8004F8CC(arg0, arg1); } @@ -2484,7 +2484,7 @@ void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D007F38); func_8004B614(D_801656C0, D_801656D0, D_801656E0, 128, 128, 128, 255); - func_80043D50(D_0D00C558, 104, 16); + func_80043D50(common_texture_hud_normal_digit, 104, 16); func_8004F6D0(arg2); func_8004F8CC(arg0, arg1); } @@ -2502,7 +2502,7 @@ void func_8004FA78(s32 playerId) { func_8004F9CC(playerHUD[playerId].lapCompletionTimeXs[var_s0], playerHUD[playerId].timerY + (var_s0*0x10), playerHUD[playerId].lapDurations[var_s0]); } } - func_8004CB90(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, D_0D00BD58); + func_8004CB90(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, common_texture_hud_total_time); if (D_801657E5 != 0) { func_8004F9CC(playerHUD[playerId].totalTimeX, playerHUD[playerId].timerY + 0x30, playerHUD[playerId].someTimer); } else { @@ -2511,10 +2511,10 @@ void func_8004FA78(s32 playerId) { } } else { if (playerHUD[playerId].blinkTimer == 0) { - func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, D_0D00C158); + func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_time); print_timer(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer); } else { - func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, D_0D00AD58); + func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_lap_time); if (D_801657E3 != 0) { func_8004F9CC(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer1); } else if (playerHUD[playerId].blinkState == 0) { @@ -2529,7 +2529,7 @@ void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) { gSPDisplayList(gDisplayListHead++, D_0D008108); gSPDisplayList(gDisplayListHead++, D_0D007EF8); gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); - func_80043D50(D_0D00AB58, 32, 8); + func_80043D50(common_texture_hud_123, 32, 8); func_8004BA98(arg0, arg1, 8, 8, arg2 * 8, 0, 0); func_8004BA98(arg0 + 8, arg1, 8, 8, 24, 0, 0); func_8004BA98(arg0 + 16, arg1, 8, 8, 16, 0, 0); @@ -2541,8 +2541,8 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 characterId, s32 func_80042330((s32) arg0, (s32) arg1, 0U, 1.0f); gSPDisplayList(gDisplayListHead++, D_0D007DB8); func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, D_8018D3E0); - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark); - rsp_load_texture(gTexturePortraitQuestionMark, 0x00000020, 0x00000020); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark); + rsp_load_texture(common_texture_portrait_question_mark, 0x00000020, 0x00000020); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } else { func_80042330(arg0, arg1, 0U, 1.0f); @@ -2559,14 +2559,14 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 characterId, s32 func_80042330(arg0, arg1, 0U, 1.0f); gSPDisplayList(gDisplayListHead++, D_0D007A60); func_8004B35C(D_8018D3E4, D_8018D3E8, D_8018D3EC, 0x000000FF); - func_80044924(gTextureCharacterPortraitBorder, 0x20, 0x20); + func_80044924(common_texture_character_portrait_border, 0x20, 0x20); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } gSPDisplayList(gDisplayListHead++, D_0D007DB8); func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, arg5); gSPDisplayList(gDisplayListHead++, D_0D007CB8); - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTHudTypeCRankFont); - rsp_load_texture(gTextureHudTypeCRankFont[arg2], 0x00000010, 0x00000010); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_hud_type_C_rank_font); + rsp_load_texture(common_texture_hud_type_C_rank_font[arg2], 0x00000010, 0x00000010); if (arg7 != 0) { func_80042330((s32) (arg0 + 9.0f), (s32) (arg1 + 7.0f), 0U, 1.0f); } else { @@ -2784,8 +2784,8 @@ void func_80050C68(void) { if ((gBombKarts[var_s1].state != BOMB_STATE_EXPLODED) && (gBombKarts[var_s1].state != BOMB_STATE_INACTIVE)) { func_800507D8(var_s1, &sp88, &sp84); gSPDisplayList(gDisplayListHead++, D_0D007DB8); - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark); - rsp_load_texture(gTexturePortraitBombKart, 0x00000020, 0x00000020); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark); + rsp_load_texture(common_texture_portrait_bomb_kart, 0x00000020, 0x00000020); func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } @@ -2829,8 +2829,8 @@ void func_80050E34(s32 playerId, s32 arg1) { if ((gCurrentCourseId == COURSE_YOSHI_VALLEY) && (lapCount < 3)) { gSPDisplayList(gDisplayListHead++, D_0D007DB8); - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark); - rsp_load_texture(gTexturePortraitQuestionMark, 0x00000020, 0x00000020); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark); + rsp_load_texture(common_texture_portrait_question_mark, 0x00000020, 0x00000020); object = &gObjectList[objectIndex]; object->pos[0] = object->unk_028[0] + ((f32) (spD0 + 0x20)); object->pos[1] = object->unk_028[1] + ((f32) (spC4 + spCC)); @@ -2856,8 +2856,8 @@ void func_80050E34(s32 playerId, s32 arg1) { } else { gSPDisplayList(gDisplayListHead++, D_0D0069E0); } - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTHudTypeCRankTinyFont); - rsp_load_texture(gTextureHudTypeCRankTinyFont[arg1 + 1], 8, 8); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_hud_type_C_rank_tiny_font); + rsp_load_texture(common_texture_hud_type_C_rank_tiny_font[arg1 + 1], 8, 8); if (spB8 != 0) { func_80042330(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f); } else { @@ -2867,7 +2867,7 @@ void func_80050E34(s32 playerId, s32 arg1) { if ((player == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) { gSPDisplayList(gDisplayListHead++, D_0D007A40); func_8004B35C(D_8018D3E4, D_8018D3E8, D_8018D3EC, 0x000000FF); - func_80044924(gTextureCharacterPortraitBorder, 0x00000020, 0x00000020); + func_80044924(common_texture_character_portrait_border, 0x00000020, 0x00000020); rsp_set_matrix_transformation(object->pos, object->unk_0BE, object->sizeScaling); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } @@ -2913,7 +2913,7 @@ void func_80051638(UNUSED s32 arg0) { gSPDisplayList(gDisplayListHead++, D_0D0079C8); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); - func_80043D50(D_0D028DD8, 0x00000020, 0x00000010); + func_80043D50(common_texture_particle_leaf, 0x00000020, 0x00000010); for(someIndex = 0; someIndex < D_8018C970_SIZE; someIndex++) { leafIndex = D_8018C970[someIndex]; if (leafIndex != -1) { @@ -3672,7 +3672,7 @@ void func_80054664(s32 cameraId) { s32 objectIndex; gSPDisplayList(gDisplayListHead++, D_0D007AE0); - func_8004477C(D_0D02BC58[D_80165598], 0x00000020, 0x00000020); + func_8004477C(common_texture_particle_smoke[D_80165598], 0x00000020, 0x00000020); func_8004B414(0, 0, 0, 0x000000FF); D_80183E80[0] = 0; D_80183E80[2] = 0x8000; @@ -3716,7 +3716,7 @@ void func_80054938(s32 cameraId) { sp54 = &camera1[cameraId]; gSPDisplayList(gDisplayListHead++, D_0D007AE0); - func_8004477C(D_0D02BC58[D_80165598], 32, 32); + func_8004477C(common_texture_particle_smoke[D_80165598], 32, 32); func_8004B72C(255, 255, 255, 255, 255, 255, 255); D_80183E80[0] = 0; D_80183E80[2] = 0x8000; @@ -4171,7 +4171,7 @@ void func_800562E4(s32 arg0, s32 arg1, s32 arg2) { D_80165878 = D_800E46F8[arg0][2]; func_8004B138(D_80165860, D_8016586C, D_80165878, arg2); rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f); - func_80044BF8(D_0D02AC58[arg1], 0x00000020, 0x00000020); + func_80044BF8(common_texture_particle_spark[arg1], 0x00000020, 0x00000020); gSPVertex(gDisplayListHead++, D_0D005AE0, 4, 0); gSPDisplayList(gDisplayListHead++, common_rectangle_display); } @@ -4195,7 +4195,7 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) { rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f); gSPDisplayList(gDisplayListHead++, D_0D007E98); func_8004B310(arg2); - draw_rectangle_texture_overlap(D_0D02A858, D_0D029858[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); + draw_rectangle_texture_overlap(common_tlut_bomb, common_texture_bomb[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); temp_s0 = D_8018D400; gSPDisplayList(gDisplayListHead++, D_0D007B00); func_8004B414(0, 0, 0, arg2); @@ -4299,11 +4299,11 @@ void func_80056BF0(s32 bombIndex) { temp_v0 = D_801655CC % 6U; thing = D_800E471C[temp_v0]; - bombFrame = D_0D029858[thing]; + bombFrame = common_texture_bomb[thing]; D_80183E40[0] = sp40.bombPos[0]; D_80183E40[1] = sp40.bombPos[1] + 1.0; D_80183E40[2] = sp40.bombPos[2]; - func_800480B4(D_80183E40, D_80183E80, 0.25f, D_0D02A858, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20); + func_800480B4(D_80183E40, D_80183E80, 0.25f, common_tlut_bomb, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20); temp_s0 = D_8018D400; gSPDisplayList(gDisplayListHead++, D_0D007B00); func_8004B414(0, 0, 0, 0xFF); diff --git a/src/racing/actors.c b/src/racing/actors.c index 805ac6751..05ba211d3 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -392,7 +392,7 @@ void func_802977E4(Player *arg0) { // Invert green and red on green shell texture void init_red_shell_texture(void) { s16 *red_shell_texture = (s16 *) &gTLUTRedShell[0]; - s16 *green_shell_texture = (s16 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(gTLUTGreenShell)] + SEGMENT_OFFSET(gTLUTGreenShell)); + s16 *green_shell_texture = (s16 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(common_tlut_green_shell)] + SEGMENT_OFFSET(common_tlut_green_shell)); s16 color_pixel, red_color, green_color, blue_color, alpha_color; s32 i; for (i = 0; i < 256; i++) { @@ -943,7 +943,7 @@ void render_actor_tree_mario_raceway(Camera *camera, Mat4 arg1, struct Actor *ar arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree); } } @@ -966,7 +966,7 @@ void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree); } } @@ -989,7 +989,7 @@ void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *ar arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree); } } @@ -1012,7 +1012,7 @@ void render_actor_tree_moo_moo_farm(Camera *camera, Mat4 arg1, struct Actor *arg arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree); } } @@ -1035,7 +1035,7 @@ void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) { arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); // Why is a TLUT being used a DL here? That makes no sense // Based on the TLUT being loaded above, this ought to be be another // tree related DL, presumably one found in a course other than Moo Moo farm @@ -1062,7 +1062,7 @@ void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree); } } @@ -1085,7 +1085,7 @@ void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar arg1[3][2] = arg2->pos[2]; if (render_set_position(arg1, 0) != 0) { - gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import); gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush); } } @@ -1262,7 +1262,7 @@ UNUSED s16 D_802B8810[] = { }; void render_actor_green_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) { - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTGreenShell); // set texture + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_green_shell); // set texture render_actor_shell(camera, matrix, shell); } @@ -1273,7 +1273,7 @@ void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shel // Middle of a tlut access void render_actor_blue_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) { - gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTBlueShell); // set texture + gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_blue_shell); // set texture render_actor_shell(camera, matrix, shell); } diff --git a/src/racing/actors.h b/src/racing/actors.h index 0d40910ec..6828866e2 100644 --- a/src/racing/actors.h +++ b/src/racing/actors.h @@ -124,7 +124,7 @@ extern s16 gCurrentCourseId; extern u16 isCrossingTriggeredByIndex[]; extern Lights1 D_800DC610[]; -extern s8 D_0D004C68[]; +extern s8 common_tlut_trees_import[]; extern Gfx D_0D005338[]; extern Gfx D_0D005368[]; extern Gfx D_0D007B20[]; |