48C60/485C0

Author: dplewis

.gitignore

@@ -27,3 +27,4 @@ ctx.c.m2c
 .vscode/*
 !.vscode/c_cpp_properties.json
 tools/vtxdis
+.DS_Store

src/3D140.h

@@ -112,6 +112,5 @@ void func_80041DF4(u16 arg0);
 void func_80041E40(u16 arg0);
 u32 func_80041EF4(u16* arg0);
 void func_800420C0(u16* arg0);
-void func_80048014(void);
 
 #endif // _3D140_H_

src/485C0.c

@@ -1,5 +1,13 @@
 #include "global.h"
 
+extern s32 D_800789F4;
+extern s32 D_800789F8;
+
 #pragma GLOBAL_ASM("asm/us/nonmatchings/485C0/func_800479C0.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/485C0/func_80048014.s")
+void func_80048014(void) {
+  func_800392A8(D_800789F8, 0x5A);
+  func_800392A8(D_800789F4, 0x5A);
+  D_800789F8 = 0;
+  D_800789F4 = 0;
+}

src/485C0.h

@@ -4,5 +4,6 @@
 #include "global.h"
 
 s32 func_800479C0(s32, s32, s32);
+void func_80048014(void);
 
 #endif // _485C0_H_

src/48C60.c

@@ -1,5 +1,13 @@
 #include "48C60.h"
+#include "38BB0.h"
+
+extern s32 D_80078A18;
+extern u8 D_80078A1C;
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/48C60/func_80048060.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/48C60/func_80048464.s")
+void func_80048464(void) {
+  if (D_80078A1C != 0) {
+      func_800392A8(D_80078A18, (s32)D_80078A1C);
+  }
+}

src/48C60.h

@@ -4,5 +4,6 @@
 #include "global.h"
 
 void func_80048060(s32, s32, s32, s32);
+void func_80048464(void);
 
 #endif // _48C60_H_

src/fragments/62/fragment62_309ED0.c

@@ -3,6 +3,7 @@
 #include "src/1C720.h"
 #include "src/373A0.h"
 #include "src/3D140.h"
+#include "src/485C0.h"
 #include "src/4BDC0.h"
 #include "src/4F410.h"
 #include "src/F420.h"