diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-24 23:38:21 -0500 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-24 23:38:21 -0500 |
| commit | 6e56b9f0341be0a6c960ea9e8db0939e4fa3cdac (patch) | |
| tree | 1d2795c706392d5c6d4ce8019bddac2a649e8a2c | |
| parent | 40a34fafd685b7df6d1777ec335374ea081adad0 (diff) | |
Decomped CanUseStatusMove()
| -rw-r--r-- | asm/code_807C7AC.s (renamed from asm/code_807C648.s) | 192 | ||||
| -rw-r--r-- | data/move/move_data.json | 2478 | ||||
| -rw-r--r-- | include/constants/move.h | 18 | ||||
| -rw-r--r-- | include/dungeon_ai_attack_1.h | 2 | ||||
| -rw-r--r-- | include/moves.h | 2 | ||||
| -rwxr-xr-x | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/dungeon_ai_attack.c | 1 | ||||
| -rw-r--r-- | src/dungeon_ai_attack_1.c | 233 | ||||
| -rw-r--r-- | src/moves.c | 4 | ||||
| -rw-r--r-- | tools/dungeonjson/dungeonjson.cpp | 6 |
10 files changed, 1395 insertions, 1543 deletions
diff --git a/asm/code_807C648.s b/asm/code_807C7AC.s index d94a155..b43caa8 100644 --- a/asm/code_807C648.s +++ b/asm/code_807C7AC.s @@ -5,198 +5,6 @@ .text - thumb_func_start CanUseStatusMove -CanUseStatusMove: - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r1, 0 - adds r4, r2, 0 - mov r8, r3 - ldr r1, [sp, 0x1C] - lsls r0, 16 - asrs r6, r0, 16 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - movs r7, 0 - movs r0, 0xF - ands r0, r6 - adds r1, r0, 0 - cmp r1, 0 - bne _0807C686 - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0x1 - bl CanTarget - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0807C6E0 - movs r7, 0x1 - b _0807C6E4 -_0807C686: - cmp r1, 0x1 - beq _0807C6BE - cmp r1, 0x2 - bne _0807C692 - ldr r1, [r4, 0x70] - b _0807C69C -_0807C692: - cmp r1, 0x5 - bne _0807C6B6 - ldr r1, [r4, 0x70] - cmp r5, r4 - beq _0807C6B2 -_0807C69C: - movs r7, 0x1 - ldrb r0, [r1, 0x8] - cmp r0, 0x1 - beq _0807C6B2 - adds r0, r1, 0 - adds r0, 0xA4 - ldrb r0, [r0] - cmp r0, 0x4 - beq _0807C6B2 - cmp r0, 0x1 - bne _0807C6E0 -_0807C6B2: - movs r0, 0 - b _0807C7A0 -_0807C6B6: - cmp r1, 0x6 - bne _0807C6D4 - cmp r5, r4 - beq _0807C6B2 -_0807C6BE: - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0x1 - bl CanTarget - lsls r0, 24 - cmp r0, 0 - bne _0807C6E0 - movs r7, 0x1 - b _0807C6E4 -_0807C6D4: - subs r0, 0x3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _0807C6E0 - movs r7, 0x1 -_0807C6E0: - cmp r7, 0 - beq _0807C79E -_0807C6E4: - mov r0, r9 - cmp r0, 0 - beq _0807C77C - adds r0, r5, 0 - adds r1, r4, 0 - mov r2, r8 - bl CanUseOnTargetWithStatusChecker - lsls r0, 24 - cmp r0, 0 - beq _0807C6B2 - movs r1, 0xF0 - lsls r1, 4 - ands r1, r6 - movs r0, 0x80 - lsls r0, 1 - cmp r1, r0 - beq _0807C78A - movs r0, 0x80 - lsls r0, 2 - cmp r1, r0 - beq _0807C76E - movs r0, 0xC0 - lsls r0, 2 - cmp r1, r0 - bne _0807C720 - adds r0, r4, 0 - bl HasNegativeStatus - b _0807C774 -_0807C720: - movs r0, 0x80 - lsls r0, 3 - cmp r1, r0 - bne _0807C730 - adds r0, r4, 0 - bl IsSleeping - b _0807C774 -_0807C730: - movs r0, 0xC0 - lsls r0, 3 - cmp r1, r0 - bne _0807C75A - ldr r1, [r4, 0x70] - adds r0, r1, 0 - adds r0, 0x5C - ldrb r0, [r0] - cmp r0, 0xE - beq _0807C74E - adds r0, r1, 0 - adds r0, 0x5D - ldrb r0, [r0] - cmp r0, 0xE - bne _0807C6B2 -_0807C74E: - adds r0, r1, 0 - adds r0, 0xF5 - ldrb r0, [r0] - cmp r0, 0 - beq _0807C79E - b _0807C6B2 -_0807C75A: - movs r0, 0xA0 - lsls r0, 3 - cmp r1, r0 - bne _0807C79E - adds r0, r4, 0 - bl HasNegativeStatus - lsls r0, 24 - cmp r0, 0 - bne _0807C79E -_0807C76E: - adds r0, r4, 0 - bl HasQuarterHPOrLess -_0807C774: - lsls r0, 24 - cmp r0, 0 - bne _0807C79E - b _0807C6B2 -_0807C77C: - movs r0, 0xF0 - lsls r0, 4 - ands r0, r6 - movs r1, 0x80 - lsls r1, 1 - cmp r0, r1 - bne _0807C79E -_0807C78A: - mov r0, r8 - movs r1, 0x2 - bl GetMoveAccuracy - adds r4, r0, 0 - movs r0, 0x64 - bl DungeonRandomCapped - cmp r0, r4 - bge _0807C6B2 -_0807C79E: - adds r0, r7, 0 -_0807C7A0: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CanUseStatusMove - thumb_func_start WeightMove WeightMove: push {r4-r7,lr} diff --git a/data/move/move_data.json b/data/move/move_data.json index ed3a8f5..87e2c61 100644 --- a/data/move/move_data.json +++ b/data/move/move_data.json @@ -8,9 +8,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 99, "weight": 0, - "accuracy1": 0, - "accuracy2": 0, - "useChance": 0, + "accuracyGlobal": 0, + "accuracyOffensive": 0, + "accuracyUseChance": 0, "hitCount": 0, "cannotHitFrozen": false, "rangeType": 0, @@ -26,9 +26,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 15, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -47,9 +47,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 68, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 68, + "accuracyUseChance": 75, "hitCount": 5, "unk12": 99, "criticalHitChance": 2, @@ -68,9 +68,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -89,9 +89,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 13, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -110,9 +110,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -129,9 +129,9 @@ "aiTargetingFlags": "0b0000001001100001", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -149,9 +149,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -168,9 +168,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -189,9 +189,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 3, "unk12": 99, "criticalHitChance": 12, @@ -210,9 +210,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -230,9 +230,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 75, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 75, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -250,9 +250,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -269,9 +269,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -289,9 +289,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 13, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -308,9 +308,9 @@ "aiTargetingFlags": "0b0000001100110001", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -328,9 +328,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -349,9 +349,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -368,9 +368,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -389,9 +389,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -408,9 +408,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -429,9 +429,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -448,9 +448,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 16, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -468,9 +468,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 16, "weight": 10, - "accuracy1": 75, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 75, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -488,9 +488,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 18, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -508,9 +508,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 16, "weight": 15, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -530,9 +530,9 @@ "aiTargetingFlags": "0b0000001100110001", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -550,9 +550,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -571,9 +571,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 16, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -592,9 +592,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 99, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -612,9 +612,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -633,9 +633,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -654,9 +654,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -675,9 +675,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -696,9 +696,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 10, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -717,9 +717,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -736,9 +736,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -757,9 +757,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -777,9 +777,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -796,9 +796,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -817,9 +817,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 7, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -836,9 +836,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 10, "weight": 15, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -857,9 +857,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 65, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 65, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -878,9 +878,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -897,9 +897,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -919,9 +919,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -940,9 +940,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -961,9 +961,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 20, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -981,9 +981,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1001,9 +1001,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1020,9 +1020,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1039,9 +1039,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1058,9 +1058,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 11, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1079,9 +1079,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1100,9 +1100,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1119,9 +1119,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1139,9 +1139,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1159,9 +1159,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1180,9 +1180,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1200,9 +1200,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 9, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1219,9 +1219,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 13, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -1240,9 +1240,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1259,9 +1259,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1281,9 +1281,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1303,9 +1303,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 9, "weight": 20, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1324,9 +1324,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1345,9 +1345,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1365,9 +1365,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1386,9 +1386,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 18, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1407,9 +1407,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1428,9 +1428,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 32, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1448,9 +1448,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1469,9 +1469,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1490,9 +1490,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 30, - "accuracy1": 125, - "accuracy2": 60, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 60, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1511,9 +1511,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 30, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1531,9 +1531,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1552,9 +1552,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1573,9 +1573,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1594,9 +1594,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1615,9 +1615,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 19, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1635,9 +1635,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1657,9 +1657,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -1678,9 +1678,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 13, "weight": 30, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1699,9 +1699,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1719,9 +1719,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 13, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1740,9 +1740,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1760,9 +1760,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 16, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1780,9 +1780,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -1801,9 +1801,9 @@ "aiTargetingFlags": "0b0000000000110001", "maxPP": 13, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -1820,9 +1820,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -1840,9 +1840,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -1861,9 +1861,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 9, "weight": 15, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 12, @@ -1882,9 +1882,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1903,9 +1903,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1924,9 +1924,9 @@ "aiTargetingFlags": "0b0000001001110011", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1944,9 +1944,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -1964,9 +1964,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -1985,9 +1985,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 13, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2006,9 +2006,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2025,9 +2025,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -2045,9 +2045,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 9, "weight": 15, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2066,9 +2066,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2087,9 +2087,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2106,9 +2106,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 9, "weight": 10, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2127,9 +2127,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 75, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 75, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2146,9 +2146,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 15, - "accuracy1": 125, - "accuracy2": 68, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 68, + "accuracyUseChance": 75, "hitCount": 5, "unk12": 99, "criticalHitChance": 12, @@ -2167,9 +2167,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 15, - "accuracy1": 70, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 70, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -2187,9 +2187,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2208,9 +2208,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 19, "weight": 10, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2228,9 +2228,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2249,9 +2249,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 8, "weight": 10, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2270,9 +2270,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 60, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 60, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -2290,9 +2290,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -2310,9 +2310,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 8, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2331,9 +2331,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2352,9 +2352,9 @@ "aiTargetingFlags": "0b0000000000000010", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2371,9 +2371,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2392,9 +2392,9 @@ "aiTargetingFlags": "0b0000001001110011", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -2412,9 +2412,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 20, - "accuracy1": 100, - "accuracy2": 65, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 65, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2433,9 +2433,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2453,9 +2453,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2475,9 +2475,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2496,9 +2496,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -2516,9 +2516,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2536,9 +2536,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -2556,9 +2556,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2577,9 +2577,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 8, "weight": 20, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2598,9 +2598,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 10, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2619,9 +2619,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 25, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -2639,9 +2639,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2660,9 +2660,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -2680,9 +2680,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 20, - "accuracy1": 35, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 35, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2700,9 +2700,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 12, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2721,9 +2721,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2742,9 +2742,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -2762,9 +2762,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 18, "weight": 15, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2784,9 +2784,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2805,9 +2805,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2824,9 +2824,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 1, "weight": 20, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2843,9 +2843,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2864,9 +2864,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2885,9 +2885,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 14, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 20, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 20, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -2904,9 +2904,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 15, - "accuracy1": 80, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 80, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -2924,9 +2924,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2945,9 +2945,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2966,9 +2966,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 8, "weight": 30, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -2987,9 +2987,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3006,9 +3006,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3027,9 +3027,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3047,9 +3047,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3068,9 +3068,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 35, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 35, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3088,9 +3088,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 9, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3109,9 +3109,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 22, "weight": 10, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3129,9 +3129,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3150,9 +3150,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 25, - "accuracy1": 100, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3171,9 +3171,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3191,9 +3191,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3212,9 +3212,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 9, "weight": 30, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3233,9 +3233,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3254,9 +3254,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3275,9 +3275,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3296,9 +3296,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 30, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3317,9 +3317,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3338,9 +3338,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 10, "weight": 10, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -3359,9 +3359,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 15, "weight": 30, - "accuracy1": 125, - "accuracy2": 80, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 80, + "accuracyUseChance": 75, "hitCount": 2, "unk12": 99, "criticalHitChance": 2, @@ -3380,9 +3380,9 @@ "aiTargetingFlags": "0b0000001000110001", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3400,9 +3400,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 15, "weight": 30, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3421,9 +3421,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 8, "weight": 30, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3442,9 +3442,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -3463,9 +3463,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3483,9 +3483,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3503,9 +3503,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 15, - "accuracy1": 100, - "accuracy2": 55, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 55, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -3524,9 +3524,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 20, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3543,9 +3543,9 @@ "aiTargetingFlags": "0b0000001000110001", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3563,9 +3563,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 25, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3584,9 +3584,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -3605,9 +3605,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 18, "weight": 25, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3626,9 +3626,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 25, - "accuracy1": 35, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 35, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3646,9 +3646,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 25, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3667,9 +3667,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 8, "weight": 20, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3688,9 +3688,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -3709,9 +3709,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 20, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 20, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3729,9 +3729,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3750,9 +3750,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3769,9 +3769,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3788,9 +3788,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3807,9 +3807,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -3827,9 +3827,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -3846,9 +3846,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 2, @@ -3867,9 +3867,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 8, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3888,9 +3888,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 13, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3909,9 +3909,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -3930,9 +3930,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 50, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 50, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -3950,9 +3950,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 9, "weight": 10, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -3971,9 +3971,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -3991,9 +3991,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4012,9 +4012,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4032,9 +4032,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4052,9 +4052,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4073,9 +4073,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4093,9 +4093,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 19, "weight": 20, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4114,9 +4114,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -4135,9 +4135,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4155,9 +4155,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4176,9 +4176,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 25, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4197,9 +4197,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4218,9 +4218,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4239,9 +4239,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 25, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4260,9 +4260,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4281,9 +4281,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4300,9 +4300,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 25, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 3, "unk12": 99, "criticalHitChance": 2, @@ -4321,9 +4321,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4342,9 +4342,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4361,9 +4361,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 16, "weight": 15, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4382,9 +4382,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 20, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4403,9 +4403,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4423,9 +4423,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 17, "weight": 25, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4443,9 +4443,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 20, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4464,9 +4464,9 @@ "aiTargetingFlags": "0b0000001001110011", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4484,9 +4484,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4505,9 +4505,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4524,9 +4524,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4545,9 +4545,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 20, - "accuracy1": 100, - "accuracy2": 87, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 87, + "accuracyUseChance": 75, "hitCount": 2, "unk12": 99, "criticalHitChance": 3, @@ -4566,9 +4566,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4585,9 +4585,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4605,9 +4605,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4624,9 +4624,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4645,9 +4645,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -4665,9 +4665,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4686,9 +4686,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 95, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 95, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4707,9 +4707,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4728,9 +4728,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 19, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -4748,9 +4748,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4768,9 +4768,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4788,9 +4788,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4809,9 +4809,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4830,9 +4830,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -4851,9 +4851,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -4870,9 +4870,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4891,9 +4891,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 9, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4912,9 +4912,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 9, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4933,9 +4933,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 12, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4955,9 +4955,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 8, "weight": 10, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4976,9 +4976,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 25, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -4997,9 +4997,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 25, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5018,9 +5018,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5040,9 +5040,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 20, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5061,9 +5061,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 35, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 35, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5081,9 +5081,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 30, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5102,9 +5102,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5121,9 +5121,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 25, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5142,9 +5142,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -5163,9 +5163,9 @@ "aiTargetingFlags": "0b0000000000110010", "maxPP": 19, "weight": 10, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5182,9 +5182,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 25, - "accuracy1": 125, - "accuracy2": 87, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 87, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 12, @@ -5203,9 +5203,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 50, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5222,9 +5222,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 19, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5243,9 +5243,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 11, "weight": 15, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5262,9 +5262,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 25, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5282,9 +5282,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5302,9 +5302,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5322,9 +5322,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 25, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5343,9 +5343,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5365,9 +5365,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 18, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5386,9 +5386,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5407,9 +5407,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5428,9 +5428,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5448,9 +5448,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5467,9 +5467,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -5487,9 +5487,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5506,9 +5506,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5525,9 +5525,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5546,9 +5546,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5567,9 +5567,9 @@ "aiTargetingFlags": "0b0000000000100000", "maxPP": 8, "weight": 25, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5589,9 +5589,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -5609,9 +5609,9 @@ "aiTargetingFlags": "0b0000000001100010", "maxPP": 15, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5628,9 +5628,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5649,9 +5649,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -5670,9 +5670,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 19, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5690,9 +5690,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5711,9 +5711,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5732,9 +5732,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 10, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5753,9 +5753,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -5773,9 +5773,9 @@ "aiTargetingFlags": "0b0000000001100000", "maxPP": 1, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -5792,9 +5792,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -5813,9 +5813,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -5833,9 +5833,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 12, "weight": 25, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 2, @@ -5854,9 +5854,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5874,9 +5874,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5895,9 +5895,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -5915,9 +5915,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 25, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5936,9 +5936,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 14, "weight": 10, - "accuracy1": 125, - "accuracy2": 87, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 87, + "accuracyUseChance": 75, "hitCount": 2, "unk12": 99, "criticalHitChance": 12, @@ -5957,9 +5957,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 15, - "accuracy1": 125, - "accuracy2": 73, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 73, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5978,9 +5978,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -5999,9 +5999,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 15, "weight": 10, - "accuracy1": 25, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 25, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMuzzled": true, @@ -6019,9 +6019,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6038,9 +6038,9 @@ "aiTargetingFlags": "0b0000000100110000", "maxPP": 22, "weight": 10, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6057,9 +6057,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6077,9 +6077,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 8, "weight": 30, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6098,9 +6098,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6117,9 +6117,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 13, "weight": 20, - "accuracy1": 125, - "accuracy2": 65, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 65, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6138,9 +6138,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6159,9 +6159,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 15, - "accuracy1": 75, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 75, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6178,9 +6178,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6198,9 +6198,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 20, - "accuracy1": 100, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6219,9 +6219,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 7, "weight": 15, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6239,9 +6239,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 75, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 75, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6258,9 +6258,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 1, @@ -6279,9 +6279,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 19, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6298,9 +6298,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6319,9 +6319,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6340,9 +6340,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6361,9 +6361,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 70, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 70, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 1, @@ -6382,9 +6382,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 25, - "accuracy1": 125, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 1, @@ -6403,9 +6403,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6422,9 +6422,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6442,9 +6442,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6461,9 +6461,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6480,9 +6480,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 15, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6499,9 +6499,9 @@ "aiTargetingFlags": "0b0000001001100001", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6520,9 +6520,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 19, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6540,9 +6540,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6561,9 +6561,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6582,9 +6582,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6603,9 +6603,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6624,9 +6624,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6645,9 +6645,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 20, - "accuracy1": 125, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6666,9 +6666,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 10, "weight": 20, - "accuracy1": 100, - "accuracy2": 78, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 78, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -6686,9 +6686,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6705,9 +6705,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 20, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6725,9 +6725,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 15, - "accuracy1": 100, - "accuracy2": 90, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 90, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -6745,9 +6745,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6765,9 +6765,9 @@ "aiTargetingFlags": "0b0000010000000000", "maxPP": 13, "weight": 30, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6787,9 +6787,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 30, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6808,9 +6808,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6828,9 +6828,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6847,9 +6847,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -6868,9 +6868,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -6889,9 +6889,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6908,9 +6908,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6928,9 +6928,9 @@ "aiTargetingFlags": "0b0000001100110001", "maxPP": 17, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -6948,9 +6948,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6967,9 +6967,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -6987,9 +6987,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7009,9 +7009,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 125, - "accuracy2": 125, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 125, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "targetsUser": true, @@ -7029,9 +7029,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7050,9 +7050,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 8, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7071,9 +7071,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 14, "weight": 15, - "accuracy1": 125, - "accuracy2": 87, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 87, + "accuracyUseChance": 75, "hitCount": 2, "unk12": 99, "criticalHitChance": 12, @@ -7092,9 +7092,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 19, "weight": 30, - "accuracy1": 125, - "accuracy2": 80, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 80, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 1, @@ -7113,9 +7113,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 15, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7134,9 +7134,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 15, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -7153,9 +7153,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 30, - "accuracy1": 100, - "accuracy2": 80, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 80, + "accuracyUseChance": 75, "hitCount": 0, "unk12": 99, "criticalHitChance": 1, @@ -7174,9 +7174,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 13, "weight": 15, - "accuracy1": 70, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 70, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "affectedByMagicCoat": true, @@ -7194,9 +7194,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 1, "weight": 30, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "criticalHitChance": 12, "cannotHitFrozen": true, @@ -7214,9 +7214,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 12, "weight": 20, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 50, @@ -7235,9 +7235,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 12, "weight": 10, - "accuracy1": 125, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7256,9 +7256,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 70, - "accuracy1": 125, - "accuracy2": 93, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 93, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 1, "cannotHitFrozen": true, @@ -7276,9 +7276,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 10, - "accuracy1": 80, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 80, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 6, @@ -7297,9 +7297,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 17, "weight": 10, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 6, @@ -7318,9 +7318,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 17, "weight": 10, - "accuracy1": 80, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 80, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 6, @@ -7339,9 +7339,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 17, "weight": 10, - "accuracy1": 80, - "accuracy2": 84, - "useChance": 75, + "accuracyGlobal": 80, + "accuracyOffensive": 84, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 6, @@ -7360,9 +7360,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 88, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 88, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7381,9 +7381,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 99, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "cannotHitFrozen": true, @@ -7401,9 +7401,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 10, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7422,9 +7422,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7440,9 +7440,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "dealsDirectDamage": true, @@ -7459,9 +7459,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7477,9 +7477,9 @@ "aiTargetingFlags": "0b0000000001000000", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "criticalHitChance": 12, @@ -7498,9 +7498,9 @@ "aiTargetingFlags": "0b0000000001010010", "maxPP": 17, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 14, @@ -7516,9 +7516,9 @@ "aiTargetingFlags": "0b0000000001010000", "maxPP": 17, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 14, @@ -7534,9 +7534,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 14, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7552,9 +7552,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 3, @@ -7570,9 +7570,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 37, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7588,9 +7588,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 16, @@ -7606,9 +7606,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7624,9 +7624,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7642,9 +7642,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 3, @@ -7660,9 +7660,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -7678,9 +7678,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 20, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7696,9 +7696,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 17, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 20, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 20, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -7714,9 +7714,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 3, @@ -7732,9 +7732,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 3, @@ -7750,9 +7750,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7768,9 +7768,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 12, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7786,9 +7786,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 20, - "accuracy1": 45, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 45, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -7804,9 +7804,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 11, @@ -7822,9 +7822,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 1, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -7840,9 +7840,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 27, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7858,9 +7858,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 27, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7876,9 +7876,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 29, @@ -7894,9 +7894,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 57, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 29, @@ -7912,9 +7912,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 4, @@ -7930,9 +7930,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -7948,9 +7948,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 3, "weight": 8, - "accuracy1": 35, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 35, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "cannotHitFrozen": true, @@ -7968,9 +7968,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 32, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 6, @@ -7986,9 +7986,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 7, "weight": 20, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -8004,9 +8004,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 4, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8022,9 +8022,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 45, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 45, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "cannotHitFrozen": true, @@ -8042,9 +8042,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 27, "weight": 20, - "accuracy1": 125, - "accuracy2": 45, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 45, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "cannotHitFrozen": true, @@ -8062,9 +8062,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 15, @@ -8080,9 +8080,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 29, @@ -8098,9 +8098,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 99, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 29, @@ -8116,9 +8116,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 10, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -8134,9 +8134,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 12, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 11, @@ -8152,9 +8152,9 @@ "aiTargetingFlags": "0b0000000010000000", "maxPP": 17, "weight": 8, - "accuracy1": 125, - "accuracy2": 45, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 45, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 3, @@ -8170,9 +8170,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8188,9 +8188,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 57, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -8206,9 +8206,9 @@ "aiTargetingFlags": "0b0000000000000000", "maxPP": 22, "weight": 15, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "unk12": 99, "cannotHitFrozen": true, @@ -8226,9 +8226,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 17, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8244,9 +8244,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 96, "weight": 8, - "accuracy1": 100, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 100, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 10, @@ -8262,9 +8262,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8280,9 +8280,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8298,9 +8298,9 @@ "aiTargetingFlags": "0b0000000011111111", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, @@ -8316,9 +8316,9 @@ "aiTargetingFlags": "0b0000000000110000", "maxPP": 22, "weight": 8, - "accuracy1": 125, - "accuracy2": 100, - "useChance": 75, + "accuracyGlobal": 125, + "accuracyOffensive": 100, + "accuracyUseChance": 75, "hitCount": 1, "cannotHitFrozen": true, "rangeType": 19, diff --git a/include/constants/move.h b/include/constants/move.h index 15ae1b9..0601969 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -11,6 +11,18 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; +enum AccuracyType +{ + // Accuracy used for all moves. + ACCURACY_TYPE_GLOBAL, + // Multiplied with the global accuracy for offensive moves (i.e., not status moves). + ACCURACY_TYPE_OFFENSIVE, + // Used by the AI to determine how often to use Spikes. + // Values exist for all other moves, though they seem to be unused. + ACCURACY_TYPE_USE_CHANCE, + NUM_ACCURACY_TYPES +}; + struct MoveData { u8 *namePointer; @@ -22,10 +34,8 @@ struct MoveData // The AI consider certain moves to have different range than they actually do. /* 0xC */ u8 maxPP; /* 0xD */ u8 weight; - /* 0xE */ u8 accuracy[2]; - // Used by the AI to determine how often to use Spikes. - // Values exist for all other moves, though they seem to be unused. - /* 0x10 */ u8 useChance; + // There are multiple accuracy values. These are define with the AccuracyType enum. + /* 0xE */ u8 accuracy[NUM_ACCURACY_TYPES]; /* 0x11 */ u8 hitCount; // Maximum number of times the move will hit. Used for multi-hit moves like Fury Attack. u8 unk12; /* 0x13 */ u8 criticalHitChance; diff --git a/include/dungeon_ai_attack_1.h b/include/dungeon_ai_attack_1.h index 19969f2..7272256 100644 --- a/include/dungeon_ai_attack_1.h +++ b/include/dungeon_ai_attack_1.h @@ -5,5 +5,7 @@ // 0x7C580 s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, u32 hasStatusChecker); +// 0x7C648 +bool8 CanUseStatusMove(s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker); #endif diff --git a/include/moves.h b/include/moves.h index ad68320..3bf4344 100644 --- a/include/moves.h +++ b/include/moves.h @@ -11,6 +11,8 @@ u8 GetMoveType(struct PokemonMove *move); // 0x92B90 u8 GetMoveWeight(struct PokemonMove *move); s32 GetMovePower(struct PokemonMove *move); +// 0x92BD8 +s32 GetMoveAccuracy(struct PokemonMove *move, u32 accuracyType); // 0x92BF4 u32 GetMoveMaxPP(struct PokemonMove *move); // 0x92C54 diff --git a/ld_script.txt b/ld_script.txt index b8111e3..0f11331 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -239,7 +239,7 @@ SECTIONS { src/dungeon_ai_attack.o(.text); asm/code_807C4A0.o(.text); src/dungeon_ai_attack_1.o(.text); - asm/code_807C648.o(.text); + asm/code_807C7AC.o(.text); src/dungeon_ai_attack_2.o(.text); asm/code_807CABC.o(.text); src/targeting_flags.o(.text); diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index 65973a1..835d207 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -42,7 +42,6 @@ extern struct DungeonEntity *gPotentialTargets[NUM_DIRECTIONS]; extern bool8 IsMoveUsable_1(struct DungeonEntity*, s32, bool8); extern bool8 TargetRegularAttack(struct DungeonEntity*, u32*, bool8); extern bool8 IsTargetInLineRange(struct DungeonEntity*, struct DungeonEntity*, s32); -extern bool8 CanUseStatusMove(s32, struct DungeonEntity*, struct DungeonEntity*, struct PokemonMove*, bool8); extern s32 WeightMove(struct DungeonEntity*, s32, struct DungeonEntity*, u8); void DecideAttack(struct DungeonEntity *pokemon) diff --git a/src/dungeon_ai_attack_1.c b/src/dungeon_ai_attack_1.c index fb088fb..023df14 100644 --- a/src/dungeon_ai_attack_1.c +++ b/src/dungeon_ai_attack_1.c @@ -2,16 +2,22 @@ #include "dungeon_ai_attack_1.h" #include "constants/direction.h" +#include "constants/targeting.h" +#include "constants/type.h" +#include "dungeon_ai_targeting_2.h" #include "dungeon_pokemon_attributes.h" +#include "dungeon_random.h" +#include "moves.h" #include "position_util.h" +#include "status_checks_1.h" extern bool8 gCanAttackInDirection[NUM_DIRECTIONS]; extern s32 gPotentialAttackTargetWeights[NUM_DIRECTIONS]; extern u8 gPotentialAttackTargetDirections[NUM_DIRECTIONS]; extern struct DungeonEntity *gPotentialTargets[NUM_DIRECTIONS]; -extern bool8 CanUseStatusMove(s32, struct DungeonEntity*, struct DungeonEntity*, struct PokemonMove*, bool8); extern s32 WeightMove(struct DungeonEntity*, s32, struct DungeonEntity*, u8); +extern bool8 CanUseOnTargetWithStatusChecker(struct DungeonEntity*, struct DungeonEntity*, struct PokemonMove*); s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker) { @@ -42,103 +48,128 @@ s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct Dunge return numPotentialTargets; } -// NAKED -// s32 WeightMoveIfUsable(s32 numPotentialTargets, s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool8 hasStatusChecker) -// { -// asm_unified("push {r4-r7,lr}\n" -// "mov r7, r10\n" -// "mov r6, r9\n" -// "mov r5, r8\n" -// "push {r5-r7}\n" -// "sub sp, 0x4\n" -// "adds r6, r0, 0\n" -// "adds r5, r2, 0\n" -// "adds r7, r3, 0\n" -// "ldr r0, [sp, 0x28]\n" -// "lsls r1, 16\n" -// "asrs r1, 16\n" -// "mov r9, r1\n" -// "lsls r0, 24\n" -// "lsrs r0, 24\n" -// "mov r10, r0\n" -// "ldr r2, [r5, 0x70]\n" -// "ldr r1, [r5, 0x4]\n" -// "ldr r0, [r7, 0x4]\n" -// "cmp r1, r0\n" -// "beq _0807C5BC\n" -// "movs r0, 0xF0\n" -// "mov r1, r9\n" -// "ands r0, r1\n" -// "cmp r0, 0x30\n" -// "beq _0807C5BC\n" -// "cmp r0, 0x60\n" -// "beq _0807C5BC\n" -// "cmp r0, 0x70\n" -// "bne _0807C5C4\n" -// "_0807C5BC:\n" -// "adds r0, r2, 0\n" -// "adds r0, 0x46\n" -// "ldrb r4, [r0]\n" -// "b _0807C5CE\n" -// "_0807C5C4:\n" -// "adds r0, r5, 0x4\n" -// "adds r1, r7, 0x4\n" -// "bl CalculateFacingDir\n" -// "adds r4, r0, 0\n" -// "_0807C5CE:\n" -// "ldr r0, _0807C638\n" -// "adds r0, r4\n" -// "mov r8, r0\n" -// "ldrb r0, [r0]\n" -// "cmp r0, 0\n" -// "bne _0807C624\n" -// "mov r0, r10\n" -// "str r0, [sp]\n" -// "mov r0, r9\n" -// "adds r1, r5, 0\n" -// "adds r2, r7, 0\n" -// "ldr r3, [sp, 0x24]\n" -// "bl CanUseStatusMove\n" -// "lsls r0, 24\n" -// "cmp r0, 0\n" -// "beq _0807C624\n" -// "movs r0, 0x1\n" -// "mov r1, r8\n" -// "strb r0, [r1]\n" -// "ldr r0, _0807C63C\n" -// "adds r0, r6, r0\n" -// "strb r4, [r0]\n" -// "adds r0, r5, 0\n" -// "ldr r1, [sp, 0x24]\n" -// "bl GetMoveTypeForPokemon\n" -// "adds r3, r0, 0\n" -// "lsls r3, 24\n" -// "lsrs r3, 24\n" -// "adds r0, r5, 0\n" -// "mov r1, r9\n" -// "adds r2, r7, 0\n" -// "bl WeightMove\n" -// "ldr r1, _0807C640\n" -// "lsls r2, r6, 2\n" -// "adds r1, r2, r1\n" -// "str r0, [r1]\n" -// "ldr r0, _0807C644\n" -// "adds r2, r0\n" -// "str r7, [r2]\n" -// "adds r6, 0x1\n" -// "_0807C624:\n" -// "adds r0, r6, 0\n" -// "add sp, 0x4\n" -// "pop {r3-r5}\n" -// "mov r8, r3\n" -// "mov r9, r4\n" -// "mov r10, r5\n" -// "pop {r4-r7}\n" -// "pop {r1}\n" -// "bx r1\n" -// ".align 2, 0\n" -// "_0807C638: .4byte gCanAttackInDirection\n" -// "_0807C63C: .4byte gPotentialAttackTargetDirections\n" -// "_0807C640: .4byte gPotentialAttackTargetWeights\n" -// "_0807C644: .4byte gPotentialTargets"); -// } +bool8 CanUseStatusMove(s32 targetingFlags, struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move, bool32 hasStatusChecker) +{ + struct DungeonEntityData *targetData; + s32 targetingFlags2 = (s16) targetingFlags; + bool8 hasStatusChecker2 = hasStatusChecker; + bool8 hasTarget = FALSE; + u32 categoryTargetingFlags = targetingFlags2 & 0xF; + u32 *categoryTargetingFlags2 = &categoryTargetingFlags; // Fixes a regswap. + if (*categoryTargetingFlags2 == TARGETING_FLAG_TARGET_OTHER) + { + if (CanTarget(user, target, FALSE, TRUE) == TARGET_CAPABILITY_CAN_TARGET) + { + hasTarget = TRUE; + } + } + else if (categoryTargetingFlags == TARGETING_FLAG_HEAL_TEAM) + { + goto checkCanTarget; + } + else if (categoryTargetingFlags == TARGETING_FLAG_LONG_RANGE) + { + targetData = target->entityData; + goto checkThirdParty; + } + else if (categoryTargetingFlags == TARGETING_FLAG_ATTACK_ALL) + { + targetData = target->entityData; + if (user == target) + { + goto returnFalse; + } + checkThirdParty: + hasTarget = TRUE; + if (targetData->shopkeeperMode == SHOPKEEPER_FRIENDLY || + targetData->clientType == CLIENT_TYPE_DONT_MOVE || + targetData->clientType == CLIENT_TYPE_CLIENT) + { + returnFalse: + return FALSE; + } + } + else if (categoryTargetingFlags == TARGETING_FLAG_BOOST_TEAM) + { + if (user == target) + { + goto returnFalse; + } + checkCanTarget: + if (CanTarget(user, target, FALSE, TRUE) == TARGET_CAPABILITY_CANNOT_ATTACK) + { + hasTarget = TRUE; + } + } + else if ((u16) (categoryTargetingFlags - 3) <= 1) // categoryTargetingFlags == TARGETING_FLAG_ITEM + { + hasTarget = TRUE; + } + + if (hasTarget) + { + if (hasStatusChecker2) + { + if (!CanUseOnTargetWithStatusChecker(user, target, move)) + { + goto returnFalse; + } + if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_SET_TRAP) + { + goto rollMoveUseChance; + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_HEAL_HP) + { + if (!HasQuarterHPOrLess(target)) + { + if (*categoryTargetingFlags2); + goto returnFalse; + } + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_HEAL_STATUS) + { + if (!HasNegativeStatus(target)) + { + if (*categoryTargetingFlags2); // Flips the conditional. + goto returnFalse; + } + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_DREAM_EATER) + { + if (!IsSleeping(target)) + { + if (*categoryTargetingFlags2); // Flips the conditional. + goto returnFalse; + } + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_EXPOSE) + { + targetData = target->entityData; + if ((targetData->type1 != TYPE_GHOST && targetData->type2 != TYPE_GHOST) || targetData->exposedStatus) + { + if (*categoryTargetingFlags2); // Flips the conditional. + goto returnFalse; + } + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_HEAL_ALL) + { + if (!HasNegativeStatus(target) && !HasQuarterHPOrLess(target)) + { + if (*categoryTargetingFlags2); // Flips the conditional. + goto returnFalse; + } + } + } + else if ((targetingFlags2 & 0xF00) == TARGETING_FLAG_SET_TRAP) + { + s32 useChance; + rollMoveUseChance: + useChance = GetMoveAccuracy(move, ACCURACY_TYPE_USE_CHANCE); + if (DungeonRandomCapped(100) >= useChance) + { + goto returnFalse; + } + } + } + return hasTarget; +} diff --git a/src/moves.c b/src/moves.c index a7caed6..ed1f38d 100644 --- a/src/moves.c +++ b/src/moves.c @@ -251,9 +251,9 @@ s32 GetMovePower(struct PokemonMove *move) return gMovesData[move->moveID].power; } -u8 GetMoveAccuracy(struct PokemonMove *move, u32 r1) +s32 GetMoveAccuracy(struct PokemonMove *move, u32 accuracyType) { - return gMovesData[move->moveID].accuracy[r1]; + return gMovesData[move->moveID].accuracy[accuracyType]; } u32 GetMoveMaxPP(struct PokemonMove *move) diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp index 9d2b69d..d28f160 100644 --- a/tools/dungeonjson/dungeonjson.cpp +++ b/tools/dungeonjson/dungeonjson.cpp @@ -490,9 +490,9 @@ string generate_move_data_text(Json data) { << read_json_binary(data_entry["aiTargetingFlags"], 2) << read_json_int(data_entry["maxPP"], 1) << read_json_int(data_entry["weight"], 1) - << read_json_int(data_entry["accuracy1"], 1) - << read_json_int(data_entry["accuracy2"], 1) - << read_json_int(data_entry["useChance"], 1) + << read_json_int(data_entry["accuracyGlobal"], 1) + << read_json_int(data_entry["accuracyOffensive"], 1) + << read_json_int(data_entry["accuracyUseChance"], 1) << read_json_int(data_entry["hitCount"], 1) << read_json_int(data_entry["unk12"], 1) << read_json_int(data_entry["criticalHitChance"], 1) |