update at 06.20

MokhaLeee · Jun 19, 2024 · 29f34a5 · 29f34a5
1 parent 45dee0d
commit 29f34a5
Show file tree

Hide file tree

Showing 22 changed files with 480 additions and 510 deletions.
diff --git a/include/bmsave.h b/include/bmsave.h
@@ -133,9 +133,9 @@ struct bmsave_unkstruct2 {
     u16 magic2;
 };
 
-struct bmsave_unkstruct3 {
-    struct BonusClaimEnt unk0[0x10];
-    u32 unk140;
+struct BonusClaimSaveData {
+    struct BonusClaimEnt bonus[0x10];
+    u16 cksum16;
 };
 
 enum
@@ -388,7 +388,7 @@ struct SaveBlocks {
     /* 0x7190 */ struct GameRankSaveDataPacks gameRankSave;
     /* 0x7224 */ struct SoundRoomSaveData soundRoomSave;
     /* 0x7248 */ struct bmsave_unkstruct2 unkstruct2;
-    /* 0x725C */ struct bmsave_unkstruct3 unkstruct3;
+    /* 0x725C */ struct BonusClaimSaveData bonusClaim;
     /* 0x73A0 */ u8 reserved[4];
     /* 0x73A4 */ u8 _pad_[0x7400 - 0x73A4];
     /* 0x7400 */ struct ExtraMapSaveHead xmap; // see bmsave-xmap.c
@@ -418,7 +418,7 @@ struct SaveBlocksEwram {
     /* 0x70E4 */ struct GameRankSaveDataPacks gameRankSave;
     /* 0x7178 */ struct SoundRoomSaveData soundRoomSave;
     /* 0x719C */ struct bmsave_unkstruct2 unkstruct2;
-    /* 0x71B0 */ struct bmsave_unkstruct3 unkstruct3;
+    /* 0x71B0 */ struct BonusClaimSaveData bonusClaim;
 };
 
 extern struct UnitUsageStats *gPidStatsSaveLoc;
@@ -516,7 +516,7 @@ int GetNextChapterStatsSlot(void);
 void UnlockSoundRoomSong(struct SoundRoomSaveData *buf, int val);
 int GetCurCompleteChapters(void);
 int GetNextChapterStatsEntry(void);
-void RegisterChapterTimeAndTurnCount(struct PlaySt* chData);
+void RegisterChapterTimeAndTurnCount(struct PlaySt * chData);
 int GetGameTotalTime_unused(void);
 int GetGameTotalTurnCount(void);
 bool IsChapterBelongCurGame(u32 ch_index);
@@ -564,7 +564,7 @@ void WriteNewGameSave(int index, int isDifficult, int mode, int isTutorial);
 void WriteGameSave(int slot);
 void ReadGameSave(int slot);
 bool IsSaveValid(int);
-void ReadGameSavePlaySt(int, struct PlaySt*);
+void ReadGameSavePlaySt(int, struct PlaySt *);
 u32 LoadSavedBonusClaimFlags(int slot);
 void LoadSavedWMStuff(int slot, struct GMapData *dest);
 s8 LoadSavedEid8A(int slot);

diff --git a/include/chap_title.h b/include/chap_title.h
@@ -12,8 +12,8 @@ typedef struct {
 } ChapTitle, * pChapTitle;
 
 struct ChapterTitleFxSt {
-    u16 unk_00;
-    u16 unk_02;
+    u16 chr_bg;
+    u16 chr_str;
 };
 
 extern struct ChapterTitleFxSt gChapterTitleFxSt;

diff --git a/include/chapterdata.h b/include/chapterdata.h
@@ -181,7 +181,7 @@ const struct ROMChapterData* GetROMChapterStruct(unsigned chIndex);
 const void* GetChapterMapPointer(unsigned chIndex);
 const void* GetChapterMapChangesPointer(unsigned chIndex);
 const struct ChapterEventGroup* GetChapterEventDataPointer(unsigned chIndex);
-const char* GetChapterTitle(unsigned chIndex);
+const char * GetChapterTitleName(unsigned chIndex);
 u8 IsDifficultMode(void);
 
 #endif // GUARD_CHAPTERDATA_H
diff --git a/include/classchg.h b/include/classchg.h
@@ -89,7 +89,7 @@ struct ProcPromoSel {
     s16 msg_desc[3];
     u16 _u3e;
     u8 stat;
-    u8 menu_index;
+    u8 main_select;
     u16 pid;
     u16 u44;
     u8 u46;

diff --git a/include/constants/event-flags.h b/include/constants/event-flags.h
@@ -19,4 +19,5 @@ enum event_flag_idx {
     #define EVFLAG_EXTRA_UNIT(i) (EVFLAG_EXTRA_UNIT_BASE + (i))
 
     EVFLAG_HIDE_BLINKING_ICON = 132,
+    EVFLAG_136 = 136,
 };
diff --git a/include/face.h b/include/face.h
@@ -107,15 +107,15 @@ int SetFaceDisplayBitsById(int slot, int disp);
 int GetFaceDisplayBits(struct FaceProc*);
 int GetFaceDisplayBitsById(int slot);
 void FaceRefreshSprite(struct FaceProc* proc);
-void PutFaceTm(u16* tm, u8* data, int tileref, s8 isFlipped);
+void PutFaceTm(u16 * tm, u8* data, int tileref, s8 isFlipped);
 void UnpackFaceChibiGraphics(int fid, int chr, int pal);
 void PutFaceChibi(int, u16*, int, int, s8);
 void UnpackFaceChibiSprGraphics(int fid, int chr, int pal);
 void FaceChibiSpr_OnIdle(struct FaceProc* proc);
 void StartFaceChibiSpr(int x, int y, int fid, int chr, int pal, s8 isFlipped, ProcPtr parent);
 void EndFaceChibiSpr(void);
-void PutFace80x72_Standard(u16* tm, int tileref, const struct FaceData* info);
-void PutFace80x72_Raised(u16* tm, int tileref, const struct FaceData* info);
+void PutFace80x72_Standard(u16 * tm, int tileref, const struct FaceData* info);
+void PutFace80x72_Raised(u16 * tm, int tileref, const struct FaceData* info);
 s8 ShouldFaceBeRaised(int fid);
 void PutFace80x72_Core(u16*, int, int, int);
 void sub_8005D64(struct FaceBlinkProc*);

diff --git a/include/functions.h b/include/functions.h
@@ -395,16 +395,16 @@ ProcPtr StartMuralBackgroundExt(ProcPtr, void*, int, int, int);
 void EndMuralBackground(void);
 
 void sub_80895B4(int, int);
-void sub_8089624(int, u32);
-void sub_808966C(int, int);
-void sub_8089678(int);
+void PutChapterTitleGfx(int, u32);
+void _PutChapterTitleGfx(int, int);
+void PutChapterTitleBG(int);
 void sub_80896A8(int chr);
 void sub_80896D8(u16 bg[], int);
 void sub_80896FC(u16 *, int, int);
 void sub_8089720(u16 * tm, int pal);
 void sub_8089744(u16 * tm, int pal);
-int sub_8089768(struct PlaySt *);
-int sub_808979C(struct PlaySt *);
+int GetChapterTitleExtra(struct PlaySt *);
+int GetChapterTitleWM(struct PlaySt *);
 
 u8 CanPrepScreenSave();
 int sub_8095024();

diff --git a/include/global.h b/include/global.h
@@ -2,6 +2,8 @@
 #define GUARD_GLOBAL_H
 
 #include <stdlib.h>
+#include <stdint.h>
+#include <limits.h>
 
 #include "gba/gba.h"
 

diff --git a/include/hardware.h b/include/hardware.h
@@ -122,18 +122,8 @@ struct LCDControlBuffer {
     /* 44 */ u8 blendCoeffA;
     /* 45 */ u8 blendCoeffB;
     /* 46 */ u8 blendY;
-    /* 48 */ u16 bg2pa;
-    /* 4A */ u16 bg2pb;
-    /* 4C */ u16 bg2pc;
-    /* 4E */ u16 bg2pd;
-    /* 50 */ u32 bg2x;
-    /* 54 */ u32 bg2y;
-    /* 58 */ u16 bg3pa;
-    /* 5A */ u16 bg3pb;
-    /* 5C */ u16 bg3pc;
-    /* 5E */ u16 bg3pd;
-    /* 60 */ u32 bg3x;
-    /* 64 */ u32 bg3y;
+    /* 48 */ struct BgAffineDstData bg2affin;
+    /* 58 */ struct BgAffineDstData bg3affin;
     /* 68 */ s8 colorAddition;
 };
 
@@ -202,7 +192,6 @@ extern void (*gMainCallback)(void);
 extern struct KeyStatusBuffer * CONST_DATA gKeyStatusPtr;
 
 extern struct LCDControlBuffer gLCDControlBuffer;
-extern struct BgAffineDstData gOpAnimBgAffineDstData[2];
 
 extern struct Struct02024CD4 gFrameTmRegisterConfig;
 extern struct TileDataTransfer gFrameTmRegister[32];

diff --git a/include/mapanim.h b/include/mapanim.h
@@ -423,8 +423,8 @@ extern u16 CONST_DATA Pal_WallBreakAnim[];
 extern const u8 Img_GmapSoguSprites[];
 extern u16 CONST_DATA Img_PoisonAnim[];
 extern u16 CONST_DATA Pal_PoisonAnim[];
-extern u16 CONST_DATA gUnknown_089AE224[];
-extern u16 CONST_DATA gUnknown_089AE484[];
+extern u16 CONST_DATA Img_LinkArenaWarpFx[];
+extern u16 CONST_DATA Pal_LinkArenaWarpFx[];
 extern u16 CONST_DATA gUnknown_089AE4A4[];
 extern u8 Img_089AE7A4[];
 extern u16 Pal_089AE7C4[];

diff --git a/include/mu.h b/include/mu.h
@@ -141,6 +141,55 @@ struct MUConfig {
     /* 48 */ struct MUProc* pMUProc;
 };
 
+struct MUStepSoundProc
+{
+    PROC_HEADER;
+
+    /* 29 */ STRUCT_PAD(0x29, 0x58);
+
+    /* 58 */ u32 idSound1;
+    /* 5C */ u32 idSound2;
+    /* 60 */ u32 u60_buggedmaybe; // Checked for in MU_StartStepSfx but never initialized
+    /* 64 */ s16 xSound1;
+    /* 66 */ s16 xSound2;
+};
+
+struct MUFogBumpFxProc
+{
+    PROC_HEADER;
+
+    /* 2C */ int xDisplay;
+    /* 30 */ int yDisplay;
+
+    /* 34 */ STRUCT_PAD(0x34, 0x50);
+    /* 50 */ struct APHandle * pAPHandle;
+
+    /* 54 */ STRUCT_PAD(0x54, 0x64);
+    /* 64 */ s16 timer;
+};
+
+struct MUEffectProc
+{
+    PROC_HEADER;
+
+    /* 29 */ STRUCT_PAD(0x29, 0x54);
+    /* 54 */ struct MUProc * pMUProc;
+
+    /* 58 */ STRUCT_PAD(0x58, 0x64);
+    /* 64 */ s16 timeLeft;
+    /* 66 */ s16 frameIndex;
+};
+
+struct MUFlashEffectProc
+{
+    PROC_HEADER;
+
+    /* 2C */ struct MUProc * pMUProc;
+    /* 30 */ u8 timer;
+};
+
+typedef void(*MUStateHandlerFunc)(struct MUProc*);
+
 extern struct ProcCmd CONST_DATA gProcScr_MoveUnit[];
 extern struct ProcCmd CONST_DATA gProcScr_MUDeathFade[];
 extern struct ProcCmd CONST_DATA gProcScr_MUBlinkEffect[];

diff --git a/include/prepscreen.h b/include/prepscreen.h
@@ -701,7 +701,7 @@ struct PrepMenuTradeProc {
 void PrepItemTrade_ApplyItemSwap(struct Unit * unitA, int itemSlotA, struct Unit * unitB, int itemSlotB);
 s8 PrepItemTrade_DpadKeyHandler(struct PrepMenuTradeProc * proc);
 void DrawPrepScreenItems(u16*, struct Text*, struct Unit*, u8);
-void DrawPrepScreenItemIcons(u16* tm, struct Unit* unit);
+void DrawPrepScreenItemIcons(u16 * tm, struct Unit* unit);
 void PrepItemTrade_Init(struct PrepMenuTradeProc * proc);
 void PrepItemTrade_Loop_MainKeyHandler(struct PrepMenuTradeProc * proc);
 void PrepItemTrade_OnEnd(void);