Inject hook: pr_WeaponTriangleRules

Author: MokhaLeee

Kernel/Wizardry/Core/BattleSys/BattleSys.event

@@ -44,6 +44,9 @@ PUSH
 
     ORG $2C7C0 // BattleApplyWeaponTriangleEffect
     jumpToHack(_BattleApplyWeaponTriangleEffect)
+
+    ORG $2C7CC
+    pr_WeaponTriangleRules:
 POP
 
 #endif

Kernel/Wizardry/Core/BattleSys/Source/WeaponTriangle.c

@@ -66,7 +66,7 @@ STATIC_DECLAR bool WtaHandler_Vanilla(struct BattleUnit *attacker, struct Battle
 {
 	const struct WeaponTriangleRule *it;
 
-	for (it = sWeaponTriangleRules; it->attackerWeaponType >= 0; ++it) {
+	for (it = pr_WeaponTriangleRules; it->attackerWeaponType >= 0; ++it) {
 		if ((attacker->weaponType == it->attackerWeaponType) && (defender->weaponType == it->defenderWeaponType)) {
 			if (it->atkBonus > 0) {
 				status->bonus.atk += it->atkBonus * 2;

include/kernel/battle-system.h

@@ -14,6 +14,8 @@ extern struct BattleStatus BattleSysBattleStatusBackup[2];
 #define BattleUnitOriginalStatus(bu) (((bu) == &gBattleTarget) ? &BattleSysBattleStatusBackup[1] : &BattleSysBattleStatusBackup[0])
 
 /* WTA bonus */
+extern struct WeaponTriangleRule const *const pr_WeaponTriangleRules;
+
 struct WeaponTriangleConf {
 	s8 wtype_a;
 	s8 wtype_b;
@@ -48,13 +50,6 @@ struct WeaponTriangleItemConf {
 extern const struct WeaponTriangleItemConf gWeaponTriangleItemConf[0x100];
 extern struct WeaponTriangleItemConf const *const gpWeaponTriangleItemConf;
 
-enum WTA_handler_ret {
-	WTA_HANDLER_NOT_HANDLED,
-	WTA_HANDLER_SKILL,
-	WTA_HANDLER_CHAX_WEAPON,
-	WTA_HANDLER_VANILLA
-};
-
 struct WtaStatus {
 	bool invert_eff;
 	bool amplifier_eff;