mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-17 03:57:38 +01:00
Merge pull request #1516 from LOuroboros/holdEffects_BE
Adjusted the list of item hold effects
This commit is contained in:
commit
27516ed81c
@ -110,45 +110,46 @@
|
||||
#define HOLD_EFFECT_ROWAP_BERRY 104
|
||||
#define HOLD_EFFECT_KEE_BERRY 105
|
||||
#define HOLD_EFFECT_MARANGA_BERRY 106
|
||||
#define HOLD_EFFECT_PLATE 107
|
||||
|
||||
// Gen5 hold effects
|
||||
#define HOLD_EFFECT_FLOAT_STONE 115
|
||||
#define HOLD_EFFECT_EVIOLITE 116
|
||||
#define HOLD_EFFECT_ASSAULT_VEST 117
|
||||
#define HOLD_EFFECT_DRIVE 118
|
||||
#define HOLD_EFFECT_GEMS 119
|
||||
#define HOLD_EFFECT_ROCKY_HELMET 120
|
||||
#define HOLD_EFFECT_AIR_BALLOON 121
|
||||
#define HOLD_EFFECT_RED_CARD 122
|
||||
#define HOLD_EFFECT_RING_TARGET 123
|
||||
#define HOLD_EFFECT_BINDING_BAND 124
|
||||
#define HOLD_EFFECT_EJECT_BUTTON 125
|
||||
#define HOLD_EFFECT_ABSORB_BULB 126
|
||||
#define HOLD_EFFECT_CELL_BATTERY 127
|
||||
#define HOLD_EFFECT_FLOAT_STONE 117
|
||||
#define HOLD_EFFECT_EVIOLITE 118
|
||||
#define HOLD_EFFECT_ASSAULT_VEST 119
|
||||
#define HOLD_EFFECT_DRIVE 120
|
||||
#define HOLD_EFFECT_GEMS 121
|
||||
#define HOLD_EFFECT_ROCKY_HELMET 122
|
||||
#define HOLD_EFFECT_AIR_BALLOON 123
|
||||
#define HOLD_EFFECT_RED_CARD 124
|
||||
#define HOLD_EFFECT_RING_TARGET 125
|
||||
#define HOLD_EFFECT_BINDING_BAND 126
|
||||
#define HOLD_EFFECT_EJECT_BUTTON 127
|
||||
#define HOLD_EFFECT_ABSORB_BULB 128
|
||||
#define HOLD_EFFECT_CELL_BATTERY 129
|
||||
|
||||
// Gen6 hold effects
|
||||
#define HOLD_EFFECT_FAIRY_POWER 129
|
||||
#define HOLD_EFFECT_MEGA_STONE 130
|
||||
#define HOLD_EFFECT_SAFETY_GOOGLES 131
|
||||
#define HOLD_EFFECT_LUMINOUS_MOSS 132
|
||||
#define HOLD_EFFECT_SNOWBALL 133
|
||||
#define HOLD_EFFECT_WEAKNESS_POLICY 134
|
||||
#define HOLD_EFFECT_FAIRY_POWER 139
|
||||
#define HOLD_EFFECT_MEGA_STONE 140
|
||||
#define HOLD_EFFECT_SAFETY_GOOGLES 141
|
||||
#define HOLD_EFFECT_LUMINOUS_MOSS 142
|
||||
#define HOLD_EFFECT_SNOWBALL 143
|
||||
#define HOLD_EFFECT_WEAKNESS_POLICY 144
|
||||
|
||||
// Gen7 hold effects
|
||||
#define HOLD_EFFECT_PROTECTIVE_PADS 149
|
||||
#define HOLD_EFFECT_TERRAIN_EXTENDER 150
|
||||
#define HOLD_EFFECT_SEEDS 151
|
||||
#define HOLD_EFFECT_ADRENALINE_ORB 152
|
||||
#define HOLD_EFFECT_MEMORY 153
|
||||
#define HOLD_EFFECT_PLATE 154
|
||||
#define HOLD_EFFECT_PROTECTIVE_PADS 154
|
||||
#define HOLD_EFFECT_TERRAIN_EXTENDER 155
|
||||
#define HOLD_EFFECT_SEEDS 156
|
||||
#define HOLD_EFFECT_ADRENALINE_ORB 157
|
||||
#define HOLD_EFFECT_MEMORY 158
|
||||
#define HOLD_EFFECT_Z_CRYSTAL 159
|
||||
|
||||
// Gen8 hold effects
|
||||
#define HOLD_EFFECT_UTILITY_UMBRELLA 155
|
||||
#define HOLD_EFFECT_EJECT_PACK 156
|
||||
#define HOLD_EFFECT_ROOM_SERVICE 157
|
||||
#define HOLD_EFFECT_BLUNDER_POLICY 158
|
||||
#define HOLD_EFFECT_HEAVY_DUTY_BOOTS 159
|
||||
#define HOLD_EFFECT_THROAT_SPRAY 160
|
||||
#define HOLD_EFFECT_UTILITY_UMBRELLA 169
|
||||
#define HOLD_EFFECT_EJECT_PACK 170
|
||||
#define HOLD_EFFECT_ROOM_SERVICE 171
|
||||
#define HOLD_EFFECT_BLUNDER_POLICY 172
|
||||
#define HOLD_EFFECT_HEAVY_DUTY_BOOTS 173
|
||||
#define HOLD_EFFECT_THROAT_SPRAY 174
|
||||
|
||||
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user