Merge pull request #295 from AnonymousRandomPerson/main
Some checks failed
build / build (push) Has been cancelled

Add some move effect labels
This commit is contained in:
AnonymousRandomPerson
2026-08-24 22:23:34 -04:00
committed by GitHub
4 changed files with 25 additions and 25 deletions

View File

@@ -366,12 +366,12 @@
.public MonsterCannotAttack
.public MoveHitCheck
.public ov10_022BFD6C
.public ov10_022C4480
.public ov10_022C4504
.public ov10_022C4508
.public EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
.public SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
.public FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
.public ov10_022C45F8
.public ov10_022C460C
.public ov10_022C4614
.public ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
.public BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
.public ov10_022C483C
.public ov29_022E3FCC
.public ov29_022E4110

View File

@@ -125,8 +125,8 @@ SITRUS_BERRY_HP_RESTORATION:
.global AMBER_TEAR_RECRUIT_BOOST
AMBER_TEAR_RECRUIT_BOOST:
.byte 0x96, 0x00, 0x00, 0x00
.global ov10_022C4480
ov10_022C4480:
.global EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE:
.byte 0x14, 0x00, 0x00, 0x00
.global MUDDY_WATER_LOWER_ACCURACY_CHANCE
MUDDY_WATER_LOWER_ACCURACY_CHANCE:
@@ -224,11 +224,11 @@ FRIEND_BOW_FAST_FRIEND_BOOST:
.global OCTAZOOKA_LOWER_ACCURACY_CHANCE
OCTAZOOKA_LOWER_ACCURACY_CHANCE:
.byte 0x3C, 0x00, 0x00, 0x00
.global ov10_022C4504
ov10_022C4504:
.global SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE:
.byte 0x14, 0x00, 0x00, 0x00
.global ov10_022C4508
ov10_022C4508:
.global FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE:
.byte 0x14, 0x00, 0x00, 0x00
.global LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE
LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE:

View File

@@ -104,14 +104,14 @@ METEOR_MASH_BOOST_ATTACK_CHANCE:
.global CRUSH_CLAW_LOWER_DEFENSE_CHANCE
CRUSH_CLAW_LOWER_DEFENSE_CHANCE:
.byte 0x32, 0x00, 0x00, 0x00
.global ov10_022C460C
ov10_022C460C:
.global ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
ACID_PSYCHIC_LOWER_DEFENSE_CHANCE:
.byte 0x14, 0x00, 0x00, 0x00
.global BURN_DAMAGE_COOLDOWN
BURN_DAMAGE_COOLDOWN:
.byte 0x32, 0x00, 0x00, 0x00
.global ov10_022C4614
ov10_022C4614:
.global BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE:
.byte 0x14, 0x00, 0x00, 0x00
.global ov10_022C4618
ov10_022C4618:

View File

@@ -32,15 +32,15 @@ ExecuteMoveEffect: ; 0x0232E864
ldr r5, _0232F7BC ; =FOREWARN_FORCED_MISS_CHANCE
str r0, [sp, #0x30]
ldrsh r0, [r5]
ldr r4, _0232F7C0 ; =ov10_022C460C
ldr r4, _0232F7C0 ; =ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
ldrh r6, [r8, #4]
str r0, [sp, #0x2c]
ldrsh r0, [r4]
ldr r2, _0232F7C4 ; =ov10_022C4480
ldr ip, _0232F7C8 ; =ov10_022C4614
ldr r2, _0232F7C4 ; =EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
ldr ip, _0232F7C8 ; =BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
str r0, [sp, #0x28]
ldrsh r0, [r2]
ldr lr, _0232F7CC ; =ov10_022C4508
ldr lr, _0232F7CC ; =FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
mov sb, r1
str r0, [sp, #0x24]
ldrsh r0, [ip]
@@ -50,7 +50,7 @@ ExecuteMoveEffect: ; 0x0232E864
ldrsh r0, [lr]
mov r7, r3
str r0, [sp, #0x1c]
ldr r0, _0232F7D4 ; =ov10_022C4504
ldr r0, _0232F7D4 ; =SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
ldrsh r0, [r0]
str r0, [sp, #0x18]
mov r0, #1
@@ -1106,12 +1106,12 @@ _0232F7B0: .word SPATK_STAT_IDX
_0232F7B4: .word ov10_022C483C
_0232F7B8: .word ATK_STAT_IDX
_0232F7BC: .word FOREWARN_FORCED_MISS_CHANCE
_0232F7C0: .word ov10_022C460C
_0232F7C4: .word ov10_022C4480
_0232F7C8: .word ov10_022C4614
_0232F7CC: .word ov10_022C4508
_0232F7C0: .word ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
_0232F7C4: .word EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
_0232F7C8: .word BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
_0232F7CC: .word FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
_0232F7D0: .word ov29_02353718
_0232F7D4: .word ov10_022C4504
_0232F7D4: .word SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
_0232F7D8: .word DUNGEON_PTR
_0232F7DC: .word 0x00000EAB + EXECUTE_MOVE_EFFECT_DATA_OFFSET
_0232F7E0: .word 0x00000EAC + EXECUTE_MOVE_EFFECT_DATA_OFFSET