mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-18 15:55:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match func_800215DC and func_80021DA8 (#139)

Browse Source 
* Match func_800215DC and func_80021DA8

* Remove repeated extern
This commit is contained in:
Maciek Baron
2022-01-16 04:11:30 +00:00
committed by GitHub
parent 04097806a5
commit dc805bf64c
3 changed files with 9 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_8001F980.c
+9 -22
View File
@@ -20,9 +20,12 @@ extern Player *gPlayerSix;
extern Player *gPlayerSeven;
extern Player *gPlayerEight;
extern Player *gPlayerOneCopy;
extern Camera *camera2;
extern Camera *camera4;
extern void func_80020000(Player *, Camera *, u8, u8);
extern void func_8002088C();
extern void func_80020F1C();
extern void func_80021244(Player *, u8, u8);
extern void func_80022BC4(Player*, s8, s32);
@@ -30,9 +33,11 @@ extern void func_80022DB4(Player*, s8, s32);
extern void func_800235AC(Player*, s8);
extern void func_80026A48(Player*, s8);
extern void func_80030A34(Player*);
extern void func_8006E634(Player*, u8, u8);
extern void func_8006E744(Player *, u8, u8);
extern void func_8006E848(Player *, u8, u8);
extern void func_8006E8C4(Player *, u8, u8);
extern void func_8006E940(s32, u8, u8);
// Not yet implemented. Needs more work to match.
@@ -742,16 +747,8 @@ void func_800212B4(void) {
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800212B4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80020000(Player *, s32, ?, ?); // extern
? func_8002088C(Player **, ?, ?); // extern
? func_80021244(Player *, ?, ?); // extern
? func_8006E634(Player *, ?, ?); // extern
extern s32 D_800DDB58;
void func_800215DC(void) {
D_800DDB58 = 0;
D_800DDB58[0] = 0;
func_80020000(gPlayerOneCopy, camera2, 0, 1);
func_80020000(gPlayerTwo, camera2, 1, 1);
func_80020000(gPlayerThree, camera2, 2, 1);
@@ -772,8 +769,8 @@ void func_800215DC(void) {
func_80021244(gPlayerSeven, 6, 1);
func_80021244(gPlayerEight, 7, 1);
}
if (D_800DDB58 != 0) {
func_8002088C(&gPlayerOneCopy, 0, 1);
if (D_800DDB58[0] != 0) {
func_8002088C();
} else {
func_8006E634(gPlayerOneCopy, 0, 1);
func_8006E634(gPlayerTwo, 1, 1);
@@ -786,11 +783,8 @@ void func_800215DC(void) {
func_8006E634(gPlayerEight, 7, 1);
}
}
D_800DDB58 = 0;
D_800DDB58[0] = 0;
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800215DC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -909,19 +903,12 @@ void func_80021D40(void) {
func_8006E8C4(gPlayerFour, 3, 2);
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006E940(Player *, ?, ?); // extern
void func_80021DA8(void) {
func_8006E940(gPlayerOneCopy, 0, 3);
func_8006E940(gPlayerTwo, 1, 3);
func_8006E940(gPlayerThree, 2, 3);
func_8006E940(gPlayerFour, 3, 3);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021DA8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307