summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-23 10:55:08 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-23 10:55:08 -0400
commit0a4315909d6456cd5f83e9df32198ee47b985d68 (patch)
tree6100b29253f004c38dc6665fea97e66c2061c038
parent582fefc54bc40ffb0b00034916a3b1e1bbc35965 (diff)
Use HOLD_EFFECT consts in GetArceusTypeByHeldItemEffect
-rw-r--r--arm9/src/pokemon.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 8be66329..39739474 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -3257,37 +3257,37 @@ u32 GetArceusTypeByHeldItemEffect(u16 heldEffect)
{
switch (heldEffect)
{
- case 0x7D:
+ case HOLD_EFFECT_ARCEUS_FIRE:
return TYPE_FIRE;
- case 0x7E:
+ case HOLD_EFFECT_ARCEUS_WATER:
return TYPE_WATER;
- case 0x7F:
+ case HOLD_EFFECT_ARCEUS_ELECTRIC:
return TYPE_ELECTRIC;
- case 0x80:
+ case HOLD_EFFECT_ARCEUS_GRASS:
return TYPE_GRASS;
- case 0x81:
+ case HOLD_EFFECT_ARCEUS_ICE:
return TYPE_ICE;
- case 0x82:
+ case HOLD_EFFECT_ARCEUS_FIGHT:
return TYPE_FIGHTING;
- case 0x83:
+ case HOLD_EFFECT_ARCEUS_POISON:
return TYPE_POISON;
- case 0x84:
+ case HOLD_EFFECT_ARCEUS_GROUND:
return TYPE_GROUND;
- case 0x85:
+ case HOLD_EFFECT_ARCEUS_FLYING:
return TYPE_FLYING;
- case 0x86:
+ case HOLD_EFFECT_ARCEUS_PSYCHIC:
return TYPE_PSYCHIC;
- case 0x87:
+ case HOLD_EFFECT_ARCEUS_BUG:
return TYPE_BUG;
- case 0x88:
+ case HOLD_EFFECT_ARCEUS_ROCK:
return TYPE_ROCK;
- case 0x89:
+ case HOLD_EFFECT_ARCEUS_GHOST:
return TYPE_GHOST;
- case 0x8A:
+ case HOLD_EFFECT_ARCEUS_DRAGON:
return TYPE_DRAGON;
- case 0x8B:
+ case HOLD_EFFECT_ARCEUS_DARK:
return TYPE_DARK;
- case 0x8C:
+ case HOLD_EFFECT_ARCEUS_STEEL:
return TYPE_STEEL;
default:
return TYPE_NORMAL;