add external status getters

FireEmblemUniverse · Feb 5, 2025 · 40dd3ce · 40dd3ce
1 parent d051c71
commit 40dd3ce
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 0 deletions.
diff --git a/Preload/Reloc.event b/Preload/Reloc.event
@@ -154,4 +154,16 @@ gpExternalPrePhaseHook: WORD 0
 gpExternalPrePhaseHealCalc: WORD 0
 gpExternalSkillListGenerator: WORD 0
 
+gpExternalHpGetters:    WORD 0
+gpExternalPowGetters:   WORD 0
+gpExternalMagGetters:   WORD 0
+gpExternalSklGetters:   WORD 0
+gpExternalSpdGetters:   WORD 0
+gpExternalLckGetters:   WORD 0
+gpExternalDefGetters:   WORD 0
+gpExternalResGetters:   WORD 0
+gpExternalMovGetters:   WORD 0
+gpExternalConGetters:   WORD 0
+gpExternalAidGetters:   WORD 0
+
 KERNEL_RELOC_END:
diff --git a/Wizardry/Core/UnitStatusGetter/source/AidGetter.c b/Wizardry/Core/UnitStatusGetter/source/AidGetter.c
@@ -18,5 +18,8 @@ int _GetUnitAid(struct Unit *unit)
 	for (it = gpAidGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalAidGetters)
+		status = gpExternalAidGetters(status, unit);
+
 	return status;
 }
diff --git a/Wizardry/Core/UnitStatusGetter/source/DefGetter.c b/Wizardry/Core/UnitStatusGetter/source/DefGetter.c
@@ -11,6 +11,9 @@ int _GetUnitDefense(struct Unit *unit)
 	for (it = gpDefGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalDefGetters)
+		status = gpExternalDefGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/HpGetter.c b/Wizardry/Core/UnitStatusGetter/source/HpGetter.c
@@ -11,6 +11,9 @@ int _GetUnitMaxHp(struct Unit *unit)
 	for (it = gpHpGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalHpGetters)
+		status = gpExternalHpGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/LckGetter.c b/Wizardry/Core/UnitStatusGetter/source/LckGetter.c
@@ -11,6 +11,9 @@ int _GetUnitLuck(struct Unit *unit)
 	for (it = gpLckGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalLckGetters)
+		status = gpExternalLckGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/MagGetter.c b/Wizardry/Core/UnitStatusGetter/source/MagGetter.c
@@ -12,6 +12,9 @@ int _GetUnitMagic(struct Unit *unit)
 	for (it = gpMagGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalMagGetters)
+		status = gpExternalMagGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/MovGetter.c b/Wizardry/Core/UnitStatusGetter/source/MovGetter.c
@@ -12,6 +12,9 @@ int _GetUnitMov(struct Unit *unit)
 	for (it = gpMovGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalMovGetters)
+		status = gpExternalMovGetters(status, unit);
+
 	/* Some special effects */
 	if (gpDebuffInfos[GetUnitStatusIndex(unit)].cannot_move)
 		status = 0;

diff --git a/Wizardry/Core/UnitStatusGetter/source/PowGetter.c b/Wizardry/Core/UnitStatusGetter/source/PowGetter.c
@@ -11,6 +11,9 @@ int _GetUnitPower(struct Unit *unit)
 	for (it = gpPowGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalPowGetters)
+		status = gpExternalPowGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/ResGetter.c b/Wizardry/Core/UnitStatusGetter/source/ResGetter.c
@@ -11,6 +11,9 @@ int _GetUnitResistance(struct Unit *unit)
 	for (it = gpResGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalResGetters)
+		status = gpExternalResGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/SklGetter.c b/Wizardry/Core/UnitStatusGetter/source/SklGetter.c
@@ -14,6 +14,9 @@ int _GetUnitSkill(struct Unit *unit)
 	for (it = gpSklGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalSklGetters)
+		status = gpExternalSklGetters(status, unit);
+
 	return status;
 }
 

diff --git a/Wizardry/Core/UnitStatusGetter/source/SpdGetter.c b/Wizardry/Core/UnitStatusGetter/source/SpdGetter.c
@@ -14,6 +14,9 @@ int _GetUnitSpeed(struct Unit *unit)
 	for (it = gpSpdGetters; *it; it++)
 		status = (*it)(status, unit);
 
+	if (gpExternalSpdGetters)
+		status = gpExternalSpdGetters(status, unit);
+
 	return status;
 }
 

diff --git a/include/status-getter.h b/include/status-getter.h
@@ -16,6 +16,18 @@ extern StatusGetterFunc_t const *const gpMovGetters;
 extern StatusGetterFunc_t const *const gpConGetters;
 extern StatusGetterFunc_t const *const gpAidGetters;
 
+extern StatusGetterFunc_t const gpExternalHpGetters;
+extern StatusGetterFunc_t const gpExternalPowGetters;
+extern StatusGetterFunc_t const gpExternalMagGetters;
+extern StatusGetterFunc_t const gpExternalSklGetters;
+extern StatusGetterFunc_t const gpExternalSpdGetters;
+extern StatusGetterFunc_t const gpExternalLckGetters;
+extern StatusGetterFunc_t const gpExternalDefGetters;
+extern StatusGetterFunc_t const gpExternalResGetters;
+extern StatusGetterFunc_t const gpExternalMovGetters;
+extern StatusGetterFunc_t const gpExternalConGetters;
+extern StatusGetterFunc_t const gpExternalAidGetters;
+
 int HpMaxGetter(struct Unit *unit);
 int PowGetter(struct Unit *unit);
 int MagGetter(struct Unit *unit);