mirror of
https://github.com/n64decomp/mk64
synced 2026-06-30 10:31:37 -04:00
Memory and Actor decomp (#201)
* Decomp more actors * Added editor config to prevent clrf * Memory and actor decomp * Update code_80296A50.c * Update code_80296A50.c
This commit is contained in:
+434
-767
File diff suppressed because it is too large
Load Diff
+17
-28
@@ -623,12 +623,15 @@ void func_802A8F14(Gfx *arg0, u8 arg1, u8 arg2) {
|
||||
arg0[D_802BA270].words.w1 = macro->words.w1;
|
||||
D_802BA270++;
|
||||
}
|
||||
|
||||
Gfx D_802B8D58[] = {gsDPTileSync()};
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
|
||||
static ? D_802B8D58; /* unable to generate initializer */
|
||||
|
||||
|
||||
|
||||
void func_802A8F80(s32 arg0, s32 arg1, s8 arg2) {
|
||||
s32 sp58;
|
||||
s32 sp48;
|
||||
@@ -709,6 +712,9 @@ block_9:
|
||||
GLOBAL_ASM("asm/non_matchings/memory/func_802A8F80.s")
|
||||
#endif
|
||||
|
||||
Gfx D_802B8D60[] = { gsDPTileSync() };
|
||||
Gfx D_802B8D68[] = { gsDPLoadSync() };
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
|
||||
static ? D_802B8D60; /* unable to generate initializer */
|
||||
@@ -821,37 +827,20 @@ block_8:
|
||||
GLOBAL_ASM("asm/non_matchings/memory/func_802A91E4.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern ? D_802B8D70;
|
||||
extern s32 D_802BA270;
|
||||
|
||||
void func_802A94D8(s32 arg0, ? arg1, ? arg2) {
|
||||
sp->unk0 = D_802B8D70.unk0;
|
||||
sp->unk4 = D_802B8D70.unk4;
|
||||
*(arg0 + (D_802BA270 * 8)) = sp0;
|
||||
(arg0 + (D_802BA270 * 8))->unk4 = sp4;
|
||||
D_802BA270 = D_802BA270 + 1;
|
||||
void func_802A94D8(Gfx *arg0, u8 arg1, u8 arg2) {
|
||||
Gfx macro[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON) };
|
||||
arg0[D_802BA270].words.w0 = macro->words.w0;
|
||||
arg0[D_802BA270].words.w1 = macro->words.w1;
|
||||
D_802BA270++;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/memory/func_802A94D8.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
extern ? D_802B8D78;
|
||||
extern s32 D_802BA270;
|
||||
void func_802A9544(Gfx *arg0, u8 arg1, u8 arg2) {
|
||||
Gfx macro[] = { gsSPTexture(0x1, 0x1, 0, G_TX_RENDERTILE, G_OFF) };
|
||||
|
||||
void func_802A9544(s32 arg0, ? arg1, ? arg2) {
|
||||
sp->unk0 = D_802B8D78.unk0;
|
||||
sp->unk4 = D_802B8D78.unk4;
|
||||
*(arg0 + (D_802BA270 * 8)) = sp0;
|
||||
(arg0 + (D_802BA270 * 8))->unk4 = sp4;
|
||||
D_802BA270 = D_802BA270 + 1;
|
||||
arg0[D_802BA270].words.w0 = macro->words.w0;
|
||||
arg0[D_802BA270].words.w1 = macro->words.w1;
|
||||
D_802BA270++;
|
||||
}
|
||||
#else
|
||||
GLOBAL_ASM("asm/non_matchings/memory/func_802A9544.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
|
||||
@@ -1110,7 +1099,7 @@ void display_list_unpack(u32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 temp_a0;
|
||||
s32 *phi_a3;
|
||||
|
||||
temp_s0 = gSegmentTable[arg0 >> 0x18] + (arg0 & 0xFFFFFF) + 0x80000000;
|
||||
temp_s0 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(arg0)] + SEGMENT_OFFSET(arg0));
|
||||
temp_s1 = gHeapEndPtr - (((arg1 + 0xF) & ~0xF) + 8);
|
||||
gHeapEndPtr = temp_s1;
|
||||
D_802BA270 = 0;
|
||||
|
||||
Reference in New Issue
Block a user