rename files

include/main.h

@@ -8,20 +8,6 @@
 #define NUM_SAVE_SLOTS 3
 #define MAX_BRIGHTNESS 3
 
-typedef struct { // 0x03001000
-    u8 field_0x0;
-    u8 field_0x1;
-    u8 field_0x2;
-    u8 field_0x3;
-    u8 field_0x4;
-    u16 field_0x6;
-    u8 field_0x8;
-    u8 field_0x9;
-    u8 field_0xa;
-    u8 field_0xb;
-    u32 spritePriority;
-} MainStruct;
-
 typedef enum {
     LANGUAGE_JP,
     LANGUAGE_EN,
@@ -64,7 +50,8 @@ typedef struct {
     u8 pauseFrames;
     u8 pauseCount;
     u8 pauseInterval;
-    u16 ticks;
+    u8 pad;
+    union SplitHWord ticks;
 } Main;
 
 typedef struct {

include/room.h

@@ -46,7 +46,10 @@ typedef struct {
     /*0x18*/ u16 filler2[3];
     /*0x1E*/ u16 width;
     /*0x20*/ u16 height;
-    /*0x22*/ u8 filler3[6];
+    /*0x22*/ u8 filler3[2];
+    /*0x24*/ s8 aff_x;
+    /*0x25*/ s8 aff_y;
+    /*0x26*/ u8 filler26[2];
     /*0x28*/ union SplitWord bg3OffsetX;
     /*0x2C*/ union SplitWord bg3OffsetY;
     /*0x30*/ Entity* cameraTarget;

include/save.h

@@ -42,8 +42,8 @@ typedef struct {
     /*0x088*/ PlayerWorldStatus saved_status;
     /*0x0A8*/ Stats stats;
     /*0x0D0*/ u8 fillerD0[0x71];
-    /*0x141*/ u8 unk141[0x1c1 - 0x141];
-    /*0x1C1*/ u8 unk1C1[0x45c - 0x1c1];
+    /*0x141*/ u8 unk141[128];
+    /*0x1C1*/ u8 unk1C1[667];
     /*0x45C*/ u8 unk45C[0x10];
     /*0x46C*/ u8 unk46C[0x20];
     /*0x48C*/ u32 unk48C[8];

include/structures.h

@@ -110,7 +110,7 @@ typedef struct {
             u16 a;
             u16 b;
         } indices;
-        void (*func)(Entity*);
+        void (*func)(Entity* e);
     } data;
 } Dialog;
 
@@ -148,4 +148,30 @@ typedef struct {
     void* unk8;
 } WStruct;
 
+typedef struct {
+    u16 unk0;
+    u16 unk2;
+    u16 unk4;
+    u8 unk6;
+    u8 unk7;
+} OAMObj;
+
+typedef struct {
+    u8 field_0x0;
+    u8 field_0x1;
+    u8 spritesOffset;
+    u8 updated;
+    u16 _4;
+    u16 _6;
+    u8 _0[0x18];
+    struct OamData oam[0x80];
+    OAMObj unk[0x100];
+    u8 fill[10];
+    u8 _426;
+    u8 _427;
+    u8 _428[6];
+    u8 _42e;
+} OAMSettings;
+extern OAMSettings gUnk_03000000;
+
 #endif