match some of db_2253

BR- · May 24, 2024 · 37a6d77 · 37a6d77
1 parent 17e5ccb
commit 37a6d77
Show file tree

Hide file tree

Showing 17 changed files with 1,816 additions and 314 deletions.
diff --git a/config/GALE01/splits.txt b/config/GALE01/splits.txt
@@ -2133,11 +2133,11 @@ melee/gr/stage.c:
 
 melee/db/db_2253.c:
 	.text       start:0x80225374 end:0x802295AC
-	.rodata     start:0x803B84D8 end:0x803B84E8
+	.rodata     start:0x803B84D8 end:0x803B84E4
 	.data       start:0x803EA6C8 end:0x803EAE68
 	.bss        start:0x8049FA00 end:0x804A04F0
 	.sdata      start:0x804D4A08 end:0x804D4B30
-	.sbss       start:0x804D6B20 end:0x804D6BA8
+	.sbss       start:0x804D6B20 end:0x804D6BA1
 	.sdata2     start:0x804DBCF0 end:0x804DBD88
 
 melee/mn/mn_2295.c:

diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
diff --git a/src/dolphin/os/OSContext.h b/src/dolphin/os/OSContext.h
@@ -137,7 +137,13 @@ typedef struct OSContext {
     u32 ctr;      // at 0x88
     u32 xer;      // at 0x8C
     f64 fprs[32]; // at 0x90
-    f64 fpscr;    // at 0x190
+    union {
+        f64 fpscr; // at 0x190
+        struct {
+            u32 fpscr_padding;
+            u32 fpscr_u32;
+        };
+    };
     u32 srr0;     // at 0x198
     u32 srr1;     // at 0x19C
     u16 mode;     // at 0x1A0

diff --git a/src/dolphin/pad/pad.h b/src/dolphin/pad/pad.h
@@ -42,7 +42,7 @@ void PADControlMotor(int chan, u32 command);
 void VISetBlack(bool);
 u32 VIGetRetraceCount(void);
 void PADClamp(PADStatus*);
-void PADRead(u8*);
+void PADRead(PADStatus*);
 void PADReset(u32);
 void PADTypeAndStatusCallback(s32 chan, u32 type);
 void PADSetSpec(s32);