Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-09-28 12:57:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Decompile 5 functions to C behind NON_MATCHING

Browse Source 
C-first: wrap func_80033D1C, func_800414B8, func_8003F4C0 (3D140/33FE0) and
func_812075C0, func_81209690 (fragment1_86CB0) in #ifdef NON_MATCHING. The
matching build still uses GLOBAL_ASM and stays byte-exact; NON_MATCHING now
compiles these from C. Bare GLOBAL_ASM: 61 -> 56.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
cristian
2026-07-05 09:33:07 -04:00
parent fab939a784
commit 541dfa4c1b
3 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/33FE0.c
View File

@@ -310,7 +310,15 @@ void func_800338D8(StadiumModel*, MtxF* mtx);
#pragma GLOBAL_ASM("asm/us/nonmatchings/33FE0/func_80033B2C.s")
#ifdef NON_MATCHING
void func_800357F4(StadiumModel*);
void func_80033D1C(StadiumModel* model, MtxF* mtx) {
func_800338D8(model, mtx);
func_800357F4(model);
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/33FE0/func_80033D1C.s")
#endif
#pragma GLOBAL_ASM("asm/us/nonmatchings/33FE0/func_80033D44.s")

64
src/3D140.c
View File

@@ -1239,7 +1239,49 @@ void func_8003DB84(s32 arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/3D140/func_8003F1AC.s")
#ifdef NON_MATCHING
extern u8 D_800FCB30[];
extern u32 D_800FCBC0;
extern u16 D_80077FD8;
extern u16 D_80077FE4;
void func_8003F4C0(s32 arg0) {
u8 temp_v0;
s32 idx;
if ((arg0 != 0) && ((u32) arg0 < 5)) {
arg0 -= 1;
temp_v0 = D_80078398[arg0];
if (((s32) temp_v0 > 0) && ((s32) temp_v0 < 3)) {
idx = (temp_v0 - 1) & 0xFF;
if ((D_800FCB18[0] != NULL) && (D_800FCB18[1] != NULL) && ((s32) D_800FCB18[idx]->unk_0C > 0)) {
D_800FCB30[idx] = 1;
D_800FCCB5 = 1;
if (D_800783DC != 0) {
func_80041C70(0x58);
D_800783DC = 0;
return;
}
D_800783DC = 1;
if ((u32) D_800783CC < 2) {
if ((osGetTime() % 2) == 0) {
func_80041C70(0x54);
return;
}
func_80041C70(0x55);
return;
}
if ((&D_800FCBC0)[idx * 0x21] < 2) {
func_800420C0(&D_80077FE4);
return;
}
func_800420C0(&D_80077FD8);
}
}
}
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/3D140/func_8003F4C0.s")
#endif
void func_8003F624(u32 arg0) {
D_800FCCF0[D_80078544] = arg0;
@@ -1516,7 +1558,29 @@ void func_80040A70(unk_D_800FCB18* arg0, s32 arg1, s32 arg2, s32 arg3) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/3D140/func_80040A70.s")
#endif
#ifdef NON_MATCHING
void func_800414B8(s32 arg0) {
s8* temp_v1;
u8 temp_v0;
if ((arg0 != 0) && ((u32) arg0 < 5)) {
arg0 -= 1;
temp_v0 = D_80078398[arg0];
if (((s32) temp_v0 > 0) && ((s32) temp_v0 < 3)) {
temp_v0 = (temp_v0 - 1) & 0xFF;
temp_v1 = &D_800FCCD4[temp_v0];
if (*temp_v1 != 0) {
func_80041C70(0x191);
} else {
func_80041C70(0x190);
*temp_v1 = 1;
}
}
}
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/3D140/func_800414B8.s")
#endif
void func_8004153C(void) {
if (D_80078E80 == 0) {

13
src/fragments/1/fragment1_86CB0.c
View File

@@ -107,7 +107,15 @@ u32 func_812073B8(u16 arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/1/fragment1_86CB0/func_81207494.s")
s32 func_812075C0(s32);
#ifdef NON_MATCHING
s32 func_812075C0(s32 arg0) {
s32 temp;
temp = ((131072.0f / (0x800 - (arg0 & 0xFFFF))) / D_8120EAC0) * 65536;
return temp;
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/1/fragment1_86CB0/func_812075C0.s")
#endif
void func_81207690(void) {
}
@@ -354,4 +362,9 @@ void func_81209688(UNUSED s32 arg0) {
}
// Decrypting this function causes issues
#ifdef NON_MATCHING
void func_81209690(s32 arg0) {
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/1/fragment1_86CB0/func_81209690.s")
#endif