Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

src/battle_engine/battle_help.c

@@ -143,7 +143,7 @@ u8 battle_item_get_effect(u8 bank, u8 check_negating_effects) {
             custom_battle_elements.ptr->bank_affecting[bank].embargo)
             return ITEM_EFFECT_NOEFFECT;
     }
-    if (battle_participants[bank].held_item == ITEM_ENIGMABERRY) {
+    if (battle_participants[bank].held_item == ITEM_ENIGMABEERE) {
         return battle_enigma_berry[bank].battle_effect_x12;
     } else {
         return item_get_x12(battle_participants[bank].held_item);

src/include/constants/abilities.h

@@ -1,198 +1,467 @@
 #ifndef ABILITY_IDS
-#define ABILITY_IDS
+#define ABILITY_ABILITY_IDS
 
+/* Deutsche Symbolnamen */
+#define ABILITY_KEINS 0
+#define ABILITY_DUFTNOTE 1
+#define ABILITY_NIESEL 2
+#define ABILITY_TEMPOSCHUB 3
+#define ABILITY_KAMPFPANZER 4
+#define ABILITY_ROBUSTHEIT 5
+#define ABILITY_FEUCHTIGKEIT 6
+#define ABILITY_FLEXIBILITAET 7
+#define ABILITY_SANDSCHLEIER 8
+#define ABILITY_STATIK 9
+#define ABILITY_VOLTABSORBER 10
+#define ABILITY_H2O_ABSORBER 11
+#define ABILITY_DOESIGKEIT 12
+#define ABILITY_WOLKE_SIEBEN 13
+#define ABILITY_FACETTENAUGE 14
+#define ABILITY_INSOMNIA 15
+#define ABILITY_FARBWECHSEL 16
+#define ABILITY_IMMUNITAET 17
+#define ABILITY_FEUERFAENGER 18
+#define ABILITY_PUDERABWEHR 19
+#define ABILITY_TEMPOMACHER 20
+#define ABILITY_SAUGNAPF 21
+#define ABILITY_BEDROHER 22
+#define ABILITY_WEGSPERRE 23
+#define ABILITY_RAUHAUT 24
+#define ABILITY_WUNDERWACHE 25
+#define ABILITY_SCHWEBE 26
+#define ABILITY_SPORENWIRT 27
+#define ABILITY_SYNCHRO 28
+#define ABILITY_NEUTRALTORSO 29
+#define ABILITY_INNERE_KRAFT 30
+#define ABILITY_BLITZFAENGER 31
+#define ABILITY_EDELMUT 32
+#define ABILITY_WASSERTEMPO 33
+#define ABILITY_CHLOROPHYLL 34
+#define ABILITY_ERLEUCHTUNG 35
+#define ABILITY_FAEHRTE 36
+#define ABILITY_KRAFTKOLOSS 37
+#define ABILITY_GIFTDORN 38
+#define ABILITY_KONZENTRATOR 39
+#define ABILITY_MAGMAPANZER 40
+#define ABILITY_AQUAHUELLE 41
+#define ABILITY_MAGNETFALLE 42
+#define ABILITY_LAERMSCHUTZ 43
+#define ABILITY_REGENGENUSS 44
+#define ABILITY_SANDSTURM 45
+#define ABILITY_ERZWINGER 46
+#define ABILITY_SPECKSCHICHT 47
+#define ABILITY_FRUEHWECKER 48
+#define ABILITY_FLAMMKOERPER 49
+#define ABILITY_ANGSTHASE 50
+#define ABILITY_ADLERAUGE 51
+#define ABILITY_SCHERENMACHT 52
+#define ABILITY_MITNAHME 53
+#define ABILITY_SCHNARCHNASE 54
+#define ABILITY_UEBEREIFER 55
+#define ABILITY_CHARMEBOLZEN 56
+#define ABILITY_PLUS 57
+#define ABILITY_MINUS 58
+#define ABILITY_PROGNOSE 59
+#define ABILITY_WERTEHALTER 60
+#define ABILITY_EXPIDERMIS 61
+#define ABILITY_ADRENALIN 62
+#define ABILITY_NOTSCHUTZ 63
+#define ABILITY_KLOAKENSOSSE 64
+#define ABILITY_NOTDUENGER 65
+#define ABILITY_GROSSBRAND 66
+#define ABILITY_STURZBACH 67
+#define ABILITY_HEXAPLAGA 68
+#define ABILITY_STEINHAUPT 69
+#define ABILITY_DUERRE 70
+#define ABILITY_AUSWEGLOS 71
+#define ABILITY_MUNTERKEIT 72
+#define ABILITY_PULVERRAUCH 73
+#define ABILITY_MENTALKRAFT 74
+#define ABILITY_PANZERHAUT 75
+#define ABILITY_KLIMASCHUTZ 76
+#define ABILITY_FUSSANGEL 77
+#define ABILITY_STARTHILFE 78
+#define ABILITY_RIVALITAET 79
+#define ABILITY_FELSENFEST 80
+#define ABILITY_SCHNEEMANTEL 81
+#define ABILITY_VOELLEREI 82
+#define ABILITY_KURZSCHLUSS 83
+#define ABILITY_ENTLASTUNG 84
+#define ABILITY_HITZESCHUTZ 85
+#define ABILITY_WANKELMUT 86
+#define ABILITY_TROCKENHEIT 87
+#define ABILITY_DOWNLOAD 88
+#define ABILITY_EISENFAUST 89
+#define ABILITY_AUFHEBER 90
+#define ABILITY_ANPASSUNG 91
+#define ABILITY_WERTELINK 92
+#define ABILITY_HYDRATION 93
+#define ABILITY_SOLARKRAFT 94
+#define ABILITY_RASANZ 95
+#define ABILITY_REGULIERUNG 96
+#define ABILITY_SUPERSCHUETZE 97
+#define ABILITY_MAGIESCHILD 98
+#define ABILITY_SCHILDLOS 99
+#define ABILITY_ZEITSPIEL 100
+#define ABILITY_TECHNIKER 101
+#define ABILITY_FLORASCHILD 102
+#define ABILITY_TOLLPATSCH 103
+#define ABILITY_UEBERBRUECKUNG 104
+#define ABILITY_GLUECKSPILZ 105
+#define ABILITY_FINALSCHLAG 106
+#define ABILITY_VORAHNUNG 107
+#define ABILITY_VORWARNUNG 108
+#define ABILITY_UNKENNTNIS 109
+#define ABILITY_AUFWERTUNG 110
+#define ABILITY_FILTER 111
+#define ABILITY_SAUMSELIG 112
+#define ABILITY_RAUFLUST 113
+#define ABILITY_STURMSOG 114
+#define ABILITY_EISHAUT 115
+#define ABILITY_FELSKERN 116
+#define ABILITY_HAGELALARM 117
+#define ABILITY_HONIGMAUL 118
+#define ABILITY_SCHNUEFFLER 119
+#define ABILITY_ACHTLOS 120
+#define ABILITY_VARIABILITAET 121
+#define ABILITY_PFLANZENGABE 122
+#define ABILITY_ALPTRAUM 123
+#define ABILITY_LANGFINGER 124
+#define ABILITY_ROHE_GEWALT 125
+#define ABILITY_UMKEHRUNG 126
+#define ABILITY_ANSPANNUNG 127
+#define ABILITY_SIEGESWILLE 128
+#define ABILITY_SCHWAECHLING 129
+#define ABILITY_TASTFLUCH 130
+#define ABILITY_HEILHERZ 131
+#define ABILITY_FREUNDESHUT 132
+#define ABILITY_BRUCHRUESTUNG 133
+#define ABILITY_SCHWERMETALL 134
+#define ABILITY_LEICHTMETALL 135
+#define ABILITY_MULTISCHUPPE 136
+#define ABILITY_GIFTWAHN 137
+#define ABILITY_HITZEWAHN 138
+#define ABILITY_REICHE_ERNTE 139
+#define ABILITY_TELEPATHIE 140
+#define ABILITY_GEFUEHLSWIPPE 141
+#define ABILITY_WETTERFEST 142
+#define ABILITY_GIFTGRIFF 143
+#define ABILITY_BELEBEKRAFT 144
+#define ABILITY_BRUSTBIETER 145
+#define ABILITY_SANDSCHARRER 146
+#define ABILITY_WUNDERHAUT 147
+#define ABILITY_ANALYSE 148
+#define ABILITY_TRUGBILD 149
+#define ABILITY_DOPPELGAENGER 150
+#define ABILITY_SCHWEBEDURCH 151
+#define ABILITY_MUMIE 152
+#define ABILITY_HOCHMUT 153
+#define ABILITY_REDLICHKEIT 154
+#define ABILITY_HASENFUSS 155
+#define ABILITY_MAGIESPIEGEL 156
+#define ABILITY_VEGETARIER 157
+#define ABILITY_STROLCH 158
+#define ABILITY_SANDGEWALT 159
+#define ABILITY_EISENSTACHEL 160
+#define ABILITY_TRANCE_MODUS 161
+#define ABILITY_TRIUMPHSTERN 162
+#define ABILITY_TURBOBRAND 163
+#define ABILITY_TERAVOLT 164
+#define ABILITY_DUFTHUELLE 165
+#define ABILITY_BLUETENHUELLE 166
+#define ABILITY_BACKENTASCHEN 167
+#define ABILITY_WANDLUNGSKUNST 168
+#define ABILITY_FELLKLEID 169
+#define ABILITY_ZAUBERER 170
+#define ABILITY_KUGELSICHER 171
+#define ABILITY_UNBEUGSAMKEIT 172
+#define ABILITY_TITANKIEFER 173
+#define ABILITY_FROSTSCHICHT 174
+#define ABILITY_ZUCKERHUELLE 175
+#define ABILITY_TAKTIKWECHSEL 176
+#define ABILITY_ORKANSCHWINGEN 177
+#define ABILITY_MEGAWUMME 178
+#define ABILITY_PFLANZENPELZ 179
+#define ABILITY_NUTZNIESSER 180
+#define ABILITY_KRALLENWUCHT 181
+#define ABILITY_FEENSCHICHT 182
+#define ABILITY_VISKOSITAET 183
+#define ABILITY_ZENITHAUT 184
+#define ABILITY_FAMILIENBANDE 185
+#define ABILITY_DUNKELAURA 186
+#define ABILITY_FEENAURA 187
+#define ABILITY_AURA_UMKEHR 188
+#define ABILITY_URMEER 189
+#define ABILITY_ENDLAND 190
+#define ABILITY_DELTA_WIND 191
+#define ABILITY_ZAEHIGKEIT 192
+#define ABILITY_REISSAUS 193
+#define ABILITY_RUECKZUG 194
+#define ABILITY_VERKLUMPEN 195
+#define ABILITY_QUAELEREI 196
+#define ABILITY_LIMITSCHILD 197
+#define ABILITY_BESCHATTUNG 198
+#define ABILITY_WASSERBLASE 199
+#define ABILITY_STAHLPROFI 200
+#define ABILITY_WUTAUSBRUCH 201
+#define ABILITY_SCHNEESCHARRER 202
+#define ABILITY_LANGSTRECKE 203
+#define ABILITY_PLAETSCHERSTIMME 204
+#define ABILITY_HEILWANDEL 205
+#define ABILITY_ELEKTROHAUT 206
+#define ABILITY_SURF_SCHWEIF 207
+#define ABILITY_FISCHSCHWARM 208
+#define ABILITY_KOSTUEMSPUK 209
+#define ABILITY_FREUNDSCHAFTSAKT 210
+#define ABILITY_SCHARWANDEL 211
+#define ABILITY_KORROSION 212
+#define ABILITY_DAUERSCHLAF 213
+#define ABILITY_MAJESTAET 214
+#define ABILITY_MAGENKREMPLER 215
+#define ABILITY_TAENZER 216
+#define ABILITY_BATTERIE 217
+#define ABILITY_FLAUSCHIGKEIT 218
+#define ABILITY_BUNTKOERPER 219
+#define ABILITY_SEELENHERZ 220
+#define ABILITY_LOCKENKOPF 221
+#define ABILITY_RECEIVER 222
+#define ABILITY_CHEMIEKRAFT 223
+#define ABILITY_BESTIEN_BOOST 224
+#define ABILITY_ALPHA_SYSTEM 225
+#define ABILITY_ELEKTRO_ERZEUGER 226
+#define ABILITY_PSYCHO_ERZEUGER 227
+#define ABILITY_NEBEL_ERZEUGER 228
+#define ABILITY_GRAS_ERZEUGER 229
+#define ABILITY_METALLPROTEKTOR 230
+#define ABILITY_PHANTOMSCHUTZ 231
+#define ABILITY_PRISMARUESTUNG 232
+#define ABILITY_ZEREBRALMACHT 233
+
+/*Englische Symbolnamen*/
+#define ABILITY_STENCH ABILITY_DUFTNOTE
+#define ABILITY_DRIZZLE ABILITY_NIESEL
+#define ABILITY_SPEED_BOOST ABILITY_TEMPOSCHUB
+#define ABILITY_BATTLE_ARMOR ABILITY_KAMPFPANZER
+#define ABILITY_STURDY ABILITY_ROBUSTHEIT
+#define ABILITY_DAMP ABILITY_FEUCHTIGKEIT
+#define ABILITY_LIMBER ABILITY_FLEXIBILITAET
+#define ABILITY_SAND_VEIL ABILITY_SANDSCHLEIER
+#define ABILITY_STATIC ABILITY_STATIK
+#define ABILITY_VOLT_ABSORB ABILITY_VOLTABSORBER
+#define ABILITY_WATER_ABSORB ABILITY_H2O_ABSORBER
+#define ABILITY_OBLIVIOUS ABILITY_DOESIGKEIT
+#define ABILITY_CLOUD_NINE ABILITY_WOLKE_SIEBEN
+#define ABILITY_COMPOUNDEYES ABILITY_FACETTENAUGE
+#define ABILITY_COLOR_CHANGE ABILITY_FARBWECHSEL
+#define ABILITY_IMMUNITY ABILITY_IMMUNITAET
+#define ABILITY_FLASH_FIRE ABILITY_FEUERFAENGER
+#define ABILITY_SHIELD_DUST ABILITY_PUDERABWEHR
+#define ABILITY_OWN_TEMPO ABILITY_TEMPOMACHER
+#define ABILITY_SUCTION_CUPS ABILITY_SAUGNAPF
+#define ABILITY_INTIMIDATE ABILITY_BEDROHER
+#define ABILITY_SHADOW_TAG ABILITY_WEGSPERRE
+#define ABILITY_ROUGH_SKIN ABILITY_RAUHAUT
+#define ABILITY_WONDER_GUARD ABILITY_WUNDERWACHE
+#define ABILITY_LEVITATE ABILITY_SCHWEBE
+#define ABILITY_EFFECT_SPORE ABILITY_SPORENWIRT
+#define ABILITY_SYNCHRONIZE ABILITY_SYNCHRO
+#define ABILITY_CLEAR_BODY ABILITY_NEUTRALTORSO
+#define ABILITY_NATURAL_CURE ABILITY_INNERE_KRAFT
+#define ABILITY_LIGHTNINGROD ABILITY_BLITZFAENGER
+#define ABILITY_SERENE_GRACE ABILITY_EDELMUT
+#define ABILITY_SWIFT_SWIM ABILITY_WASSERTEMPO
+#define ABILITY_ILLUMINATE ABILITY_ERLEUCHTUNG
+#define ABILITY_TRACE ABILITY_FAEHRTE
+#define ABILITY_HUGE_POWER ABILITY_KRAFTKOLOSS
+#define ABILITY_POISON_POINT ABILITY_GIFTDORN
+#define ABILITY_INNER_FOCUS ABILITY_KONZENTRATOR
+#define ABILITY_MAGMA_ARMOR ABILITY_MAGMAPANZER
+#define ABILITY_WATER_VEIL ABILITY_AQUAHUELLE
+#define ABILITY_MAGNET_PULL ABILITY_MAGNETFALLE
+#define ABILITY_SOUNDPROOF ABILITY_LAERMSCHUTZ
+#define ABILITY_RAIN_DISH ABILITY_REGENGENUSS
+#define ABILITY_SAND_STREAM ABILITY_SANDSTURM
+#define ABILITY_PRESSURE ABILITY_ERZWINGER
+#define ABILITY_THICK_FAT ABILITY_SPECKSCHICHT
+#define ABILITY_EARLY_BIRD ABILITY_FRUEHWECKER
+#define ABILITY_FLAME_BODY ABILITY_FLAMMKOERPER
+#define ABILITY_RUN_AWAY ABILITY_ANGSTHASE
+#define ABILITY_KEEN_EYE ABILITY_ADLERAUGE
+#define ABILITY_HYPER_CUTTER ABILITY_SCHERENMACHT
+#define ABILITY_PICKUP ABILITY_MITNAHME
+#define ABILITY_TRUANT ABILITY_SCHNARCHNASE
+#define ABILITY_HUSTLE ABILITY_UEBEREIFER
+#define ABILITY_CUTE_CHARM ABILITY_CHARMEBOLZEN
+#define ABILITY_FORECAST ABILITY_PROGNOSE
+#define ABILITY_STICKY_HOLD ABILITY_WERTEHALTER
+#define ABILITY_SHED_SKIN ABILITY_EXPIDERMIS
+#define ABILITY_GUTS ABILITY_ADRENALIN
+#define ABILITY_MARVEL_SCALE ABILITY_NOTSCHUTZ
+#define ABILITY_LIQUID_OOZE ABILITY_KLOAKENSOSSE
+#define ABILITY_OVERGROW ABILITY_NOTDUENGER
+#define ABILITY_BLAZE ABILITY_GROSSBRAND
+#define ABILITY_TORRENT ABILITY_STURZBACH
+#define ABILITY_SWARM ABILITY_HEXAPLAGA
+#define ABILITY_ROCK_HEAD ABILITY_STEINHAUPT
+#define ABILITY_DROUGHT ABILITY_DUERRE
+#define ABILITY_ARENA_TRAP ABILITY_AUSWEGLOS
+#define ABILITY_VITAL_SPIRIT ABILITY_MUNTERKEIT
+#define ABILITY_WHITE_SMOKE ABILITY_PULVERRAUCH
+#define ABILITY_PURE_POWER ABILITY_MENTALKRAFT
+#define ABILITY_SHELL_ARMOR ABILITY_PANZERHAUT
+#define ABILITY_AIR_LOCK ABILITY_KLIMASCHUTZ
+#define ABILITY_TANGLED_FEET ABILITY_FUSSANGEL
+#define ABILITY_MOTOR_DRIVE ABILITY_STARTHILFE
+#define ABILITY_RIVALRY ABILITY_RIVALITAET
+#define ABILITY_STEADFAST ABILITY_FELSENFEST
+#define ABILITY_SNOW_CLOAK ABILITY_SCHNEEMANTEL
+#define ABILITY_GLUTTONY ABILITY_VOELLEREI
+#define ABILITY_ANGER_POINT ABILITY_KURZSCHLUSS
+#define ABILITY_UNBURDEN ABILITY_ENTLASTUNG
+#define ABILITY_HEATPROOF ABILITY_HITZESCHUTZ
+#define ABILITY_SIMPLE ABILITY_WANKELMUT
+#define ABILITY_DRY_SKIN ABILITY_TROCKENHEIT
+#define ABILITY_IRON_FIST ABILITY_EISENFAUST
+#define ABILITY_POISON_HEAL ABILITY_AUFHEBER
+#define ABILITY_ADAPTABILITY ABILITY_ANPASSUNG
+#define ABILITY_SKILL_LINK ABILITY_WERTELINK
+#define ABILITY_SOLAR_POWER ABILITY_SOLARKRAFT
+#define ABILITY_QUICK_FEET ABILITY_RASANZ
+#define ABILITY_NORMALIZE ABILITY_REGULIERUNG
+#define ABILITY_SNIPER ABILITY_SUPERSCHUETZE
+#define ABILITY_MAGIC_GUARD ABILITY_MAGIESCHILD
+#define ABILITY_NO_GUARD ABILITY_SCHILDLOS
+#define ABILITY_STALL ABILITY_ZEITSPIEL
+#define ABILITY_TECHNICIAN ABILITY_TECHNIKER
+#define ABILITY_LEAF_GUARD ABILITY_FLORASCHILD
+#define ABILITY_KLUTZ ABILITY_TOLLPATSCH
+#define ABILITY_MOLD_BREAKER ABILITY_UEBERBRUECKUNG
+#define ABILITY_SUPER_LUCK ABILITY_GLUECKSPILZ
+#define ABILITY_AFTERMATH ABILITY_FINALSCHLAG
+#define ABILITY_ANTICIPATION ABILITY_VORAHNUNG
+#define ABILITY_FOREWARN ABILITY_VORWARNUNG
+#define ABILITY_UNAWARE ABILITY_UNKENNTNIS
+#define ABILITY_TINTED_LENS ABILITY_AUFWERTUNG
+#define ABILITY_SLOW_START ABILITY_SAUMSELIG
+#define ABILITY_SCRAPPY ABILITY_RAUFLUST
+#define ABILITY_STORM_DRAIN ABILITY_STURMSOG
+#define ABILITY_ICE_BODY ABILITY_EISHAUT
+#define ABILITY_SOLID_ROCK ABILITY_FELSKERN
+#define ABILITY_SNOW_WARNING ABILITY_HAGELALARM
+#define ABILITY_HONEY_GATHER ABILITY_HONIGMAUL
+#define ABILITY_FRISK ABILITY_SCHNUEFFLER
+#define ABILITY_RECKLESS ABILITY_ACHTLOS
+#define ABILITY_MULTITYPE ABILITY_VARIABILITAET
+#define ABILITY_FLOWER_GIFT ABILITY_PFLANZENGABE
+#define ABILITY_BAD_DREAMS ABILITY_ALPTRAUM
+#define ABILITY_PICKPOCKET ABILITY_LANGFINGER
+#define ABILITY_SHEER_FORCE ABILITY_ROHE_GEWALT
+#define ABILITY_CONTRARY ABILITY_UMKEHRUNG
+#define ABILITY_UNNERVE ABILITY_ANSPANNUNG
+#define ABILITY_DEFIANT ABILITY_SIEGESWILLE
+#define ABILITY_DEFEATIST ABILITY_SCHWAECHLING
+#define ABILITY_CURSED_BODY ABILITY_TASTFLUCH
+#define ABILITY_HEALER ABILITY_HEILHERZ
+#define ABILITY_FRIEND_GUARD ABILITY_FREUNDESHUT
+#define ABILITY_WEAK_ARMOR ABILITY_BRUCHRUESTUNG
+#define ABILITY_HEAVY_METAL ABILITY_SCHWERMETALL
+#define ABILITY_LIGHT_METAL ABILITY_LEICHTMETALL
+#define ABILITY_MULTISCALE ABILITY_MULTISCHUPPE
+#define ABILITY_TOXIC_BOOST ABILITY_GIFTWAHN
+#define ABILITY_FLARE_BOOST ABILITY_HITZEWAHN
+#define ABILITY_HARVEST ABILITY_REICHE_ERNTE
+#define ABILITY_TELEPATHY ABILITY_TELEPATHIE
+#define ABILITY_MOODY ABILITY_GEFUEHLSWIPPE
+#define ABILITY_OVERCOAT ABILITY_WETTERFEST
+#define ABILITY_POISON_TOUCH ABILITY_GIFTGRIFF
+#define ABILITY_REGENERATOR ABILITY_BELEBEKRAFT
+#define ABILITY_BIG_PECKS ABILITY_BRUSTBIETER
+#define ABILITY_SAND_RUSH ABILITY_SANDSCHARRER
+#define ABILITY_WONDER_SKIN ABILITY_WUNDERHAUT
+#define ABILITY_ANALYTIC ABILITY_ANALYSE
+#define ABILITY_ILLUSION ABILITY_TRUGBILD
+#define ABILITY_IMPOSTER ABILITY_DOPPELGAENGER
+#define ABILITY_INFILTRATOR ABILITY_SCHWEBEDURCH
+#define ABILITY_MUMMY ABILITY_MUMIE
+#define ABILITY_MOXIE ABILITY_HOCHMUT
+#define ABILITY_JUSTIFIED ABILITY_REDLICHKEIT
+#define ABILITY_RATTLED ABILITY_HASENFUSS
+#define ABILITY_MAGIC_BOUNCE ABILITY_MAGIESPIEGEL
+#define ABILITY_SAP_SIPPER ABILITY_VEGETARIER
+#define ABILITY_PRANKSTER ABILITY_STROLCH
+#define ABILITY_SAND_FORCE ABILITY_SANDGEWALT
+#define ABILITY_IRON_BARBS ABILITY_EISENSTACHEL
+#define ABILITY_ZEN_MODE ABILITY_TRANCE_MODUS
+#define ABILITY_VICTORY_STAR ABILITY_TRIUMPHSTERN
+#define ABILITY_TURBOBLAZE ABILITY_TURBOBRAND
+#define ABILITY_AROMA_VEIL ABILITY_DUFTHUELLE
+#define ABILITY_FLOWER_VEIL ABILITY_BLUETENHUELLE
+#define ABILITY_CHEEK_POUCH ABILITY_BACKENTASCHEN
+#define ABILITY_PROTEAN ABILITY_WANDLUNGSKUNST
+#define ABILITY_FUR_COAT ABILITY_FELLKLEID
+#define ABILITY_MAGICIAN ABILITY_ZAUBERER
+#define ABILITY_BULLETPROOF ABILITY_KUGELSICHER
+#define ABILITY_COMPETITIVE ABILITY_UNBEUGSAMKEIT
+#define ABILITY_STRONG_JAW ABILITY_TITANKIEFER
+#define ABILITY_REFRIGERATE ABILITY_FROSTSCHICHT
+#define ABILITY_SWEET_VEIL ABILITY_ZUCKERHUELLE
+#define ABILITY_STANCE_CHANGE ABILITY_TAKTIKWECHSEL
+#define ABILITY_GALE_WINGS ABILITY_ORKANSCHWINGEN
+#define ABILITY_MEGA_LAUNCHER ABILITY_MEGAWUMME
+#define ABILITY_GRASS_PELT ABILITY_PFLANZENPELZ
+#define ABILITY_SYMBIOSIS ABILITY_NUTZNIESSER
+#define ABILITY_TOUGH_CLAWS ABILITY_KRALLENWUCHT
+#define ABILITY_PIXILATE ABILITY_FEENSCHICHT
+#define ABILITY_GOOEY ABILITY_VISKOSITAET
+#define ABILITY_AERILATE ABILITY_ZENITHAUT
+#define ABILITY_PARENTAL_BOND ABILITY_FAMILIENBANDE
+#define ABILITY_DARK_AURA ABILITY_DUNKELAURA
+#define ABILITY_FAIRY_AURA ABILITY_FEENAURA
+#define ABILITY_AURA_BREAK ABILITY_AURA_UMKEHR
+#define ABILITY_PRIMORDIAL_SEA ABILITY_URMEER
+#define ABILITY_DESOLATE_LAND ABILITY_ENDLAND
+#define ABILITY_DELTA_STREAM ABILITY_DELTA_WIND
+#define ABILITY_STAMINA ABILITY_ZAEHIGKEIT
+#define ABILITY_WIMP_OUT ABILITY_REISSAUS
+#define ABILITY_EMERGENCY_EXIT ABILITY_RUECKZUG
+#define ABILITY_WATER_COMPACTION ABILITY_VERKLUMPEN
+#define ABILITY_MERCILESS ABILITY_QUAELEREI
+#define ABILITY_SHIELDS_DOWN ABILITY_LIMITSCHILD
+#define ABILITY_STAKEOUT ABILITY_BESCHATTUNG
+#define ABILITY_WATER_BUBBLE ABILITY_WASSERBLASE
+#define ABILITY_STEELWORKER ABILITY_STAHLPROFI
+#define ABILITY_BERSERK ABILITY_WUTAUSBRUCH
+#define ABILITY_SLUSH_RUSH ABILITY_SCHNEESCHARRER
+#define ABILITY_LONG_REACH ABILITY_LANGSTRECKE
+#define ABILITY_LIQUID_VOICE ABILITY_PLAETSCHERSTIMME
+#define ABILITY_TRIAGE ABILITY_HEILWANDEL
+#define ABILITY_GALVANIZE ABILITY_ELEKTROHAUT
+#define ABILITY_SURGE_SURFER ABILITY_SURF_SCHWEIF
+#define ABILITY_SCHOOLING ABILITY_FISCHSCHWARM
+#define ABILITY_DISGUISE ABILITY_KOSTUEMSPUK
+#define ABILITY_BATTLE_BOND ABILITY_FREUNDSCHAFTSAKT
+#define ABILITY_POWER_CONSTRUCT ABILITY_SCHARWANDEL
+#define ABILITY_CORROSION ABILITY_KORROSION
+#define ABILITY_COMATOSE ABILITY_DAUERSCHLAF
+#define ABILITY_QUEENLY_MAJESTY ABILITY_MAJESTAET
+#define ABILITY_INNARDS_OUT ABILITY_MAGENKREMPLER
+#define ABILITY_DANCER ABILITY_TAENZER
+#define ABILITY_BATTERY ABILITY_BATTERIE
+#define ABILITY_FLUFFY ABILITY_FLAUSCHIGKEIT
+#define ABILITY_DAZZLING ABILITY_BUNTKOERPER
+#define ABILITY_SOUL_HEART ABILITY_SEELENHERZ
+#define ABILITY_TANGLING_HAIR ABILITY_LOCKENKOPF
+#define ABILITY_POWER_OF_ALCHEMY ABILITY_CHEMIEKRAFT
+#define ABILITY_BEAST_BOOST ABILITY_BESTIEN_BOOST
+#define ABILITY_RKS_SYSTEM ABILITY_ALPHA_SYSTEM
+#define ABILITY_ELECTRIC_SURGE ABILITY_ELEKTRO_ERZEUGER
+#define ABILITY_PSYCHIC_SURGE ABILITY_PSYCHO_ERZEUGER
+#define ABILITY_MISTY_SURGE ABILITY_NEBEL_ERZEUGER
+#define ABILITY_GRASSY_SURGE ABILITY_GRAS_ERZEUGER
+#define ABILITY_FULL_METAL_BODY ABILITY_METALLPROTEKTOR
+#define ABILITY_SHADOW_SHIELD ABILITY_PHANTOMSCHUTZ
+#define ABILITY_PRISM_ARMOR ABILITY_PRISMARUESTUNG
+#define ABILITY_NEUROFORCE ABILITY_ZEREBRALMACHT
 
-#define ABILITY_NO_ABILITY 0x0
-#define ABILITY_STENCH 0x1
-#define ABILITY_DRIZZLE 0x2
-#define ABILITY_SPEED_BOOST 0x3
-#define ABILITY_BATTLE_ARMOR 0x4
-#define ABILITY_STURDY 0x5
-#define ABILITY_DAMP 0x6
-#define ABILITY_LIMBER 0x7
-#define ABILITY_SAND_VEIL 0x8
-#define ABILITY_STATIC 0x9
-#define ABILITY_VOLT_ABSORB 0xA
-#define ABILITY_WATER_ABSORB 0xB
-#define ABILITY_OBLIVIOUS 0xC
-#define ABILITY_CLOUD_NINE 0xD
-#define ABILITY_COMPOUND_EYES 0xE
-#define ABILITY_INSOMNIA 0xF
-#define ABILITY_COLOR_CHANGE 0x10
-#define ABILITY_IMMUNITY 0x11
-#define ABILITY_FLASH_FIRE 0x12
-#define ABILITY_SHIELD_DUST 0x13
-#define ABILITY_OWN_TEMPO 0x14
-#define ABILITY_SUCTION_CUPS 0x15
-#define ABILITY_INTIMIDATE 0x16
-#define ABILITY_SHADOW_TAG 0x17
-#define ABILITY_ROUGH_SKIN 0x18
-#define ABILITY_WONDER_GUARD 0x19
-#define ABILITY_LEVITATE 0x1A
-#define ABILITY_EFFECT_SPORE 0x1B
-#define ABILITY_SYNCHRONIZE 0x1C
-#define ABILITY_CLEAR_BODY 0x1D
-#define ABILITY_NATURAL_CURE 0x1E
-#define ABILITY_LIGHTNING_ROD 0x1F
-#define ABILITY_SERENE_GRACE 0x20
-#define ABILITY_SWIFT_SWIM 0x21
-#define ABILITY_CHLOROPHYLL 0x22
-#define ABILITY_ILLUMINATE 0x23
-#define ABILITY_TRACE 0x24
-#define ABILITY_HUGE_POWER 0x25
-#define ABILITY_POISON_POINT 0x26
-#define ABILITY_INNER_FOCUS 0x27
-#define ABILITY_MAGMA_ARMOR 0x28
-#define ABILITY_WATER_VEIL 0x29
-#define ABILITY_MAGNET_PULL 0x2A
-#define ABILITY_SOUNDPROOF 0x2B
-#define ABILITY_RAIN_DISH 0x2C
-#define ABILITY_SAND_STREAM 0x2D
-#define ABILITY_PRESSURE 0x2E
-#define ABILITY_THICK_FAT 0x2F
-#define ABILITY_EARLY_BIRD 0x30
-#define ABILITY_FLAME_BODY 0x31
-#define ABILITY_RUN_AWAY 0x32
-#define ABILITY_KEEN_EYE 0x33
-#define ABILITY_HYPER_CUTTER 0x34
-#define ABILITY_PICKUP 0x35
-#define ABILITY_TRUANT 0x36
-#define ABILITY_HUSTLE 0x37
-#define ABILITY_CUTE_CHARM 0x38
-#define ABILITY_PLUS 0x39
-#define ABILITY_MINUS 0x3A
-#define ABILITY_FORECAST 0x3B
-#define ABILITY_STICKY_HOLD 0x3C
-#define ABILITY_SHED_SKIN 0x3D
-#define ABILITY_GUTS 0x3E
-#define ABILITY_MARVEL_SCALE 0x3F
-#define ABILITY_LIQUID_OOZE 0x40
-#define ABILITY_OVERGROW 0x41
-#define ABILITY_BLAZE 0x42
-#define ABILITY_TORRENT 0x43
-#define ABILITY_SWARM 0x44
-#define ABILITY_ROCK_HEAD 0x45
-#define ABILITY_DROUGHT 0x46
-#define ABILITY_ARENA_TRAP 0x47
-#define ABILITY_VITAL_SPIRIT 0x48
-#define ABILITY_WHITE_SMOKE 0x49
-#define ABILITY_PURE_POWER 0x4A
-#define ABILITY_SHELL_ARMOR 0x4B
-#define ABILITY_AIR_LOCK 0x4C
-#define ABILITY_TANGLED_FEET 0x4D
-#define ABILITY_MOTOR_DRIVE 0x4E
-#define ABILITY_RIVALRY 0x4F
-#define ABILITY_STEADFAST 0x50
-#define ABILITY_SNOW_CLOAK 0x51
-#define ABILITY_GLUTTONY 0x52
-#define ABILITY_ANGER_POINT 0x53
-#define ABILITY_UNBURDEN 0x54
-#define ABILITY_HEATPROOF 0x55
-#define ABILITY_SIMPLE 0x56
-#define ABILITY_DRY_SKIN 0x57
-#define ABILITY_DOWNLOAD 0x58
-#define ABILITY_IRON_FIST 0x59
-#define ABILITY_POISON_HEAL 0x5A
-#define ABILITY_ADAPTABILITY 0x5B
-#define ABILITY_SKILL_LINK 0x5C
-#define ABILITY_HYDRATION 0x5D
-#define ABILITY_SOLAR_POWER 0x5E
-#define ABILITY_QUICK_FEET 0x5F
-#define ABILITY_NORMALIZE 0x60
-#define ABILITY_SNIPER 0x61
-#define ABILITY_MAGIC_GUARD 0x62
-#define ABILITY_NO_GUARD 0x63
-#define ABILITY_STALL 0x64
-#define ABILITY_TECHNICIAN 0x65
-#define ABILITY_LEAF_GUARD 0x66
-#define ABILITY_KLUTZ 0x67
-#define ABILITY_MOLD_BREAKER 0x68
-#define ABILITY_SUPER_LUCK 0x69
-#define ABILITY_AFTERMATH 0x6A
-#define ABILITY_ANTICIPATION 0x6B
-#define ABILITY_FOREWARN 0x6C
-#define ABILITY_UNAWARE 0x6D
-#define ABILITY_TINTED_LENS 0x6E
-#define ABILITY_FILTER 0x6F
-#define ABILITY_SLOW_START 0x70
-#define ABILITY_SCRAPPY 0x71
-#define ABILITY_STORM_DRAIN 0x72
-#define ABILITY_ICE_BODY 0x73
-#define ABILITY_SOLID_ROCK 0x74
-#define ABILITY_SNOW_WARNING 0x75
-#define ABILITY_HONEY_GATHER 0x76
-#define ABILITY_FRISK 0x77
-#define ABILITY_RECKLESS 0x78
-#define ABILITY_MULTITYPE 0x79
-#define ABILITY_FLOWER_GIFT 0x7A
-#define ABILITY_BAD_DREAMS 0x7B
-#define ABILITY_PICKPOCKET 0x7C
-#define ABILITY_SHEER_FORCE 0x7D
-#define ABILITY_CONTRARY 0x7E
-#define ABILITY_UNNERVE 0x7F
-#define ABILITY_DEFIANT 0x80
-#define ABILITY_DEFEATIST 0x81
-#define ABILITY_CURSED_BODY 0x82
-#define ABILITY_HEALER 0x83
-#define ABILITY_FRIEND_GUARD 0x84
-#define ABILITY_WEAK_ARMOR 0x85
-#define ABILITY_HEAVY_METAL 0x86
-#define ABILITY_LIGHT_METAL 0x87
-#define ABILITY_MULTISCALE 0x88
-#define ABILITY_TOXIC_BOOST 0x89
-#define ABILITY_FLARE_BOOST 0x8A
-#define ABILITY_HARVEST 0x8B
-#define ABILITY_TELEPATHY 0x8C
-#define ABILITY_MOODY 0x8D
-#define ABILITY_OVERCOAT 0x8E
-#define ABILITY_POISON_TOUCH 0x8F
-#define ABILITY_REGENERATOR 0x90
-#define ABILITY_BIG_PECKS 0x91
-#define ABILITY_SAND_RUSH 0x92
-#define ABILITY_WONDER_SKIN 0x93
-#define ABILITY_ANALYTIC 0x94
-#define ABILITY_ILLUSION 0x95
-#define ABILITY_IMPOSTER 0x96
-#define ABILITY_INFILTRATOR 0x97
-#define ABILITY_MUMMY 0x98
-#define ABILITY_MOXIE 0x99
-#define ABILITY_JUSTIFIED 0x9A
-#define ABILITY_RATTLED 0x9B
-#define ABILITY_MAGIC_BOUNCE 0x9C
-#define ABILITY_SAP_SIPPER 0x9D
-#define ABILITY_PRANKSTER 0x9E
-#define ABILITY_SAND_FORCE 0x9F
-#define ABILITY_IRON_BARBS 0xA0
-#define ABILITY_ZEN_MODE 0xA1
-#define ABILITY_VICTORY_STAR 0xA2
-#define ABILITY_TURBOBLAZE 0xA3
-#define ABILITY_TERAVOLT 0xA4
-#define ABILITY_AROMA_VEIL 0xA5
-#define ABILITY_FLOWER_VEIL 0xA6
-#define ABILITY_CHEEK_POUCH 0xA7
-#define ABILITY_PROTEAN 0xA8
-#define ABILITY_FUR_COAT 0xA9
-#define ABILITY_MAGICIAN 0xAA
-#define ABILITY_BULLETPROOF 0xAB
-#define ABILITY_COMPETITIVE 0xAC
-#define ABILITY_STRONG_JAW 0xAD
-#define ABILITY_REFRIGERATE 0xAE
-#define ABILITY_SWEET_VEIL 0xAF
-#define ABILITY_STANCE_CHANGE 0xB0
-#define ABILITY_GALE_WINGS 0xB1
-#define ABILITY_MEGA_LAUNCHER 0xB2
-#define ABILITY_GRASS_PELT 0xB3
-#define ABILITY_SYMBIOSIS 0xB4
-#define ABILITY_TOUGH_CLAWS 0xB5
-#define ABILITY_PIXILATE 0xB6
-#define ABILITY_GOOEY 0xB7
-#define ABILITY_AERILATE 0xB8
-#define ABILITY_PARENTAL_BOND 0xB9
-#define ABILITY_DARK_AURA 0xBA
-#define ABILITY_FAIRY_AURA 0xBB
-#define ABILITY_AURA_BREAK 0xBC
-#define ABILITY_PRIMORDIA_SEA 0xBD
-#define ABILITY_DESOLATE_LAND 0xBE
-#define ABILITY_DELTA_STREAM 0xBF
 
 #endif /* ABILITY_IDS_H */

src/include/constants/dexcolor.h

@@ -0,0 +1,15 @@
+#ifndef DEXCOLOR_S_
+#define DEXCOLOR_S_
+
+#define DEXCOLOR_ROT 0x0
+#define DEXCOLOR_BLAU 0x1
+#define DEXCOLOR_GELB 0x2
+#define DEXCOLOR_GRUEN 0x3
+#define DEXCOLOR_SCHWARZ 0x4
+#define DEXCOLOR_BRAUN 0x5
+#define DEXCOLOR_VIOLETT 0x6
+#define DEXCOLOR_GRAU 0x7
+#define DEXCOLOR_WEISS 0x8
+#define DEXCOLOR_ROSA 0x9
+
+#endif

src/include/constants/egggroup.h

@@ -0,0 +1,20 @@
+#ifndef EGGGROUP_S_
+#define EGGGROUP_S_
+
+#define EGGGROUP_MONSTER 0x1
+#define EGGGROUP_WASSER1 0x2
+#define EGGGROUP_KAEFER 0x3
+#define EGGGROUP_FLUG 0x4
+#define EGGGROUP_FELD 0x5
+#define EGGGROUP_FEE 0x6
+#define EGGGROUP_GRASS 0x7
+#define EGGGROUP_HUMANOTYP 0x8
+#define EGGGROUP_WASSER3 0x9
+#define EGGGROUP_MINERAL 0xA
+#define EGGGROUP_AMORPH 0xB
+#define EGGGROUP_WASSER2 0xC
+#define EGGGROUP_DITTO 0xD
+#define EGGGROUP_DRACHE 0xE
+#define EGGGROUP_UNBEKANNT 0xF
+
+#endif

src/include/constants/ep.h

@@ -0,0 +1,11 @@
+#ifndef EP_S_
+#define EP_S_
+
+#define EP_SCHNELL 0x0
+#define EP_SEHR_LANGSAM 0x1
+#define EP_SEHR_SCHNELL 0x2
+#define EP_NORMAL 0x3
+#define EP_SCHNELLER 0x4
+#define EP_LANGSAM 0x5
+
+#endif

src/include/constants/gender.h

@@ -0,0 +1,13 @@
+#ifndef GENDER_S_
+#define GENDER_S_
+
+#define GENDER_M_100 0x0
+#define GENDER_M_87_F_12 0x1F
+#define GENDER_M_75_F_25 0x3F
+#define GENDER_M_50_F_50 0x7F
+#define GENDER_M_25_F_75 0xBF
+#define GENDER_M_12_F_87 0xDF
+#define GENDER_F_100 0xFE
+#define GENDER_KEINS 0xFF
+
+#endif

src/include/constants/items.h

@@ -1,6 +1,720 @@
 #ifndef ITEM_IDS_H
 #define ITEM_IDS_H
 
-#define ITEM_ENIGMABERRY 0xAF
+#define ITEM_KEINS 0x0
+#define ITEM_MEISTERBALL 0x1
+#define ITEM_HYPERBALL 0x2
+#define ITEM_SUPERBALL 0x3
+#define ITEM_POKEBALL 0x4
+#define ITEM_SAFARIBALL 0x5
+#define ITEM_NETZBALL 0x6
+#define ITEM_TAUCHBALL 0x7
+#define ITEM_NESTBALL 0x8
+#define ITEM_WIEDERBALL 0x9
+#define ITEM_TIMERBALL 0xA
+#define ITEM_LUXUSBALL 0xB
+#define ITEM_PREMIERBALL 0xC
+#define ITEM_TRANK 0xD
+#define ITEM_GEGENGIFT 0xE
+#define ITEM_FEUERHEILER 0xF
+#define ITEM_EISHEILER 0x10
+#define ITEM_AUFWECKER 0x11
+#define ITEM_PARA_HEILER 0x12
+#define ITEM_TOP_GENESUNG 0x13
+#define ITEM_TOP_TRANK 0x14
+#define ITEM_HYPERTRANK 0x15
+#define ITEM_SUPERTRANK 0x16
+#define ITEM_HYPERHEILER 0x17
+#define ITEM_BELEBER 0x18
+#define ITEM_TOP_BELEBER 0x19
+#define ITEM_TAFELWASSER 0x1A
+#define ITEM_SPRUFEL 0x1B
+#define ITEM_LIMONADE 0x1C
+#define ITEM_KUHMUH_MILCH 0x1D
+#define ITEM_ENERGIESTAUB 0x1E
+#define ITEM_KRAFTWURZEL 0x1F
+#define ITEM_HEILPUDER 0x20
+#define ITEM_VITALKRAUT 0x21
+#define ITEM_AETHER 0x22
+#define ITEM_TOP_AETHER 0x23
+#define ITEM_ELIXIER 0x24
+#define ITEM_TOP_ELIXIER 0x25
+#define ITEM_LAVAKEKS 0x26
+#define ITEM_BLAUE_FLOETE 0x27
+#define ITEM_GELBE_FLOETE 0x28
+#define ITEM_ROTE_FLOETE 0x29
+#define ITEM_SCHW_FLOETE 0x2A
+#define ITEM_WEISSE_FLOETE 0x2B
+#define ITEM_BEERENSAFT 0x2C
+#define ITEM_ZAUBERASCHE 0x2D
+#define ITEM_KUESTENSALZ 0x2E
+#define ITEM_KUESTENSCHALE 0x2F
+#define ITEM_PURPURSTUECK 0x30
+#define ITEM_INIDGOSTUECK 0x31
+#define ITEM_GELBSTUECK 0x32
+#define ITEM_GRUENSTUECK 0x33
+#define ITEM_HERZKONFEKT 0x34
+#define ITEM_GALETTE 0x35
+#define ITEM_SPEZIALITAET 0x36
+#define ITEM_STRATOS_EIS 0x37
+#define ITEM_WUTKEKS 0x38
+#define ITEM_YANTARASABLE 0x39
+#define ITEM_ZAUBERFEDER 0x3A
+#define ITEM_HONIG 0x3B
+#define ITEM_POKEWEDEL 0x3C
+#define ITEM_RABATTMARKE 0x3D
+#define ITEM_FAEHIGKAPSEL 0x3E
+#define ITEM_KP_PLUS 0x3F
+#define ITEM_PROTEIN 0x40
+#define ITEM_EISEN 0x41
+#define ITEM_CARBON 0x42
+#define ITEM_KALZIUM 0x43
+#define ITEM_SONERBONBON 0x44
+#define ITEM_AP_PLUS 0x45
+#define ITEM_ZINK 0x46
+#define ITEM_AP_TOP 0x47
+#define ITEM_ULTRATRANK 0x48
+#define ITEM_MEGABLOCK 0x49
+#define ITEM_ANGRIFFPLUS 0x4A
+#define ITEM_X_ANGRIFF 0x4B
+#define ITEM_X_ABWEHR 0x4C
+#define ITEM_X_TEMPO 0x4D
+#define ITEM_X_TREFFER 0x4E
+#define ITEM_X_SPEZIAL 0x4F
+#define ITEM_POKEPUPPE 0x50
+#define ITEM_ENECO_RUTE 0x51
+#define ITEM_X_SPVERT 0x52
+#define ITEM_SUPERSCHUTZ 0x53
+#define ITEM_TOP_SCHUTZ 0x54
+#define ITEM_FLUCHTSEIL 0x55
+#define ITEM_SCHUTZ 0x56
+#define ITEM_ABWEHRFEDER 0x57
+#define ITEM_ESPRITFEDER 0x58
+#define ITEM_FLINKFEDER 0x59
+#define ITEM_GENIEFEDER 0x5A
+#define ITEM_HEILFEDER 0x5B
+#define ITEM_KRAFTFEDER 0x5C
+#define ITEM_SONNENSTEIN 0x5D
+#define ITEM_MONDSTEIN 0x5E
+#define ITEM_FEUERSTEIN 0x5F
+#define ITEM_DONNERSTEIN 0x60
+#define ITEM_WASSERSTEIN 0x61
+#define ITEM_BLATTSTEIN 0x62
+#define ITEM_FINSTERSTEIN 0x63
+#define ITEM_FUNKELSTEIN 0x64
+#define ITEM_LEUCHTSTEIN 0x65
+#define ITEM_SHOCKER 0x66
+#define ITEM_IM_SCHOCKER 0x67
+#define ITEM_MINIPILZ 0x68
+#define ITEM_RIESENPILZ 0x69
+#define ITEM_PERLE 0x6A
+#define ITEM_RIESENPERLE 0x6B
+#define ITEM_STERNENSTAUB 0x6C
+#define ITEM_STERNENSTUECK 0x6D
+#define ITEM_HERZSCHUPPE 0x6E
+#define ITEM_KOAKOBEERE 0x6F
+#define ITEM_FOEPASBEERE 0x70
+#define ITEM_KERZALBEERE 0x71
+#define ITEM_GRINDOBEERE 0x72
+#define ITEM_KIROYABEERE 0x73
+#define ITEM_ROSPELBEERE 0x74
+#define ITEM_GRARZBEERE 0x75
+#define ITEM_SCHUKEBEERE 0x76
+#define ITEM_KOBABEERE 0x77
+#define ITEM_PYAPABEERE 0x78
+#define ITEM_TANIGABEERE 0x79
+#define ITEM_CHIARIBEERE 0x7A
+#define ITEM_ZITARZBEERE 0x7B
+#define ITEM_TERIROBEERE 0x7C
+#define ITEM_BURLEOBEERE 0x7D
+#define ITEM_BABIRIBEERE 0x7E
+#define ITEM_LATCHIBEERE 0x7F
+#define ITEM_WUNFRUBEERE 0x80
+#define ITEM_EIPFELBEERE 0x81
+#define ITEM_JABOCABEERE 0x82
+#define ITEM_ROSELBEERE 0x83
+#define ITEM_HIBISBEERE 0x84
+#define ITEM_AMRENABEERE 0x85
+#define ITEM_MARONBEERE 0x86
+#define ITEM_PIRSIFBEERE 0x87
+#define ITEM_FRAGIABEERE 0x88
+#define ITEM_WILBIRBEERE 0x89
+#define ITEM_JONAGOBEERE 0x8A
+#define ITEM_SINELBEERE 0x8B
+#define ITEM_PERSIMBEERE 0x8C
+#define ITEM_PRUNUSBEERE 0x8D
+#define ITEM_TSITRUBEERE 0x8E
+#define ITEM_GIEFEBEERE 0x8F
+#define ITEM_WIKIBEERE 0x90
+#define ITEM_MAGOBEERE 0x91
+#define ITEM_GAUVEBEERE 0x92
+#define ITEM_YAPABEERE 0x93
+#define ITEM_HIMMIHBEERE 0x94
+#define ITEM_MORBBEERE 0x95
+#define ITEM_NANABEERE 0x96
+#define ITEM_NIRBEBEERE 0x97
+#define ITEM_SANANABEERE 0x98
+#define ITEM_GRANABEERE 0x99
+#define ITEM_SETANGBEERE 0x9A
+#define ITEM_QUALOTBEERE 0x9B
+#define ITEM_HONMELBEERE 0x9C
+#define ITEM_LABRUSBEERE 0x9D
+#define ITEM_TAMOTBEERE 0x9E
+#define ITEM_SAIMBEERE 0x9F
+#define ITEM_MAGOSTBEERE 0xA0
+#define ITEM_RABUTABEERE 0xA1
+#define ITEM_TRONZIBEERE 0xA2
+#define ITEM_KIWANBEERE 0xA3
+#define ITEM_PALLMBEERE 0xA4
+#define ITEM_WASMELBEERE 0xA5
+#define ITEM_DURINBEERE 0xA6
+#define ITEM_MYRTILBEERE 0xA7
+#define ITEM_LYDZIBEERE 0xA8
+#define ITEM_LIGANBEERE 0xA9
+#define ITEM_SALKABEERE 0xAA
+#define ITEM_TAHAYBEERE 0xAB
+#define ITEM_APIKOBEERE 0xAC
+#define ITEM_LANSATBEERE 0xAD
+#define ITEM_KRAMBOBEERE 0xAE
+#define ITEM_ENIGMABEERE 0xAF
+#define ITEM_AKIBEERE 0xB0
+#define ITEM_TARABEERE 0xB1
+#define ITEM_BANNGEFAESS 0xB2
+#define ITEM_BLENDPUDER 0xB3
+#define ITEM_SCHLOHKRAUT 0xB4
+#define ITEM_MACHOBAND 0xB5
+#define ITEM_EP_TEILER 0xB6
+#define ITEM_FLINKKLAUE 0xB7
+#define ITEM_SANFTGLOCKE 0xB8
+#define ITEM_MENTALKRAUT 0xB9
+#define ITEM_WAHLBAND 0xBA
+#define ITEM_KING_STEIN 0xBB
+#define ITEM_SILBERSTAUB 0xBC
+#define ITEM_MUENZAMULETT 0xBD
+#define ITEM_SCHUTZBAND 0xBE
+#define ITEM_SEELENTAU 0xBF
+#define ITEM_ABYSSZAHN 0xC0
+#define ITEM_ABYSSPLATTE 0xC1
+#define ITEM_RAUCHBALL 0xC2
+#define ITEM_EWIGSTEIN 0xC3
+#define ITEM_FOKUS_BAND 0xC4
+#define ITEM_GLUECKS_EI 0xC5
+#define ITEM_SCOPE_LINSE 0xC6
+#define ITEM_METALLMANTEL 0xC7
+#define ITEM_UEBERRESTE 0xC8
+#define ITEM_DRACHENHAUT 0xC9
+#define ITEM_KUGELBLITZ 0xCA
+#define ITEM_PUDERSAND 0xCB
+#define ITEM_GRANITSTEIN 0xCC
+#define ITEM_WUNDERSAAT 0xCD
+#define ITEM_SCHATTENGLAS 0xCE
+#define ITEM_SCHWARZGURT 0xCF
+#define ITEM_MAGNET 0xD0
+#define ITEM_ZAUBERWASSER 0xD1
+#define ITEM_HACKATTACK 0xD2
+#define ITEM_GIFTSTICH 0xD3
+#define ITEM_EWIGES_EIS 0xD4
+#define ITEM_BANNSTICKER 0xD5
+#define ITEM_KRUMMLOEFFEL 0xD6
+#define ITEM_HOLZKOHLE 0xD7
+#define ITEM_DRACHENZAHN 0xD8
+#define ITEM_SEIDENSCHAL 0xD9
+#define ITEM_UPGRADE 0xDA
+#define ITEM_SEEGESANG 0xDB
+#define ITEM_SEERAUCH 0xDC
+#define ITEM_LAXRAUCH 0xDD
+#define ITEM_LUCKY_PUNCH 0xDE
+#define ITEM_METALLSTAUB 0xDF
+#define ITEM_KAMPFKNOCHEN 0xE0
+#define ITEM_LAUCHSTANGE 0xE1
+#define ITEM_AKKU 0xE2
+#define ITEM_BEULENHELM 0xE3
+#define ITEM_EISBROCKEN 0xE4
+#define ITEM_GLATTBROCKEN 0xE5
+#define ITEM_HEISSBROCKEN 0xE6
+#define ITEM_NASSBROCKEN 0xE7
+#define ITEM_EISENKUGEL 0xE8
+#define ITEM_EVOLITH 0xE9
+#define ITEM_FATUMKNOTEN 0xEA
+#define ITEM_FLUCHTKNOPF 0xEB
+#define ITEM_GIFTSCHLEIM 0xEC
+#define ITEM_GROSSLINSE 0xED
+#define ITEM_SCHLAUGLAS 0xEE
+#define ITEM_ZOOMLINSE 0xEF
+#define ITEM_GRIFFKLAUE 0xF0
+#define ITEM_GROSSWURZEL 0xF1
+#define ITEM_EXPERTENGURT 0xF2
+#define ITEM_FOKUSGURT 0xF3
+#define ITEM_KLAMMERBAND 0xF4
+#define ITEM_KLETTDORN 0xF5
+#define ITEM_KNOLLE 0xF6
+#define ITEM_ENERGIEKRAUT 0xF7
+#define ITEM_LEICHTSTEIN 0xF8
+#define ITEM_LEUCHTMOOS 0xF9
+#define ITEM_LICHTLEHM 0xFA
+#define ITEM_LUFTBALLON 0xFB
+#define ITEM_METRONOM 0xFC
+#define ITEM_MUSKELBAND 0xFD
+#define ITEM_OFFENWESTE 0xFE
+#define ITEM_HEISS_ORB 0xFF
+#define ITEM_LEBEN_ORB 0x100
+#define ITEM_TOXIK_ORB 0x101
+#define ITEM_ROTE_KARTE 0x102
+#define ITEM_SCHARFKLAUE 0x103
+#define ITEM_SCHARFZAHN 0x104
+#define ITEM_SCHNEEBALL 0x105
+#define ITEM_SCHUTZBRILLE 0x106
+#define ITEM_SCHWSCHUTZ 0x107
+#define ITEM_SCHWERSCHWEIF 0x108
+#define ITEM_WAHLGLAS 0x109
+#define ITEM_WAHLSCHAL 0x10A
+#define ITEM_WECHSELHUELLE 0x10B
+#define ITEM_ZIELSCHEIBE 0x10C
+#define ITEM_BODENJUWEL 0x10D
+#define ITEM_DRAKOJUWEL 0x10E
+#define ITEM_EISJUWEL 0x10F
+#define ITEM_ELEKTROJUWEL 0x110
+#define ITEM_GEISTJUWEL 0x111
+#define ITEM_GESTEINJUWEL 0x112
+#define ITEM_GIFTJUWEL 0x113
+#define ITEM_FEUERJUWEL 0x114
+#define ITEM_FLUGJUWEL 0x115
+#define ITEM_KAEFERJUWEL 0x116
+#define ITEM_KAMPFJUWEL 0x117
+#define ITEM_NORMALJUWEL 0x118
+#define ITEM_PFLANZJUWEL 0x119
+#define ITEM_PSYCHOJUWEL 0x11A
+#define ITEM_STAHLJUWEL 0x11B
+#define ITEM_UNLICHTJUWEL 0x11C
+#define ITEM_WASSERJUWEL 0x11D
+#define ITEM_FEENJUWEL 0x11E
+#define ITEM_WAHRSPIEGEL 0x11F
+#define ITEM_GRACIDEA 0x120
+#define ITEM_TM_71 0x121
+#define ITEM_TM_72 0x122
+#define ITEM_TM_73 0x123
+#define ITEM_TM_74 0x124
+#define ITEM_TM_75 0x125
+#define ITEM_TM_76 0x126
+#define ITEM_TM_77 0x127
+#define ITEM_TM_78 0x128
+#define ITEM_TM_79 0x129
+#define ITEM_TM_80 0x12A
+#define ITEM_TM_81 0x12B
+#define ITEM_TM_82 0x12C
+#define ITEM_TM_83 0x12D
+#define ITEM_TM_84 0x12E
+#define ITEM_TM_85 0x12F
+#define ITEM_TM_86 0x130
+#define ITEM_TM_87 0x131
+#define ITEM_TM_88 0x132
+#define ITEM_TM_89 0x133
+#define ITEM_TM_90 0x134
+#define ITEM_TM_91 0x135
+#define ITEM_TM_92 0x136
+#define ITEM_TM_93 0x137
+#define ITEM_TM_94 0x138
+#define ITEM_TM_95 0x139
+#define ITEM_TM_96 0x13A
+#define ITEM_TM_97 0x13B
+#define ITEM_TM_98 0x13C
+#define ITEM_TM_99 0x13D
+#define ITEM_TM_100 0x13E
+#define ITEM_TM_101 0x13F
+#define ITEM_TM_102 0x140
+#define ITEM_TM_103 0x141
+#define ITEM_TM_104 0x142
+#define ITEM_TM_105 0x143
+#define ITEM_TM_106 0x144
+#define ITEM_TM_107 0x145
+#define ITEM_TM_108 0x146
+#define ITEM_TM_109 0x147
+#define ITEM_TM_110 0x148
+#define ITEM_TM_111 0x149
+#define ITEM_TM_112 0x14A
+#define ITEM_TM_113 0x14B
+#define ITEM_TM_114 0x14C
+#define ITEM_TM_115 0x14D
+#define ITEM_TM_116 0x14E
+#define ITEM_TM_117 0x14F
+#define ITEM_TM_118 0x150
+#define ITEM_TM_119 0x151
+#define ITEM_TM_120 0x152
+#define ITEM_VM_01 0x153
+#define ITEM_VM_02 0x154
+#define ITEM_VM_03 0x155
+#define ITEM_VM_04 0x156
+#define ITEM_VM_05 0x157
+#define ITEM_VM_06 0x158
+#define ITEM_VM_07 0x159
+#define ITEM_VM_08 0x15A
+#define ITEM_HELIXFOSSIL 0x15B
+#define ITEM_DOMFOSSIL 0x15C
+#define ITEM_ALTBERNSTEIN 0x15D
+#define ITEM_KLAUENFOSSIL 0x15E
+#define ITEM_WURZELFOSSIL 0x15F
+#define ITEM_KOPFFOSSIL 0x160
+#define ITEM_PANZERFOSSIL 0x161
+#define ITEM_SCHILDFOSSIL 0x162
+#define ITEM_FEDERFOSSIL 0x163
+#define ITEM_KIEFERFOSSIL 0x164
+#define ITEM_FLOSSENFOS 0x165
+#define ITEM_METEORIT 0x166
+#define ITEM_DNS_KEIL 0x167
+#define ITEM_FAHRRAD 0x168
+#define ITEM_KARTE 0x169
+#define ITEM_KAMPFFAHNDER 0x16A
+#define ITEM_RUHMESDATEI 0x16B
+#define ITEM_VMTM_BOX 0x16C
+#define ITEM_BEERENTUETE 0x16D
+#define ITEM_ITEMRADAR 0x16E
+#define ITEM_MUENZKORB 0x16F
+#define ITEM_POKEFLOETE 0x170
+#define ITEM_ANGEL 0x171
+#define ITEM_PROFIANGEL 0x172
+#define ITEM_SUPERANGEL 0x173
+#define ITEM_ENTONKANNE 0x174
+#define ITEM_WUESTENGLAS 0x175
+#define ITEM_SILPH_SCOPE 0x176
+#define ITEM_TM_01 0x177
+#define ITEM_TM_02 0x178
+#define ITEM_TM_03 0x179
+#define ITEM_TM_04 0x17A
+#define ITEM_TM_05 0x17B
+#define ITEM_TM_06 0x17C
+#define ITEM_TM_07 0x17D
+#define ITEM_TM_08 0x17E
+#define ITEM_TM_09 0x17F
+#define ITEM_TM_10 0x180
+#define ITEM_TM_11 0x181
+#define ITEM_TM_12 0x182
+#define ITEM_TM_13 0x183
+#define ITEM_TM_14 0x184
+#define ITEM_TM_15 0x185
+#define ITEM_TM_16 0x186
+#define ITEM_TM_17 0x187
+#define ITEM_TM_18 0x188
+#define ITEM_TM_19 0x189
+#define ITEM_TM_20 0x18A
+#define ITEM_TM_21 0x18B
+#define ITEM_TM_22 0x18C
+#define ITEM_TM_23 0x18D
+#define ITEM_TM_24 0x18E
+#define ITEM_TM_25 0x18F
+#define ITEM_TM_26 0x190
+#define ITEM_TM_27 0x191
+#define ITEM_TM_28 0x192
+#define ITEM_TM_29 0x193
+#define ITEM_TM_30 0x194
+#define ITEM_TM_31 0x195
+#define ITEM_TM_32 0x196
+#define ITEM_TM_33 0x197
+#define ITEM_TM_34 0x198
+#define ITEM_TM_35 0x199
+#define ITEM_TM_36 0x19A
+#define ITEM_TM_37 0x19B
+#define ITEM_TM_38 0x19C
+#define ITEM_TM_39 0x19D
+#define ITEM_TM_40 0x19E
+#define ITEM_TM_41 0x19F
+#define ITEM_TM_42 0x1A0
+#define ITEM_TM_43 0x1A1
+#define ITEM_TM_44 0x1A2
+#define ITEM_TM_45 0x1A3
+#define ITEM_TM_46 0x1A4
+#define ITEM_TM_47 0x1A5
+#define ITEM_TM_48 0x1A6
+#define ITEM_TM_49 0x1A7
+#define ITEM_TM_50 0x1A8
+#define ITEM_TM_51 0x1A9
+#define ITEM_TM_52 0x1AA
+#define ITEM_TM_53 0x1AB
+#define ITEM_TM_54 0x1AC
+#define ITEM_TM_55 0x1AD
+#define ITEM_TM_56 0x1AE
+#define ITEM_TM_57 0x1AF
+#define ITEM_TM_58 0x1B0
+#define ITEM_TM_59 0x1B1
+#define ITEM_TM_60 0x1B2
+#define ITEM_TM_61 0x1B3
+#define ITEM_TM_62 0x1B4
+#define ITEM_TM_63 0x1B5
+#define ITEM_TM_64 0x1B6
+#define ITEM_TM_65 0x1B7
+#define ITEM_TM_66 0x1B8
+#define ITEM_TM_67 0x1B9
+#define ITEM_TM_68 0x1BA
+#define ITEM_TM_69 0x1BB
+#define ITEM_TM_70 0x1BC
+#define ITEM_X_ANGRIFF_2 0x1BD
+#define ITEM_X_ABWEHR_2 0x1BE
+#define ITEM_X_TEMPO_2 0x1BF
+#define ITEM_X_TREFFER_2 0x1C0
+#define ITEM_X_SPEZIAL_2 0x1C1
+#define ITEM_X_SPVERT_2 0x1C2
+#define ITEM_X_ANGRIFF_3 0x1C3
+#define ITEM_X_ABWEHR_3 0x1C4
+#define ITEM_X_TEMPO_3 0x1C5
+#define ITEM_X_TREFFER_3 0x1C6
+#define ITEM_X_SPEZIAL_3 0x1C7
+#define ITEM_X_SPVERT_3 0x1C8
+#define ITEM_X_ANGRIFF_6 0x1C9
+#define ITEM_X_ABWEHR_6 0x1CA
+#define ITEM_X_TEMPO_6 0x1CB
+#define ITEM_X_TREFFER_6 0x1CC
+#define ITEM_X_SPEZIAL_6 0x1CD
+#define ITEM_X_SPVERT_6 0x1CE
+#define ITEM_ADAMANT_ORB 0x1CF
+#define ITEM_FLOTTSTAUB 0x1D0
+#define ITEM_PLATINUM_ORB 0x1D1
+#define ITEM_WEISS_ORB 0x1D2
+#define ITEM_BLITZTAFEL 0x1D3
+#define ITEM_DRACOTAFEL 0x1D4
+#define ITEM_EISENTAFEL 0x1D5
+#define ITEM_ERDTAFEL 0x1D6
+#define ITEM_FAUSTTAFEL 0x1D7
+#define ITEM_FEENTAFEL 0x1D8
+#define ITEM_FEUERTAFEL 0x1D9
+#define ITEM_FROSTTAFEL 0x1DA
+#define ITEM_FURCHTAFEL 0x1DB
+#define ITEM_GIFTTAFEL 0x1DC
+#define ITEM_HIRNTAFEL 0x1DD
+#define ITEM_KAEFERTAFEL 0x1DE
+#define ITEM_SPUKTAFEL 0x1DF
+#define ITEM_STEINTAFEL 0x1E0
+#define ITEM_WASSERTAFEL 0x1E1
+#define ITEM_WIESENTAFEL 0x1E2
+#define ITEM_WOLKENTAFEL 0x1E3
+#define ITEM_AQUAMODUL 0x1E4
+#define ITEM_BLITZMODUL 0x1E5
+#define ITEM_FLAMMENMODUL 0x1E6
+#define ITEM_GEFRIERMODUL 0x1E7
+#define ITEM_ABSOLNIT 0x1E8
+#define ITEM_AERODAONIT 0x1E9
+#define ITEM_ALTARIANIT 0x1EA
+#define ITEM_AMPHAROSNIT 0x1EB
+#define ITEM_BANETTEONIT 0x1EC
+#define ITEM_BIBORNIT 0x1ED
+#define ITEM_BISAFLORNIT 0x1EE
+#define ITEM_BRUTALNIT 0x1EF
+#define ITEM_CAMERUPTNIT 0x1F0
+#define ITEM_DESPOTARNIT 0x1F1
+#define ITEM_DIANCIENIT 0x1F2
+#define ITEM_FIRNONTORNIT 0x1F3
+#define ITEM_FLUNKIFERNIT 0x1F4
+#define ITEM_GALAGLADINIT 0x1F5
+#define ITEM_GARADOSNIT 0x1F6
+#define ITEM_GENGARNIT 0x1F7
+#define ITEM_GEWALDRONIT 0x1F8
+#define ITEM_GLURAKNIT_X 0x1F9
+#define ITEM_GLURAKNIT_Y 0x1FA
+#define ITEM_GUARDEVOIRN 0x1FB
+#define ITEM_HUNDEMONIT 0x1FC
+#define ITEM_KANGAMANIT 0x1FD
+#define ITEM_KNAKRACKNIT 0x1FE
+#define ITEM_LAHMUSNIT 0x1FF
+#define ITEM_LATIASNIT 0x200
+#define ITEM_LATIOSNIT 0x201
+#define ITEM_LOHGOCKNIT 0x202
+#define ITEM_LUCARIONIT 0x203
+#define ITEM_MEDITALISNIT 0x204
+#define ITEM_METAGROSSNIT 0x205
+#define ITEM_MEWTUNIT_X 0x206
+#define ITEM_MEWTUNIT_Y 0x207
+#define ITEM_OHRDOCHNIT 0x208
+#define ITEM_PINSIRNIT 0x209
+#define ITEM_REXBLISARNIT 0x20A
+#define ITEM_SCHEROXNIT 0x20B
+#define ITEM_SCHLAPORNIT 0x20C
+#define ITEM_SIMSALANIT 0x20D
+#define ITEM_SKARABORNIT 0x20E
+#define ITEM_STAHLOSNIT 0x20F
+#define ITEM_STOLLOSSNIT 0x210
+#define ITEM_SUMPEXNIT 0x211
+#define ITEM_TAUBOSSNIT 0x212
+#define ITEM_TOHAIDONIT 0x213
+#define ITEM_TURTOKNIT 0x214
+#define ITEM_VOLTENSONIT 0x215
+#define ITEM_ZOBIRISNIT 0x216
+#define ITEM_R_EDELSTEIN 0x217
+#define ITEM_B_EDELSTEIN 0x218
+#define ITEM_AE_EDELSTEIN 0x219
+#define ITEM_GLUECKSRAUCH 0x21A
+#define ITEM_LAHMRAUCH 0x21B
+#define ITEM_ROSENRAUCH 0x21C
+#define ITEM_SCHEUCHRAUCH 0x21D
+#define ITEM_SCHRAEGRAUCH 0x21E
+#define ITEM_STEINRAUCH 0x21F
+#define ITEM_WELLENRAUCH 0x220
+#define ITEM_MACHTBAND 0x221
+#define ITEM_MACHTGEWICHT 0x222
+#define ITEM_MACHTGURT 0x223
+#define ITEM_MACHTKETTE 0x224
+#define ITEM_MACHTLINSE 0x225
+#define ITEM_MACHTREIF 0x226
+#define ITEM_ATEMGERAET 0x227
+#define ITEM_GISCHTGLOCKE 0x228
+#define ITEM_KLARGLOCKE 0x229
+#define ITEM_MEGA_ARMREIF 0x22A
+#define ITEM_LEVELBALL 0x22B
+#define ITEM_KOEDERBALL 0x22C
+#define ITEM_MONDBALL 0x22D
+#define ITEM_FREUNDESBALL 0x22E
+#define ITEM_TURBOBALL 0x22F
+#define ITEM_SCHWERBALL 0x230
+#define ITEM_SYMPALBALL 0x231
+#define ITEM_TURNIERBALL 0x232
+#define ITEM_HEILBALL 0x233
+#define ITEM_FINSTERBALL 0x234
+#define ITEM_JUBELBALL 0x235
+#define ITEM_FLOTTBALL 0x236
+#define ITEM_PARKBALL 0x237
+#define ITEM_TRAUMBALL 0x238
+#define ITEM_ALTER_HELLER 0x239
+#define ITEM_ALTER_TALER 0x23A
+#define ITEM_ALTER_DUKAT 0x23B
+#define ITEM_ALTE_VASE 0x23C
+#define ITEM_ALTER_REIF 0x23D
+#define ITEM_ALTE_STATUE 0x23E
+#define ITEM_ALTE_KRONE 0x23F
+#define ITEM_NUGGET 0x240
+#define ITEM_RIESENNUGGET 0x241
+#define ITEM_TRIPERLE 0x242
+#define ITEM_DUFTPILZ 0x243
+#define ITEM_SPIRITKERN 0x244
+#define ITEM_STEINKNOCHEN 0x245
+#define ITEM_AZURFLOETE 0x246
+#define ITEM_SKULPTUR 0x247
+#define ITEM_KOMETSTUECK 0x248
+#define ITEM_DUBIOSDISC 0x249
+#define ITEM_DUFTBEUTEL 0x24A
+#define ITEM_DUESTERUMHANG 0x24B
+#define ITEM_MAGMAISIERER 0x24C
+#define ITEM_OVALER_STEIN 0x24D
+#define ITEM_SAHNEHAEUBCH 0x24E
+#define ITEM_SCHOENSCHUPPE 0x24F
+#define ITEM_SCHUETZER 0x250
+#define ITEM_STROMISIERER 0x251
+#define ITEM_ROTE_KUGEL 0x252
+#define ITEM_BLAUE_KUGEL 0x253
+#define ITEM_GRUENE_KUGEL 0x254
+#define ITEM_MAGMASTEIN 0x255
+#define ITEM_LUNARFEDER 0x256
+#define ITEM_DUNKELSTEIN 0x257
+#define ITEM_LICHTSTEIN 0x258
+#define ITEM_GEHEIMTRANK 0x259
+#define ITEM_METEORSTUECK 0x25A
+#define ITEM_BUNTSCHWINGE 0x25B
+#define ITEM_SILBERFLUEGEL 0x25C
+#define ITEM_BOOTSTICKET 0x25D
+#define ITEM_TARNANZUG 0x25E
+#define ITEM_FAHRSCHEIN 0x25F
+#define ITEM_TMVM_BOX 0x260
+#define ITEM_ROTE_KETTE 0x261
+#define ITEM_TALISMAN 0x262
+#define ITEM_MYTOKRISTALL 0x263
+#define ITEM_FAEH_APPELL 0x264
+#define ITEM_ITEMABWURF 0x265
+#define ITEM_ITEMAPPELL 0x266
+#define ITEM_UMKEHRAPPELL 0x267
+#define ITEM_OVALPIN 0x268
+#define ITEM_SCHILLERPIN 0x269
+#define ITEM_AEON_FLOETE 0x26A
+#define ITEM_NORMIUM_Z 0x26B
+#define ITEM_PYRIUM_Z 0x26C
+#define ITEM_AQUIUM_Z 0x26D
+#define ITEM_VOLTIUM_Z 0x26E
+#define ITEM_BOTANIUM_Z 0x26F
+#define ITEM_GLACIUM_Z 0x270
+#define ITEM_BATTALIUM_Z 0x271
+#define ITEM_TOXIUM_Z 0x272
+#define ITEM_TERRIUM_Z 0x273
+#define ITEM_AERIUM_Z 0x274
+#define ITEM_PSIUM_Z 0x275
+#define ITEM_INSECTIUM_Z 0x276
+#define ITEM_PETRIUM_Z 0x277
+#define ITEM_PHANTOMIUM_Z 0x278
+#define ITEM_DRACIUM_Z 0x279
+#define ITEM_NOCTIUM_Z 0x27A
+#define ITEM_METALLIUM_Z 0x27B
+#define ITEM_SYLPHIUM_Z 0x27C
+#define ITEM_PIKACHIUM_Z 0x27D
+#define ITEM_SILBERKORKEN 0x27E
+#define ITEM_GOLDKORKEN 0x27F
+#define ITEM_Z_RING 0x280
+#define ITEM_SILVARRON_Z 0x281
+#define ITEM_FUEGRONIUM_Z 0x282
+#define ITEM_PRIMAREN_Z 0x283
+#define ITEM_KAPIUM_Z 0x284
+#define ITEM_A_RAICHUN_Z 0x285
+#define ITEM_RELAXONIUM_Z 0x286
+#define ITEM_EVOLIUM_Z 0x287
+#define ITEM_MEWNIUM_Z 0x288
+#define ITEM_ASH_PIKA_Z 0x289
+#define ITEM_GLITZERSTEIN 0x28A
+#define ITEM_ZITTERORB 0x28B
+#define ITEM_Z_WUERFEL 0x28C
+#define ITEM_EISSTEIN 0x28D
+#define ITEM_ULTRABALL 0x28E
+#define ITEM_NEKTAR_ROT 0x28F
+#define ITEM_NEKTAR_GELB 0x290
+#define ITEM_NEKTAR_ROSA 0x291
+#define ITEM_NEKTAR_PURP 0x292
+#define ITEM_SONNENFLOETE 0x293
+#define ITEM_MONDFLOETE 0x294
+#define ITEM_FELDSCHICHT 0x295
+#define ITEM_SCHUTZPOLST 0x296
+#define ITEM_ELEKTRO_SAMEN 0x297
+#define ITEM_PSYCHO_SAMEN 0x298
+#define ITEM_NEBEL_SAMEN 0x299
+#define ITEM_GRAS_SAMEN 0x29A
+#define ITEM_KAMPF_DISC 0x29B
+#define ITEM_FLUG_DISC 0x29C
+#define ITEM_GIFT_DISC 0x29D
+#define ITEM_BODEN_DISC 0x29E
+#define ITEM_STEINS_DISC 0x29F
+#define ITEM_KAEFER_DISC 0x2A0
+#define ITEM_GEISTER_DISC 0x2A1
+#define ITEM_STAHL_DISC 0x2A2
+#define ITEM_FEUER_DISC 0x2A3
+#define ITEM_WASSER_DISC 0x2A4
+#define ITEM_GRAS_DISC 0x2A5
+#define ITEM_ELEKTRO_DISC 0x2A6
+#define ITEM_PSYCHO_DISC 0x2A7
+#define ITEM_EIS_DISC 0x2A8
+#define ITEM_DRACHEN_DISC 0x2A9
+#define ITEM_UNLICHT_DISC 0x2AA
+#define ITEM_FEEN_DISC 0x2AB
+#define ITEM_SOLGALIUM_Z 0x2AC
+#define ITEM_LUNALIUM_Z 0x2AD
+#define ITEM_ULTRANECRONIUM_Z 0x2AE
+#define ITEM_MIMIGMIUM_Z 0x2AF
+#define ITEM_WOLWEROCKIUM_Z 0x2B0
+#define ITEM_GRANDIRASIUM_Z 0x2B1
+#define ITEM_Z_KRAFTRING 0x2B2
+#define ITEM_ROSA_BLATT 0x2B3
+#define ITEM_ORANGES_BLATT 0x2B4
+#define ITEM_BLAUES_BLATT 0x2B5
+#define ITEM_ROTES_BLATT 0x2B6
+#define ITEM_GRUENES_BLATT 0x2B7
+#define ITEM_GELBES_BLATT 0x2B8
+#define ITEM_VIOLETTES_BLATT 0x2B9
+#define ITEM_REGENBOGENBLUETE 0x2BA
+#define ITEM_GEWITTERORDEN 0x2BB
+#define ITEM_NECROSOL 0x2BC
+#define ITEM_NECROLUN 0x2BD
+#define ITEM_ELIMAS_NORMIUM_Z 0x2BE
+#define ITEM_NACHLASSBALL 0x2BF
+#define ITEM_BRUTBON 0x2C0
+#define ITEM_SCHNAEPPCHENBON 0x2C1
+#define ITEM_PREISGELDBON 0x2C2
+#define ITEM_EP_BON 0x2C3
+#define ITEM_FREUNDSCHAFTSBON 0x2C4
+#define ITEM_LOCKBON 0x2C5
+#define ITEM_SCHUTZBON 0x2C6
+#define ITEM_KP_BON 0x2C7
+#define ITEM_AP_BON 0x2C8
+#define ITEM_STATUSWERTEBON 0x2C9
+#define ITEM_FANGBON 0x2CA
 
 #endif /* ITEM_IDS */

src/include/constants/ptypes.h

@@ -11,9 +11,7 @@
 #define TYPE_BUG 0x6
 #define TYPE_GHOST 0x7
 #define TYPE_STEEL 0x8
-
 #define TYPE_EGG 0x9
-
 #define TYPE_FIRE 0xA
 #define TYPE_WATER 0xB
 #define TYPE_GRASS 0xC
@@ -22,7 +20,25 @@
 #define TYPE_ICE 0xF
 #define TYPE_DRAGON 0x10
 #define TYPE_DARK 0x11
-
 #define TYPE_FAIRY 0x17
 
+#define TYPE_KAMPF 0x1
+#define TYPE_FLUG 0x2
+#define TYPE_GIFT 0x3
+#define TYPE_BODEN 0x4
+#define TYPE_GESTEIN 0x5
+#define TYPE_KAEFER 0x6
+#define TYPE_GEIST 0x7
+#define TYPE_STAHL 0x8
+#define TYPE_UNBEKANNT 0x9
+#define TYPE_FEUER 0xA
+#define TYPE_WASSER 0xB
+#define TYPE_PFLANZE 0xC
+#define TYPE_ELEKTRO 0xD
+#define TYPE_PSYCHO 0xE
+#define TYPE_EIS 0xF
+#define TYPE_DRACHE 0x10
+#define TYPE_UNLICHT 0x11
+#define TYPE_FEE 0x17
+
 #endif

src/include/script/battlescreen.h

@@ -1,5 +1,5 @@
 #ifndef BATTLESCREEN_IDS_H_
-#define  BATTLESCREEN_IDS_H__IDS_H_
+#define BATTLESCREEN_IDS_H_IDS_H_
 
 #define BATTLESCREEN_GRASS 0x0
 #define BATTLESCREEN_STRAND 0x1

string/de/pkmn_data/pokedex_entries.txt

@@ -801,27 +801,32 @@ str_pokedex_eintraege_text_799=Eine Ultrabestie, die einigen\nBerichten zufolge
 str_pokedex_eintraege_text_800=Dieses extrem grausame Lebewesen\nwandelt Licht in Energie um und\nstößt unablässig Laserstrahlen aus.
 str_pokedex_eintraege_text_801=So schön sah Magearna aus, als es\nvor 500 Jahren als Geschenk an\neine Königstochter überreicht wurde.
 str_pokedex_eintraege_text_802=Es verbirgt sich im Schatten und\nerscheint niemals vor einem\nMenschen. Es ist ein Mythos.
-str_pokedex_eintraege_text_803=Sie ist zwar klein, aber nicht zu\nunterschätzen. Ihre telekinetischen\nKräfte können Berge versetzen.
-str_pokedex_eintraege_text_804=Sie ist zwar noch kein vollent-\nwickelter Drache, weist aber\ninzwischen enorme Kräfte auf.
-str_pokedex_eintraege_text_805=Geschichten sagen, dass dieses\nPokémon ein Nachfahrer eines\nlegendären Ritter des Himmels sei.
-str_pokedex_eintraege_text_806=Bereits in jungen Jahren ist Mamoi\nein sehr intelligentes Pokémon. Es\nvergisst Gesichter niemals!
-str_pokedex_eintraege_text_807=Ein sehr friedlich gesinntes\nPokémon, welches Kämpfe lieber aus\ndem Weg geht.
-str_pokedex_eintraege_text_808=Seine hohe Intelligez und\nGeschwindigkeit sind auf seine\nVorfahren zurückzuführen.
-str_pokedex_eintraege_text_809=Für seinen Rudelführer Rattikarl\ndurchstreift es die Stadt im Dunkeln\nauf der Suche nach gutem Futter.
-str_pokedex_eintraege_text_810=Ein Gourmet, dem Geschmack und\nFrische seines Futters wichtig\nsind.
-str_pokedex_eintraege_text_811=Dank seiner Psychokräfte kann es\nsich auf seinem Schweif schwebend\nfortbewegen.
-str_pokedex_eintraege_text_812=Sein Panzer ist zwar robust, aber\nso hart, dass es seinen Körper nicht\nvollständig zusammenrollen kann.
-str_pokedex_eintraege_text_813=Auf der Flucht vor Vulkanausbrüchen\nhat es sich auf verschneiten Bergen\nangesiedelt.
-str_pokedex_eintraege_text_814=Wenn ihm heiß wird, erzeugt es mit\nseinen sechs Schweifen Kiesel aus\nEis, um sich abzukühlen.
-str_pokedex_eintraege_text_815=Es greift seine Feinde mittels Eis-\nkristallen an, die es mit seinem\nFell erzeugt.
-str_pokedex_eintraege_text_816=Die metallischen Fortsätze auf\nseinem Kopf waren ursprünglich\nHaare.
-str_pokedex_eintraege_text_817=Mit seinen golden leuchtenden\nHaaren schützt es sich.
-str_pokedex_eintraege_text_818=Verschmutzt man die Münze an\nseiner Stirn, so verfällt es in\neine wahnsinnige Hysterie.
-str_pokedex_eintraege_text_819=Es bevorzugt fiese Angriffe aus dem\nHinterhalt oder der Dunkelheit. Es\nhält alles außer sich für Nutzlos.
-str_pokedex_eintraege_text_820=Fallen die Kristalle von seinem\nKörper ab, entweichen die\ntödlichen Giftstoffe.
-str_pokedex_eintraege_text_821=Der Müll, den Sleimok verzehrt,\nlöst im Inneren seines Körpers\nchemische Reaktionen aus.
-str_pokedex_eintraege_text_822=Wenn man auf ein am Boden schlafen-\ndes Kleinstein tritt, durchfährt\nein Stromschlag den Körper.
-str_pokedex_eintraege_text_823=Die verzehrten Teilchen werden zu\nKristallen, die an einer\nKörperstelle hervortreten.
-str_pokedex_eintraege_text_824=Es feuert elektrisch geladene Felsen\nab. Selbst eine Schramme genügt, um\nseine Gegner bewusstlos zu machen.
-str_pokedex_eintraege_text_825=Durch den Wachstumsschub wurden\nseine Psycho-Kräfte überlässig und\nerwäckten seine Drachen-Kräfte.
-str_pokedex_eintraege_text_826=Die Knochen in seinem Besitz stammen\nvon der Mutter. Nach ihrem Tod wurde\nihre Trauer zu Flammen.
+str_pokedex_eintraege_text_803=Diese Ultrabestie wird oft\nals Partner für Reisen\ngewählt wird.
+str_pokedex_eintraege_text_804=Diese Ultrabestie verschießt\naus ihren Giftstacheln ein\nleuchtendes Gift.
+str_pokedex_eintraege_text_805=Diese Kreatur besteht\nanscheinend aus mehreren\naufeinandergestapelten Wesen.
+str_pokedex_eintraege_text_806=Eine Ultrabestie, die ihre\nGegner mit Explosionen\nerschreckt.
+str_pokedex_eintraege_text_807=Es nähert sich seinen Gegnern\nsehr schnell und reißt ihnen\ldie Gliedmaßen raus.
+str_pokedex_eintraege_text_808=Sie ist zwar klein, aber nicht zu\nunterschätzen. Ihre telekinetischen\nKräfte können Berge versetzen.
+str_pokedex_eintraege_text_809=Sie ist zwar noch kein vollent-\nwickelter Drache, weist aber\ninzwischen enorme Kräfte auf.
+str_pokedex_eintraege_text_810=Geschichten sagen, dass dieses\nPokémon ein Nachfahrer eines\nlegendären Ritter des Himmels sei.
+str_pokedex_eintraege_text_811=Bereits in jungen Jahren ist Mamoi\nein sehr intelligentes Pokémon. Es\nvergisst Gesichter niemals!
+str_pokedex_eintraege_text_812=Ein sehr friedlich gesinntes\nPokémon, welches Kämpfe lieber aus\ndem Weg geht.
+str_pokedex_eintraege_text_813=Seine hohe Intelligez und\nGeschwindigkeit sind auf seine\nVorfahren zurückzuführen.
+str_pokedex_eintraege_text_814=Für seinen Rudelführer Rattikarl\ndurchstreift es die Stadt im Dunkeln\nauf der Suche nach gutem Futter.
+str_pokedex_eintraege_text_815=Ein Gourmet, dem Geschmack und\nFrische seines Futters wichtig\nsind.
+str_pokedex_eintraege_text_816=Dank seiner Psychokräfte kann es\nsich auf seinem Schweif schwebend\nfortbewegen.
+str_pokedex_eintraege_text_817=Sein Panzer ist zwar robust, aber\nso hart, dass es seinen Körper nicht\nvollständig zusammenrollen kann.
+str_pokedex_eintraege_text_818=Auf der Flucht vor Vulkanausbrüchen\nhat es sich auf verschneiten Bergen\nangesiedelt.
+str_pokedex_eintraege_text_819=Wenn ihm heiß wird, erzeugt es mit\nseinen sechs Schweifen Kiesel aus\nEis, um sich abzukühlen.
+str_pokedex_eintraege_text_820=Es greift seine Feinde mittels Eis-\nkristallen an, die es mit seinem\nFell erzeugt.
+str_pokedex_eintraege_text_821=Die metallischen Fortsätze auf\nseinem Kopf waren ursprünglich\nHaare.
+str_pokedex_eintraege_text_822=Mit seinen golden leuchtenden\nHaaren schützt es sich.
+str_pokedex_eintraege_text_823=Verschmutzt man die Münze an\nseiner Stirn, so verfällt es in\neine wahnsinnige Hysterie.
+str_pokedex_eintraege_text_824=Es bevorzugt fiese Angriffe aus dem\nHinterhalt oder der Dunkelheit. Es\nhält alles außer sich für Nutzlos.
+str_pokedex_eintraege_text_825=Fallen die Kristalle von seinem\nKörper ab, entweichen die\ntödlichen Giftstoffe.
+str_pokedex_eintraege_text_826=Der Müll, den Sleimok verzehrt,\nlöst im Inneren seines Körpers\nchemische Reaktionen aus.
+str_pokedex_eintraege_text_827=Wenn man auf ein am Boden schlafen-\ndes Kleinstein tritt, durchfährt\nein Stromschlag den Körper.
+str_pokedex_eintraege_text_828=Die verzehrten Teilchen werden zu\nKristallen, die an einer\nKörperstelle hervortreten.
+str_pokedex_eintraege_text_829=Es feuert elektrisch geladene Felsen\nab. Selbst eine Schramme genügt, um\nseine Gegner bewusstlos zu machen.
+str_pokedex_eintraege_text_830=Durch den Wachstumsschub wurden\nseine Psycho-Kräfte überlässig und\nerwäckten seine Drachen-Kräfte.
+str_pokedex_eintraege_text_831=Die Knochen in seinem Besitz stammen\nvon der Mutter. Nach ihrem Tod wurde\nihre Trauer zu Flammen.

update_all.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+main_repo=$(pwd)
+
+git_save() {
+    status=$(git status -s)
+
+    if [ "$status" ]; then
+        git stash push --include-untracked
+        return 0
+    else
+        return 1
+    fi
+}
+
+git_restore() {
+    if [ $1 -eq 0 ]; then
+        git stash pop
+    fi
+}
+
+# update main
+git pull
+
+# update battle_engine
+echo "*** Updating Battle Engine repository ***"
+cd $main_repo/battle_engine
+git_save
+result=$?
+git checkout master
+git pull
+git_restore $result
+
+# update g3headers
+echo "*** Updating g3headers repository ***"
+cd $main_repo/g3headers
+git_save
+result=$?
+git checkout master
+git pull
+git_restore $result
+
+# update private
+echo "*** Updating private repository ***"
+cd $main_repo/sots-private
+git_save
+result=$?
+git checkout master
+git pull
+git_restore $result