mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-21 23:24:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some more bin2c calls from the Makefile (#286)

Browse Source 
* Remove some bin2c calls from the Makefile

* Found a way to make n64graphics use shared tluts

* Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

* Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

* Names some textures and tluts

* Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

* Minor cleanup in n64graphics

* Added some comments, gave more appropriate names to some
 variables.

* Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Textures compile using makefile rules

* Patched n64 graphics memory leak and ci output

* Added memset16safe to initialize ci palettes to magic numbers (transparent pixels).

---------

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Tyler McGavran
2023-02-07 00:52:34 -05:00
committed by GitHub
parent 533d035875
commit 3a99685c2f
39 changed files with 1442 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actors.c
+4 -3
View File
@@ -17,6 +17,7 @@
#include "code_8008C1D0.h"
#include <sounds.h>
#include "audio/external.h"
#include "common_textures.h"
s32 D_802BA050;
s32 D_802BA054;
@@ -374,7 +375,7 @@ void func_802977E4(Player *arg0) {
void func_80297818(void) {
s16 *phi_v0 = &D_802BA060[0];
s16 *phi_v1 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(&D_0D004E38)] + SEGMENT_OFFSET(&D_0D004E38));
s16 *phi_v1 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(gTLUTGreenShell)] + SEGMENT_OFFSET(gTLUTGreenShell));
s16 temp_a0, temp_a0_2, temp_a0_3, temp_a0_4, temp_a0_5;
s32 i;
for (i = 0; i < 256; i++) {
@@ -1253,7 +1254,7 @@ UNUSED s16 D_802B8810[] = {
};
void func_8029A690(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E38);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTGreenShell);
func_8029A3AC(arg0, arg1, arg2);
}
@@ -1264,7 +1265,7 @@ void func_8029A75C(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
// Middle of a tlut access
void func_8029A828(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E68[0x1D0]);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTBlueShell);
func_8029A3AC(arg0, arg1, arg2);
}
src/actors.h
-3
View File
@@ -321,9 +321,6 @@ extern Gfx D_0D0031E8[];
extern Gfx D_0D004B48[];
extern Gfx D_0D004BD8[];
extern s8 D_0D004E38[];
extern s8 D_0D004E68[];
extern s8 D_0F04CBE0[];
extern s8 D_0F04CE30[];
extern s8 D_0F04D080[];
src/code_800431B0.c
+5 -5
View File
@@ -3572,7 +3572,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s
temp_s0_2 = gDisplayListHead;
gDisplayListHead = temp_s0_2 + 8;
temp_s0_2->words.w0 = 0xFD100000;
temp_s0_2->words.w1 = (u32) gTLUTPortraitMiniBombKart;
temp_s0_2->words.w1 = (u32) gTLUTPortraitBombKartAndQuestionMark;
temp_s0_3 = gDisplayListHead;
gDisplayListHead = temp_s0_3 + 8;
temp_s0_3->words.w1 = 0;
@@ -4011,7 +4011,7 @@ void func_80050C68(void) {
temp_v0_2->words.w0 = 0x06000000;
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
temp_v0_3->words.w1 = (u32) gTLUTPortraitMiniBombKart;
temp_v0_3->words.w1 = (u32) gTLUTPortraitBombKartAndQuestionMark;
temp_v0_3->words.w0 = 0xFD100000;
temp_v0_4 = gDisplayListHead;
gDisplayListHead = temp_v0_4 + 8;
@@ -4033,7 +4033,7 @@ void func_80050C68(void) {
gDisplayListHead = temp_v0_8 + 8;
temp_v0_8->words.w1 = 0;
temp_v0_8->words.w0 = 0xE7000000;
func_800452A4(gTexturePortraitMiniBombKart, 0x00000020, 0x00000020);
func_800452A4(gTexturePortraitBombKartAndQuestionMark, 0x00000020, 0x00000020);
func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f);
temp_v0_9 = gDisplayListHead;
gDisplayListHead = temp_v0_9 + 8;
@@ -4144,7 +4144,7 @@ void func_80050E34(s32 playerId, s32 arg1) {
temp_v0_4 = gDisplayListHead;
gDisplayListHead = temp_v0_4 + 8;
temp_v0_4->words.w0 = 0xFD100000;
temp_v0_4->words.w1 = (u32) gTLUTPortraitMiniBombKart;
temp_v0_4->words.w1 = (u32) gTLUTPortraitBombKartAndQuestionMark;
temp_v0_5 = gDisplayListHead;
gDisplayListHead = temp_v0_5 + 8;
temp_v0_5->words.w1 = 0;
@@ -5317,7 +5317,7 @@ void func_800536C8(s32 objectIndex) {
func_800534E8(objectIndex);
gSPDisplayList(gDisplayListHead++, D_0D007828);
gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16);
gDPLoadTLUT_pal256(gDisplayListHead++, D_06006F38);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTWhomp);
func_8004544C(D_80165C18[objectIndex].unk_064, 0x00000010, 0x00000040, 4);
gSPDisplayList(gDisplayListHead++, D_80165C18[objectIndex].unk_070);
}
src/code_800431B0.h
+1 -1
View File
@@ -420,7 +420,7 @@ extern Lights1 D_800E4698;
extern s8 D_800E5670[];
extern s8 D_800E566A[];
extern u8 D_06006F38[]; // Some type of pallette?
extern u8 gTLUTWhomp[]; // Some type of pallette?
extern Gfx *gDisplayListHead;
src/code_80057C60.c
+1 -1
View File
@@ -744,7 +744,7 @@ void func_80059560(s32 playerId) {
if (D_801657E4 == 2) {
temp_v0_2 = &D_8018CA70[playerId];
if ((temp_v0_2->unk_74 != 0) && (D_80165608 != 0)) {
func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitMiniBombKart, (s32) gTexturePortraitMiniBombKart, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitBombKartAndQuestionMark, (s32) gTexturePortraitBombKartAndQuestionMark, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
}
}
}
src/code_8006E9C0.c
+2 -2
View File
@@ -1269,7 +1269,7 @@ void func_80070714(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
void func_800770F0(s32); /* extern */
extern s32 D_06007BB8;
extern s32 gTLUTBat;
extern s32 D_06007DB8;
extern s16 D_80165750;
extern ? *D_80165758;
@@ -1494,7 +1494,7 @@ void func_80070780(void) {
case 3:
if (gGamestate != 9) {
temp_s0_4 = D_80183EA0->unk0;
func_80073444(temp_s0_4, &D_06007BB8, &D_06007DB8, 0x20U, (u16) 0x00000040);
func_80073444(temp_s0_4, &gTLUTBat, &D_06007DB8, 0x20U, (u16) 0x00000040);
temp_v0_5 = &D_80165C18[temp_s0_4];
temp_v0_5->unk_0B2[0] = 0;
temp_v0_5->unk_0B2[1] = 0;
src/code_80071F00.c
+41 -41
View File
@@ -3300,7 +3300,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800791F0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern Vtx D_0D005EB0;
extern s32 D_0D024ED8;
extern s32 gTLUTLakituCountdown;
extern s32 D_0F05EB50;
extern s16 D_801656F0;
extern s32 D_8018D168;
@@ -3314,7 +3314,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) {
D_801656F0 = 0;
D_8018D168 = 0;
}
func_80073444(objectIndex, &D_0D024ED8, &D_0F05EB50, 0x38U, (u16) 0x00000048);
func_80073444(objectIndex, &gTLUTLakituCountdown, &D_0F05EB50, 0x38U, (u16) 0x00000048);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D005EB0;
sp24 = temp_v0;
@@ -3437,7 +3437,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079380.s")
void func_800791F0(); /* extern */
void func_80086F10(s32, ?, ? *); /* extern */
extern Vtx D_0D006730;
extern s32 D_0D0254D8;
extern s32 gTLUTLakituCheckeredFlag;
extern s32 D_0F07E350;
extern s32 *D_8018C028;
static ? D_800E6834; /* unable to generate initializer */
@@ -3446,7 +3446,7 @@ void func_8007963C(s32 objectIndex) {
struct_80165C18_entry *temp_v0;
func_800791F0();
func_80073444(objectIndex, &D_0D0254D8, &D_0F07E350, 0x48U, (u16) 0x00000038);
func_80073444(objectIndex, &gTLUTLakituCheckeredFlag, &D_0F07E350, 0x48U, (u16) 0x00000038);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D006730;
temp_v0->unk_004[2] = 5000.0f;
@@ -3541,14 +3541,14 @@ void func_800791F0(); /* extern */
void func_80086E70(s32); /* extern */
void func_800C8F80(u8, ?); /* extern */
extern Vtx D_0D005F30;
extern s32 D_0D025CD8;
extern s32 gTLUTLakituFishing;
extern s32 D_0F0CCF50;
void func_800799A8(s32 objectIndex, u8 arg1) {
struct_80165C18_entry *temp_v0;
func_800791F0();
func_80073444(objectIndex, &D_0D025CD8, &D_0F0CCF50, 0x38U, (u16) 0x00000048);
func_80073444(objectIndex, &gTLUTLakituFishing, &D_0F0CCF50, 0x38U, (u16) 0x00000048);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D005F30;
temp_v0->unk_000 = 0.15f;
@@ -3755,7 +3755,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079D44.s")
void func_800791F0(); /* extern */
void func_80086F10(s32, ?, ? *); /* extern */
extern Vtx D_0D006730;
extern s32 D_0D0256D8;
extern s32 gTLUTLakituSecondLap;
extern s32 D_0F09DB50;
extern s32 *D_8018C028;
static ? D_800E694C; /* unable to generate initializer */
@@ -3764,7 +3764,7 @@ void func_8007A060(s32 objectIndex) {
struct_80165C18_entry *temp_v0;
func_800791F0();
func_80073444(objectIndex, &D_0D0256D8, &D_0F09DB50, 0x48U, (u16) 0x00000038);
func_80073444(objectIndex, &gTLUTLakituSecondLap, &D_0F09DB50, 0x48U, (u16) 0x00000038);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D006730;
temp_v0->unk_004[2] = 5000.0f;
@@ -3828,7 +3828,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A124.s")
void func_800791F0(); /* extern */
void func_80086F10(s32, ?, ? *); /* extern */
extern Vtx D_0D006730;
extern s32 D_0D0258D8;
extern s32 gTLUTLakituFinalLap;
extern s32 D_0F0AD750;
extern s32 *D_8018C028;
static ? D_800E694C; /* unable to generate initializer */
@@ -3837,7 +3837,7 @@ void func_8007A228(s32 objectIndex) {
struct_80165C18_entry *temp_v0;
func_800791F0();
func_80073444(objectIndex, &D_0D0258D8, &D_0F0AD750, 0x48U, (u16) 0x00000038);
func_80073444(objectIndex, &gTLUTLakituFinalLap, &D_0F0AD750, 0x48U, (u16) 0x00000038);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D006730;
temp_v0->unk_004[2] = 5000.0f;
@@ -3902,7 +3902,7 @@ void func_800791F0(); /* extern */
void func_80086F10(s32, ?, ? *); /* extern */
void func_800C8F80(u8, ?); /* extern */
extern Vtx D_0D006730;
extern s32 D_0D025AD8;
extern s32 gTLUTLakituReverse;
extern s32 D_0F0BD350;
extern s32 *D_8018C028;
static ? D_800E69B0; /* unable to generate initializer */
@@ -3912,7 +3912,7 @@ void func_8007A3F0(s32 objectIndex, u8 arg1) {
struct_80165C18_entry *temp_v0;
func_800791F0();
func_80073444(objectIndex, &D_0D025AD8, &D_0F0BD350, 0x48U, (u16) 0x00000038);
func_80073444(objectIndex, &gTLUTLakituReverse, &D_0F0BD350, 0x48U, (u16) 0x00000038);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D006730;
temp_v0->unk_004[2] = 5000.0f;
@@ -5038,13 +5038,13 @@ void func_8007C550(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06005C80;
extern s32 gTLUTBoo;
extern s32 *D_80165880;
void func_8007C5B4(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06005C80, D_80165880, 0x30U, (u16) 0x00000028);
func_80073444(objectIndex, &gTLUTBoo, D_80165880, 0x30U, (u16) 0x00000028);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_004[0] = 0.0f;
temp_s0->unk_004[1] = 0.0f;
@@ -5352,7 +5352,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CC00.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06005C80;
extern s32 gTLUTBoo;
extern s32 D_0F0D0E50;
extern void *D_8018CF1C;
@@ -5360,7 +5360,7 @@ void func_8007CE0C(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
void *temp_v0;
func_80073444(objectIndex, &D_06005C80, &D_0F0D0E50, 0x30U, (u16) 0x00000028);
func_80073444(objectIndex, &gTLUTBoo, &D_0F0D0E50, 0x30U, (u16) 0x00000028);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_0D2 = 0x1C;
temp_s0->unk_004[0] = 0.0f;
@@ -6274,7 +6274,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E63C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
@@ -6292,7 +6292,7 @@ void func_8007EC30(s32 objectIndex) {
func_8008B888(objectIndex, 0U, 0xC000U, 0U);
func_8008B8BC(objectIndex, 0U, 0xC000U, 0U);
}
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s1->unk_070 = (s32) &D_06009088;
temp_s1->unkC8 = 0x000C;
temp_s1->unk_000 = 1.0f;
@@ -6353,14 +6353,14 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ED6C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
void func_8007EE5C(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unkC8 = 0x000C;
@@ -6687,14 +6687,14 @@ void func_8007F8D8(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
void func_8007FA08(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unkC8 = 0x000C;
@@ -6905,7 +6905,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FFC0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
@@ -6913,7 +6913,7 @@ void func_80080078(s32 objectIndex) {
s16 temp_v0;
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unkC8 = 0x000C;
@@ -6992,7 +6992,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800801FC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
@@ -7001,7 +7001,7 @@ void func_800802C0(s32 objectIndex) {
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_0D8 = 0;
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unk_0D2 = 0;
temp_s0->unkC8 = 0x000C;
@@ -7076,7 +7076,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080408.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006F38;
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 gGamestate;
@@ -7085,7 +7085,7 @@ void func_80080524(s32 objectIndex) {
s16 temp_v0;
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06006F38, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unkC8 = 0x000C;
@@ -8280,13 +8280,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082870.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_0600D628;
extern s32 gTLUTCrab;
extern s32 D_0600D828;
void func_80082A4C(s32 objectIndex) {
struct_80165C18_entry *temp_s1;
func_80073444(objectIndex, &D_0600D628, &D_0600D828, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTCrab, &D_0600D828, 0x40U, (u16) 0x00000040);
temp_s1 = &D_80165C18[objectIndex];
temp_s1->unk_0D2 = 0;
temp_s1->unk_000 = 0.15f;
@@ -8510,17 +8510,17 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083080.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06014908;
extern s32 D_06014B08;
extern s32 gTLUTHedgehog;
extern s32 gTextureHedgehog;
extern Vtx D_0D0060B0;
void func_8008311C(s32 objectIndex, s32 arg1) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06014908, &D_06014B08, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTHedgehog, &gTextureHedgehog, 0x40U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_060 = &D_06014908;
temp_s0->unk_064 = &D_06014B08;
temp_s0->unk_060 = &gTLUTHedgehog;
temp_s0->unk_064 = &gTextureHedgehog;
temp_s0->unk_074 = (s32) &D_0D0060B0;
temp_s0->unk_0D2 = 0;
temp_s0->unk_000 = 0.2f;
@@ -8736,14 +8736,14 @@ void func_8008379C(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06004B20;
extern s32 D_06004D20;
extern s32 gTLUTSnowman;
extern s32 gTextureSnowmanHead;
extern Vtx D_0D0061B0;
void func_80083868(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &D_06004B20, &D_06004D20, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTSnowman, &gTextureSnowmanHead, 0x40U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_074 = (s32) &D_0D0061B0;
temp_s0->unk_0D2 = 0;
@@ -8826,15 +8826,15 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083A94.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06004B20;
extern s32 D_06005D20;
extern s32 gTLUTSnowman;
extern s32 gTextureSnowmanBody;
extern Vtx D_0D0060B0;
void func_80083B0C(s32 objectIndex) {
struct_80165C18_entry *sp2C;
struct_80165C18_entry *temp_v0;
func_80073444(objectIndex, &D_06004B20, &D_06005D20, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTSnowman, &gTextureSnowmanBody, 0x40U, (u16) 0x00000040);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_074 = (s32) &D_0D0060B0;
temp_v0->unk_0D2 = 0;
src/common_textures.h
+12 -6
View File
@@ -67,9 +67,8 @@ extern s8 D_0D003B48[];
extern Gfx D_0D004B48[];
extern Gfx D_0D004BD8[];
extern s8 D_0D004C68[];
extern s8 D_0D004E38[];
extern s8 D_0D004E68[];
extern s8 D_0D005068[];
extern s8 gTLUTGreenShell[];
extern s8 gTLUTBlueShell[];
extern Vtx D_0D005238[];
extern Vtx D_0D005278[];
extern Gfx D_0D0052B8[];
@@ -249,7 +248,7 @@ extern s8 gTLUTPortraitYoshi[];
extern s8 gTLUTPortraitDonkeyKong[];
extern s8 gTLUTPortraitWario[];
extern s8 gTLUTPortraitBowser[];
extern s8 gTLUTPortraitMiniBombKart[];
extern s8 gTLUTPortraitBombKartAndQuestionMark[];
extern s8 gTexturePortraitMario[];
extern s8 gTexturePortraitLuigi[];
extern s8 gTexturePortraitPeach[];
@@ -258,7 +257,7 @@ extern s8 gTexturePortraitYoshi[];
extern s8 gTexturePortraitDonkeyKong[];
extern s8 gTexturePortraitWario[];
extern s8 gTexturePortraitBowser[];
extern s8 gTexturePortraitMiniBombKart[];
extern s8 gTexturePortraitBombKartAndQuestionMark[];
extern s8 gTexturePortraitQuestionMark[];
extern s8 gTLUTItemWindowNone[];
extern s8 gTLUTItemWindowBanana[];
@@ -292,7 +291,14 @@ extern s8 gTextureItemWindowTripleRedShell[];
extern s8 gTextureItemWindowStar[];
extern s8 gTextureItemWindowThunderBolt[];
extern s8 gTextureItemWindowFakeItemBox[];
extern s8 D_0D024ED8[];
extern s8 gTLUTLakituCountdown[][512];
extern s8 gTLUTLakituCheckeredFlag[];
extern s8 gTLUTLakituSecondLap[];
extern s8 gTLUTLakituFinalLap[];
extern s8 gTLUTLakituReverse[];
extern s8 gTLUTLakituFishing[];
extern s8 D_0D028DD8[];
extern s8 D_0D025ED8[];
extern s8 D_0D0260D8[];
extern s8 D_0D026558[];
src/common_textures.inc.c
+258 -461
View File
File diff suppressed because it is too large Load Diff