update C-LIB at 20240123

MokhaLeee · Jan 23, 2024 · ca46331 · ca46331
1 parent 022f748
commit ca46331
Show file tree

Hide file tree

Showing 10 changed files with 272 additions and 581 deletions.
diff --git a/include/anime.h b/include/anime.h
@@ -194,9 +194,9 @@ void AnimDelete(struct Anim * anim);
 void AnimDisplay(struct Anim * anim);
 
 bool PrepareBattleGraphicsMaybe(void);
-u16 sub_8057CAC(struct Unit * unit, const struct BattleAnimDef * pBattleAnimDef, u16, int * out);
+u16 GetBattleAnimationId_WithUnique(struct Unit * unit, const struct BattleAnimDef * pBattleAnimDef, u16, int * out);
 int GetBanimTerrainGround(u16 terrain, u16 tileset);
-s8 GetBanimBackgroundIndex(u16 terrain, u16 tileset);
+int GetBanimBackgroundIndex(u16 terrain, u16 tileset);
 s16 GetSpellAnimId(u16 jid, u16 weapon);
 void UnsetMapStaffAnim(s16 * out, u16 pos, u16 weapon);
 void ParseBattleHitToBanimCmd(void);

diff --git a/include/bmunit.h b/include/bmunit.h
@@ -47,8 +47,7 @@ struct CharacterData
 
     /* 23 */ u8 _u23;
     /* 24 */ u8 _u24;
-    /* 25 */ u8 _u25;
-    /* 26 */ u8 _u26;
+    /* 25 */ u8 _u25[2]; // Unique animation IDs in FE7
     /* 27 */ u8 _u27;
 
     /* 28 */ u32 attributes;

diff --git a/include/ekrbattle.h b/include/ekrbattle.h
@@ -740,6 +740,8 @@ extern CONST_DATA struct BattleAnimDef AnimConf_088AF6BC[];
 extern CONST_DATA struct BattleAnimDef AnimConf_088AF6C8[];
 extern CONST_DATA struct BattleAnimDef AnimConf_088AF6E0[];
 
+extern struct BattleAnimDef * gUnitSpecificBanimConfigs[];
+
 void SetBanimLinkArenaFlag(int unk);
 int GetBanimLinkArenaFlag(void);
 void NewEkrBattleDeamon(void);

diff --git a/include/event.h b/include/event.h
@@ -185,8 +185,8 @@ extern u32 gEventSlotCounter;
 extern struct ProcCmd gGenericProc[4];
 extern struct UnitDefinition gLoadUnitBuffer[];
 
-extern struct ProcCmd gProc_StdEventEngine[]; // map event engine proc
-extern struct ProcCmd gProc_BattleEventEngine[]; // battle (?) event engine proc
+extern struct ProcCmd ProcScr_StdEventEngine[]; // map event engine proc
+extern struct ProcCmd ProcScr_BattleEventEngine[]; // battle (?) event engine proc
 extern EventFuncType gEventLoCmdTable[]; // regular event functions
 extern EventFuncType gEventHiCmdTable[]; // gmap event functions
 extern struct ProcCmd ProcScr_EventEngineDeamon[]; // map event engine "witness lock" (alive while map event engine is)
@@ -216,7 +216,7 @@ extern EventScr EventScr_08592140[];
 extern EventScr EventScr_08592170[];
 extern u16 CONST_DATA Obj_EventShinningCursor[];
 
-void _MarkSomethingInMenu(void);
+void _FreezeMenu(void);
 void EventEngine_OnUpdate(struct EventEngineProc* proc);
 void EventEngine_OnEnd(struct EventEngineProc* proc);
 void EnqueueEventCall(const u16* events, u8 execType);
@@ -253,23 +253,23 @@ unsigned SlotQueuePop(void);
 void SetEventSlotCounter(unsigned value);
 unsigned GetEventSlotCounter(void);
 
-// void sub_800B910(u8 bg1, u8 bg2, u8 c);
-// void sub_800B954(u8 a, u8 bg, u8 c);
-// void sub_800B994(u8 a, u8 b, u8 c);
-// void sub_800B9B8(u8 bg, u8 b);
-// void sub_800BA04(u8 a, u8 b);
+// void CopyBgImage(u8 bg1, u8 bg2, u8 c);
+// void CopyBgTiles(u8 a, u8 bg, u8 c);
+// void CopyBgPalette(u8 a, u8 b, u8 c);
+// void BgChangeChr(u8 bg, u8 b);
+void sub_800BA04(u8, u8);
 void sub_800BA34(void);
 void SetSomeRealCamPos(int x, int y, s8 unk);
 void EventSetFogVisionExt(s16, s8, ProcPtr);
 void TriggerMapChanges(u16 mapChangeId, s8 displayFlag, ProcPtr parent);
 void UntriggerMapChange(u16 mapChangeId, s8 displayFlag, ProcPtr parent);
-void sub_800BB98(void);
-void sub_800BB98(void);
-s8 sub_800BBB4(u16 pid);
-u16 sub_800BBE4(void);
+void ResetBkselPalette(void);
+void ResetBkselPalette(void);
+s8 GetAllyUnitCount(u16 pid);
+u16 GetNpcUnitCount(void);
 void HideAllUnits(void);
 struct Unit * GetUnitStructFromEventParameter(s16 pid);
-void sub_800BCDC(u16); // battle related
+void ChangeUnitSpritePalette(u16); // battle related
 u8 Event80_WmSkip_Unsure(struct EventEngineProc * proc);
 u8 Event81_WmFadeOut(struct EventEngineProc * proc);
 u8 Event82_WmEnd(struct EventEngineProc * proc);
@@ -346,7 +346,7 @@ void nullsub_32(void);
 u8 EventC5_WmClearPortrait(struct EventEngineProc * proc);
 void nop_800CD38(struct Proc8591C68 * proc);
 void nullsub_34(struct Proc8591C68 * proc);
-void sub_800CD40(struct Proc8591C68 * proc);
+void EventFaceDeamonDelete(struct Proc8591C68 * proc);
 u8 EventC6_WmDisplayText(struct EventEngineProc * proc);
 u8 EventC7_(struct EventEngineProc * proc);
 u8 EventC8_(struct EventEngineProc * proc);

diff --git a/include/eventcall.h b/include/eventcall.h
@@ -910,6 +910,7 @@ extern CONST_DATA EventListScr EventScr_08A005B4[];
 extern CONST_DATA EventListScr EventScr_08A0062C[];
 extern CONST_DATA EventListScr EventScr_08A00680[];
 
+extern struct UnitDefinition UnitDef_03001CE8[];
 extern CONST_DATA struct UnitDefinition UnitDef_Event_PrologueAlly[];
 extern CONST_DATA struct UnitDefinition UnitDef_Event_PrologueEnemy[];
 extern CONST_DATA struct UnitDefinition UnitDef_Event_PrologueThroneRoomUnits[];
@@ -3007,3 +3008,6 @@ extern CONST_DATA EventScr EventScrWM_Ch11a_Beginning[];
 extern CONST_DATA EventScr EventScrWM_08A3C904[];
 extern CONST_DATA EventScr EventScrWM_Ch11b_Beginning[];
 extern CONST_DATA EventScr EventScrWM_08A3CA2C[];
+
+extern struct MenuItemDef MenuItemDef_RouteSplit[];
+extern struct MenuDef MenuDef_RouteSplit;