Got a couple matches and a few non matchings (#397)

Also got rid of a couple asm files for functions that were matched
 a long, long time ago (thank you ItzSwirlz for finding them)

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
2023-09-04 21:19:24 -04:00
committed by GitHub
parent 23cfd1ca02
commit 8a2fdc21f5
14 changed files with 454 additions and 1352 deletions
+432 -808
View File
File diff suppressed because it is too large Load Diff
+13 -4
View File
@@ -204,6 +204,8 @@ void func_800A1500(struct_8018D9E0_entry*);
void func_800A15EC(struct_8018D9E0_entry*);
void func_800A1924(struct_8018D9E0_entry*);
void func_800A1A20(struct_8018D9E0_entry*);
void func_800A1BE0(struct_8018D9E0_entry*);
void func_800A1DE0(struct_8018D9E0_entry*);
void func_800A1F30(struct_8018D9E0_entry*);
void func_800A2D1C(struct_8018D9E0_entry*);
void func_800A2EB8(struct_8018D9E0_entry*);
@@ -212,6 +214,7 @@ void func_800A34A8(struct_8018D9E0_entry*);
void func_800A3A10(s8*);
void func_800A3ADC(struct_8018D9E0_entry*, s32, s32, s32, s32, s8*);
void func_800A3C84(struct_8018D9E0_entry*);
void func_800A3E60(struct_8018D9E0_entry*);
void func_800A4550(s32, s32, s32);
void func_800A474C(s32, s32, s32);
void func_800A4A24(struct_8018D9E0_entry*);
@@ -221,9 +224,15 @@ void func_800A4EF8(struct_8018D9E0_entry*);
void func_800A5084(struct_8018D9E0_entry*);
void func_800A5360(struct_8018D9E0_entry*);
void func_800A54EC(void);
void func_800A5738(struct_8018D9E0_entry*);
void func_800A6034(struct_8018D9E0_entry*);
void func_800A69C8(s32);
void func_800A6D94(u32, s32, u8*);
void func_800A6154(struct_8018D9E0_entry*);
void func_800A638C(struct_8018D9E0_entry*);
void func_800A66A8(struct_8018D9E0_entry*, Unk_D_800E70A0*);
void func_800A69C8(struct_8018D9E0_entry*);
void func_800A6BEC(struct_8018D9E0_entry*);
void func_800A6CC0(struct_8018D9E0_entry*);
void func_800A6D94(s32, s32, u8*);
void func_800A6E94(s32, s32, u8*);
void func_800A70E8(struct_8018D9E0_entry*);
void func_800A7258(struct_8018D9E0_entry*);
@@ -434,13 +443,13 @@ extern char D_800E77D8[];
extern char *D_800E77E4[];
extern char *D_800E7834[];
extern char *D_800E7840[];
extern char *D_800E7848[][3];
extern char *D_800E7848[];
extern char *D_800E7860[];
extern char *D_800E7868[];
extern char *D_800E7878[];
extern char *D_800E7884[];
extern char *D_800E7890[][4];
extern char *D_800E78D0[][4];
extern char *D_800E78D0[][3];
extern char *D_800E7900[][3];
extern char *D_800E7918[];
extern char *D_800E7920[];
+1 -1
View File
@@ -1010,7 +1010,7 @@ s32 func_800B64EC(s32 arg0) {
++phi_s1;
if ((++temp_s0) == 0x3C) {
func_8000522C();
D_80162DD4[0] = 0;
D_80162DD4 = 0;
D_80162DE0 = (s32) D_8018EE10[arg0].characterId;
D_80162DFC = D_8018EE10[arg0].unk_00;
break;
+1 -1
View File
@@ -1807,7 +1807,7 @@ void func_800B3F74(s32 menuSelection) {
gDebugGotoScene = DEBUG_GOTO_RACING;
D_8018EDFB = 0;
D_8016556E = 0;
*D_80162DD4 = 1;
D_80162DD4 = 1;
D_80162DD8 = 1;
D_80162E00 = 0;
D_80162DC8 = 1;
-1
View File
@@ -81,7 +81,6 @@ extern s32 gScreenModeSelection;
extern s32 D_8018D2AC;
extern s32 gActiveScreenMode;
extern s16 gCurrentCourseId;
extern u16 D_80162DD4[];
extern u16 D_8015F890;
extern u32 D_800DC5AC;
extern u16 gEnableDebugMode;
+4 -3
View File
@@ -12,6 +12,7 @@
#include "collision.h"
#include "render_courses.h"
#include "spawn_players.h"
#include "staff_ghosts.h"
#include "code_80005FD0.h"
// arg4 is height? Or something like that?
@@ -491,12 +492,12 @@ void func_8003A59C(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
} else if (D_8015F890 != 1) {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
if (D_80162DD4[0] == 0) {
if (D_80162DD4 == 0) {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
if (D_80162DD4[1] == 0) {
if (D_80162DD6 == 0) {
spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -508,7 +509,7 @@ void func_8003A59C(f32 *arg0, f32 *arg1, f32 arg2) {
} else {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
if (D_80162DD4[1] == 0) {
if (D_80162DD6 == 0) {
spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
+3
View File
@@ -29,6 +29,9 @@ extern s32 func_80040174(void *, s32, s32);
extern s32 D_80162DC8;
extern s32 D_80162DCC;
extern u16 D_80162DD4;
extern u16 D_80162DD6;
extern u16 D_80162DD8;
extern s32 D_80162E00;
extern s32 D_80162DF0;
extern s32 D_80162DF8;