Merge pull request #149 from Eebit/bmusemind

Decompile bmusemind
FireEmblemUniverse · Apr 30, 2022 · 9961841 · 9961841
2 parents 94d53ef + 30768ef
commit 9961841
Show file tree

Hide file tree

Showing 12 changed files with 1,162 additions and 2,517 deletions.
diff --git a/asm/bmusemind.s b/asm/bmusemind.s
diff --git a/asm/code.s b/asm/code.s
@@ -40127,7 +40127,7 @@ sub_809CDD4: @ 0x0809CDD4
 	adds r2, #0x1e
 	adds r2, r2, r3
 	ldrh r5, [r2]
-	bl sub_802F808
+	bl ApplyStatBoostItem
 	adds r6, r0, #0
 	ldr r0, [r4, #0x2c]
 	movs r1, #0

diff --git a/data/data_59BC64.s b/data/data_59BC64.s
@@ -20,15 +20,3 @@ gUnknown_0859BD40:  @ 0x0859BD40
 gUnknown_0859BDA0:  @ 0x0859BDA0
 	.incbin "baserom.gba", 0x59BDA0, 0x50
 
-	.global gUnknown_0859BDF0
-gUnknown_0859BDF0:  @ 0x0859BDF0
-	.incbin "baserom.gba", 0x59BDF0, 0x20
-
-	.global gUnknown_0859BE10
-gUnknown_0859BE10:  @ 0x0859BE10
-	.incbin "baserom.gba", 0x59BE10, 0x18
-
-	.global gUnknown_0859BE28
-gUnknown_0859BE28:  @ 0x0859BE28
-	.incbin "baserom.gba", 0x59BE28, 24
-
diff --git a/include/bmunit.h b/include/bmunit.h
@@ -193,12 +193,7 @@ struct UnitDefinition
 
     /* 0C */ u8 items[UNIT_DEFINITION_ITEM_COUNT];
 
-    struct {
-        /* 10 */ u8 ai1;
-        /* 11 */ u8 ai2;
-        /* 12 */ u8 ai3;
-        /* 13 */ u8 ai4;
-    } ai;
+    /* 10 */ u8 ai[4];
 };
 
 enum

diff --git a/include/bmusemind.h b/include/bmusemind.h
@@ -0,0 +1,44 @@
+#ifndef GUARD_BM_USE_MIND_H
+#define GUARD_BM_USE_MIND_H
+
+// ??? ExecStandardHeal(???);
+// ??? ExecRestore(???);
+// ??? ExecBarrierStaff(???);
+// ??? GetRescueStaffeePosition(???);
+// ??? ExecRescueStaff(???);
+// ??? sub_802EF70(???);
+// ??? sub_802EF80(???);
+// ??? ExecWarpStaff(???);
+// ??? ExecStatusStaff(???);
+// ??? ExecFortify(???);
+// ??? ExecNightmare(???);
+// ??? ApplyNightmareEffect(???);
+// ??? ExecUnlockStaff(???);
+// ??? ExecHammerne(???);
+// ??? ExecLatona(???);
+// ??? ExecVulneraryItem(???);
+// ??? ExecElixirItem(???);
+// ??? ExecPureWaterItem(???);
+// ??? ExecTorchItem(???);
+// ??? ExecAntitoxinItem(???);
+// ??? sub_802F510(???);
+void sub_802F598(struct Unit* unit, int itemIdx, s8 unk);
+void sub_802F664(struct Unit* unit, u8 classId, int itemIdx, s8 unk);
+// ??? sub_802F73C(???);
+void sub_802F760(struct Unit* unit, int item);
+int ApplyStatBoostItem(struct Unit* unit, int itemIdx);
+// ??? ExecStatBoostItem(???);
+int sub_802F978(struct Unit* unit, int itemIdx);
+// ??? ExecJunaFruitItem(???);
+// ??? ExecMine(???);
+// ??? ExecLightRune(???);
+// ??? sub_802FAD0(???);
+// ??? ExecTorchStaff(???);
+// ??? ExecDanceRing(???);
+void ActionStaffDoorChestUseItem(ProcPtr proc);
+void ActionPick(ProcPtr proc);
+// ??? AfterItemUse_SetTargetStatus(???);
+// ??? sub_8030050(???);
+
+
+#endif // GUARD_BM_USE_MIND_H
diff --git a/include/functions.h b/include/functions.h
@@ -1299,9 +1299,9 @@ void SetPartyGoldAmount(s32);
 // ??? sub_8025DF0(???);
 // ??? TryAddUnitToHealTargetList(???);
 // ??? MakeTargetListForAdjacentHeal(???);
-// ??? MakeTargetListForRangedHeal(???);
+void MakeTargetListForRangedHeal(struct Unit* unit);
 // ??? AddToTargetListIfNotAllied(???);
-// ??? MakeTargetListForFuckingNightmare(???);
+void MakeTargetListForFuckingNightmare(struct Unit* unit);
 // ??? TryAddUnitToRestoreTargetList(???);
 // ??? MakeTargetListForRestore(???);
 // ??? TryAddUnitToBarrierTargetList(???);
@@ -1319,7 +1319,7 @@ void SetPartyGoldAmount(s32);
 // ??? MakeTargetListForUnlock(???);
 // ??? TryAddUnitToHammerneTargetList(???);
 // ??? MakeTargetListForHammerne(???);
-// ??? MakeTargetListForLatona(???);
+void MakeTargetListForLatona(struct Unit* unit);
 void sub_8026414(int unk);
 // ??? sub_802646C(???);
 // ??? MakeTargetListForMine(???);
@@ -1369,44 +1369,6 @@ void HideUnitSMS(struct Unit* unit);
 // ??? GetUnitStandingSpriteDataFlagThing(???);
 // ??? sub_8028160(???);
 struct Proc* StartTradeMenu(struct Unit* lUnit, struct Unit* rUnit, int unused);
-// ??? ExecStandardHeal(???);
-// ??? ExecRestore(???);
-// ??? sub_802EC8C(???);
-// ??? GetRescueStaffeePosition(???);
-// ??? ExecRescueStaff(???);
-// ??? sub_802EF70(???);
-// ??? sub_802EF80(???);
-// ??? ExecWarpStaff(???);
-// ??? ExecStatusStaff(???);
-// ??? ExecFortify(???);
-// ??? sub_802F1D8(???);
-// ??? sub_802F208(???);
-// ??? sub_802F274(???);
-// ??? ExecHammerne(???);
-// ??? sub_802F30C(???);
-// ??? ExecSomeSelfHeal(???);
-// ??? sub_802F3E4(???);
-// ??? sub_802F450(???);
-// ??? sub_802F48C(???);
-// ??? sub_802F4D0(???);
-// ??? sub_802F510(???);
-// ??? sub_802F598(???);
-// ??? sub_802F664(???);
-// ??? sub_802F73C(???);
-// ??? sub_802F760(???);
-// ??? sub_802F808(???);
-// ??? sub_802F914(???);
-// ??? sub_802F978(???);
-// ??? sub_802F9E0(???);
-// ??? sub_802FA4C(???);
-// ??? sub_802FA90(???);
-// ??? sub_802FAD0(???);
-// ??? ExecTorchStaff(???);
-// ??? sub_802FBBC(???);
-// ??? ActionStaffDoorChestUseItem(???);
-// ??? ActionPick(???);
-// ??? sub_803001C(???);
-// ??? sub_8030050(???);
 // ??? InitUnitStack(???);
 // ??? PushUnit(???);
 // ??? LoadPlayerUnitsFromUnitStack(???);

diff --git a/include/variables.h b/include/variables.h
@@ -1492,9 +1492,6 @@ extern struct ProcCmd CONST_DATA gUnknown_0859AE18[];
 // extern ??? gUnknown_0859BCF4
 // extern ??? gUnknown_0859BD40
 // extern ??? gUnknown_0859BDA0
-// extern ??? gUnknown_0859BDF0
-// extern ??? gUnknown_0859BE10
-// extern ??? gUnknown_0859BE28
 // extern ??? gUnknown_0859CFB0
 // extern ??? gUnknown_0859CFD4
 // extern ??? gUnknown_0859CFF8

diff --git a/ldscript.txt b/ldscript.txt
@@ -92,7 +92,7 @@ SECTIONS
         src/bmbattle.o(.text);
         src/bmtrade.o(.text);
         src/bmtrick.o(.text);
-        asm/bmusemind.o(.text);
+        src/bmusemind.o(.text);
         src/bmio.o(.text);
         src/bmcontainer.o(.text);
         asm/bmusort.o(.text);
@@ -261,6 +261,7 @@ SECTIONS
         . = ALIGN(4); src/bmbattle.o(.data);
         . = ALIGN(4); src/bmtrade.o(.data);
         . = ALIGN(4); data/data_59BC64.o(.data);
+        . = ALIGN(4); src/bmusemind.o(.data);
         . = ALIGN(4); src/menu_def.o(.rodata);
         . = ALIGN(4); data/data_59D238.o(.data);
         . = ALIGN(4); src/bmio.o(.data);

diff --git a/src/bmitemuse.c b/src/bmitemuse.c
@@ -51,7 +51,6 @@ void FillWarpRangeMap(struct Unit* caster, struct Unit* target);
 void DisplayMoveRangeGraphics(int config);
 
 void MakeTargetListForAdjacentHeal(struct Unit* unit);
-void MakeTargetListForRangedHeal(struct Unit* unit);
 void MakeTargetListForRestore(struct Unit* unit);
 void MakeTargetListForRescueStaff(struct Unit* unit);
 void MakeTargetListForBarrier(struct Unit* unit);
@@ -61,7 +60,6 @@ void MakeTargetListForBerserk(struct Unit* unit);
 void MakeTargetListForWarp(struct Unit* unit);
 void MakeTargetListForHammerne(struct Unit* unit);
 void MakeTargetListForUnlock(struct Unit* unit);
-void MakeTargetListForLatona(struct Unit* unit);
 void MakeTargetListForMine(struct Unit* unit);
 void MakeTargetListForLightRune(struct Unit* unit);
 void MakeTargetListForDanceRing(struct Unit* unit);

diff --git a/src/bmmind.c b/src/bmmind.c
@@ -11,6 +11,7 @@
 #include "bmreliance.h"
 #include "m4a.h"
 #include "soundwrapper.h"
+#include "bmusemind.h"
 #include "bmmind.h"
 
 #include "constants/items.h"
@@ -130,9 +131,6 @@ void sub_808371C(u8, u8, int);
 void sub_8083FB0(u8, u8);
 void sub_80840C4(int, int);
 
-// bmtarget.s
-void MakeTargetListForFuckingNightmare(struct Unit*);
-
 // code_mapanim.s
 void BeginMapAnimForSteal(void);
 void BeginMapAnimForSummon(void);
@@ -162,8 +160,6 @@ s8 ActionSteal(ProcPtr);
 s8 ActionSummon(ProcPtr);
 s8 ActionSummonDK(ProcPtr);
 s8 ActionArena(ProcPtr);
-s8 ActionStaffDoorChestUseItem(ProcPtr);
-s8 ActionPick(ProcPtr);
 
 void StoreRNStateToActionStruct() {
     StoreRNState(gActionData._u00);

diff --git a/src/bmunit.c b/src/bmunit.c
@@ -570,8 +570,8 @@ struct Unit* LoadUnit(const struct UnitDefinition* uDef) {
 
         if (CanClassWieldWeaponType(monsterClass, ITYPE_BOW) == TRUE) {
             // TODO: AI BIT DEFINITIONS
-            buf.ai.ai3 = buf.ai.ai3 & (1 | 2 | 4);
-            buf.ai.ai3 = buf.ai.ai3 | (8 | 32);
+            buf.ai[2] = buf.ai[2] & (1 | 2 | 4);
+            buf.ai[2] = buf.ai[2] | (8 | 32);
         }
 
         uDef = &buf;