diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-03-10 22:59:38 -0500 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-03-10 22:59:38 -0500 |
| commit | 64651ef8188a0b3fd269959046914990181f9c27 (patch) | |
| tree | eb5d4205891b4bee5acfef8a73f59f42a3e3d536 | |
| parent | ddb9c518ec401262c85af61ab2ee385863d03ca4 (diff) | |
Renamed move boolean functions
| -rw-r--r-- | asm/code_80521D0.s | 6 | ||||
| -rw-r--r-- | include/moves.h | 6 | ||||
| -rw-r--r-- | src/moves.c | 6 | ||||
| -rw-r--r-- | src/type_chart.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index cd8fb28..df01702 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -2451,7 +2451,7 @@ _08053734: ldrb r1, [r1] strb r1, [r0] ldr r0, [sp, 0x18] - bl GetMoveTargetsUser + bl MoveTargetsUser lsls r0, 24 cmp r0, 0 beq _080537B4 @@ -2856,7 +2856,7 @@ _08053A86: cmp r0, 0x5 bne _08053AE8 ldr r0, [sp, 0x18] - bl GetMoveAffectedByMagicCoat + bl MoveAffectedByMagicCoat lsls r0, 24 cmp r0, 0 beq _08053B5C @@ -7222,7 +7222,7 @@ _08056156: cmp r0, 0x1 bne _080561A0 ldrh r0, [r7, 0x2] - bl GetMoveAffectedByMuzzled + bl MoveAffectedByMuzzled lsls r0, 24 cmp r0, 0 beq _080561A0 diff --git a/include/moves.h b/include/moves.h index a811f0b..24b5249 100644 --- a/include/moves.h +++ b/include/moves.h @@ -23,9 +23,9 @@ bool8 MoveDealsDirectDamage(struct PokemonMove *move); u32 GetMoveRangeType(struct PokemonMove *move); void sub_8092C84(u8 *buffer, u16 moveID); u8 *GetMoveUseText(u16 moveID); -bool8 GetMoveAffectedByMagicCoat(u16 moveID); -bool8 GetMoveTargetsUser(u16 moveID); -bool8 GetMoveAffectedByMuzzled(u16 moveID); +bool8 MoveAffectedByMagicCoat(u16 moveID); +bool8 MoveTargetsUser(u16 moveID); +bool8 MoveAffectedByMuzzled(u16 moveID); bool8 IsBlockedBySoundproof(struct PokemonMove *move); bool8 DoesMoveCharge(u16 move); diff --git a/src/moves.c b/src/moves.c index 1f11e37..3c3e8a9 100644 --- a/src/moves.c +++ b/src/moves.c @@ -297,17 +297,17 @@ u8 *GetMoveUseText(u16 moveID) return gMovesData[moveID].useText; } -bool8 GetMoveAffectedByMagicCoat(u16 moveID) +bool8 MoveAffectedByMagicCoat(u16 moveID) { return gMovesData[moveID].affectedByMagicCoat; } -bool8 GetMoveTargetsUser(u16 moveID) +bool8 MoveTargetsUser(u16 moveID) { return gMovesData[moveID].targetsUser; } -bool8 GetMoveAffectedByMuzzled(u16 moveID) +bool8 MoveAffectedByMuzzled(u16 moveID) { return gMovesData[moveID].affectedByMuzzled; } diff --git a/src/type_chart.c b/src/type_chart.c index 66a993a..ac2071c 100644 --- a/src/type_chart.c +++ b/src/type_chart.c @@ -15,7 +15,7 @@ const s16 gTypeEffectivenessChart[NUM_TYPES][NUM_TYPES] = { {NEUTRAL, NEUTRAL, RESIST, RESIST, SUPER, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST}, {NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, NEUTRAL, RESIST, RESIST, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, SUPER}, {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, NEUTRAL, IMMUNE}, - {NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, IMMUNE, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER}, + {NEUTRAL, NEUTRAL, SUPER, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, SUPER, NEUTRAL, IMMUNE, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, SUPER}, {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, RESIST}, {NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, SUPER, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, NEUTRAL, NEUTRAL, NEUTRAL, IMMUNE, RESIST}, {NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, NEUTRAL, NEUTRAL, RESIST, RESIST, NEUTRAL, RESIST, SUPER, NEUTRAL, NEUTRAL, RESIST, NEUTRAL, SUPER, RESIST}, |