Revert "Includes Update"

This reverts commit 83bf18bff7.

data/pkmn_tables/pokedex_order.s

@@ -1,11 +1,10 @@
-#include <pkmn_names.h>
+#include <pkmn_name.h>
 .align 2
 .thumb
 .text
 .global pokedex_order
 pokedex_order:
 
-.hword PKMN_UNBEKANNT
 .hword PKMN_BISASAM
 .hword PKMN_BISAKNOSP
 .hword PKMN_BISAFLOR
@@ -34,7 +33,7 @@ pokedex_order:
 .hword PKMN_RAICHU
 .hword PKMN_SANDAN
 .hword PKMN_SANDAMER
-.hword PKMN_NIDORAN_F
+.hword PKMN_NIDORAN_W
 .hword PKMN_NIDORINA
 .hword PKMN_NIDOQUEEN
 .hword PKMN_NIDORAN_M
@@ -281,7 +280,7 @@ pokedex_order:
 .hword PKMN_MAMOI
 .hword PKMN_LUMOYO
 .hword PKMN_LIOSU
-.hword PKMN_PSIAUGON
+.hword PKMN_PSIAUGON_M
 .hword PKMN_GECKARBOR
 .hword PKMN_REPTAIN
 .hword PKMN_GEWALDRO
@@ -417,7 +416,7 @@ pokedex_order:
 .hword PKMN_JIRACHI
 .hword PKMN_DEOXYS
 .hword PKMN_PALIMPALIM
-.hword PKMN_UNBEKANNT
+#NV
 .hword PKMN_ICOGNITO
 .hword PKMN_ICOGNITO
 .hword PKMN_ICOGNITO
@@ -736,7 +735,7 @@ pokedex_order:
 .hword PKMN_PANDAGRO
 .hword PKMN_COIFFWAFF
 .hword PKMN_PSIAU
-.hword PKMN_PSIAUGON
+.hword PKMN_PSIAUGON_W
 .hword PKMN_GRAMOKLES
 .hword PKMN_DUOKLES
 .hword PKMN_DURENGARD
@@ -830,7 +829,7 @@ pokedex_order:
 .hword PKMN_SANKABUH
 .hword PKMN_COLOSSAND
 .hword PKMN_GUFA
-.hword PKMN_TYP:NULL
+.hword PKMN_TYP_NULL
 .hword PKMN_AMIGENTO
 .hword PKMN_METENO
 .hword PKMN_KOALELU
@@ -1122,4 +1121,3 @@ pokedex_order:
 .hword PKMN_OHRDOCH
 .hword PKMN_DIANCIE
 .hword PKMN_KYOGRE
-.hword PKMN_GROUDON

src/include/attack_names.h

@@ -0,0 +1,650 @@
+/****************************************************************************
+ * Copyright (C) 2015-2016 by the SotS Team                                 *
+ *                                                                          *
+ * This file is part of Sovereign of the Skies.                             *
+ *                                                                          *
+ *   Sovereign of the Skies is free software: you can redistribute it       *
+ *   and/or modify it                                                       *
+ *   under the terms of the GNU Lesser General Public License as published  *
+ *   by the Free Software Foundation, either version 3 of the License, or   *
+ *   (at your option) any later version provided you include a copy of the  *
+ *   licence and this header.                                               *
+ *                                                                          *
+ *   Sovereign of the Skies is distributed in the hope that it will be      *
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ *                                                                          *
+ *   You should have received a copy of the GNU Lesser General Public       *
+ *   License along with Sovereign of the Skies.                             *
+ *   If not, see <http://www.gnu.org/licenses/>.                            *
+ ****************************************************************************/
+
+/**
+ * @file attack_names.h
+ * @author Sturmvogel
+ * @date 15 dec 2016
+ * @brief Abilities in Assembler notation
+ */
+
+.equ ABSORB, 0x47
+.equ ACID, 0x33
+.equ ACID_ARMOR, 0x97
+.equ ACID_SPRAY, 0x1EB
+.equ ACROBATICS, 0x200
+.equ ACUPRESSURE, 0x16F
+.equ AERIAL_ACE, 0x14C
+.equ AEROBLAST, 0xB1
+.equ AFTER_YOU, 0x1EF
+.equ AGILITY, 0x61
+.equ AIR_CUTTER, 0x13A
+.equ AIR_SLASH, 0x193
+.equ ALLY_SWITCH, 0x1F6
+.equ AMNESIA, 0x85
+.equ ANCIENT_POWER, 0xF6
+.equ AQUA_JET, 0x1C5
+.equ AQUA_RING, 0x188
+.equ AQUA_TAIL, 0x191
+.equ ARM_THRUST, 0x124
+.equ AROMATHERAPY, 0x138
+.equ AROMATIC_MIST, 0x255
+.equ ASSIST, 0x112
+.equ ASSURANCE, 0x174
+.equ ASTONISH, 0x136
+.equ ATTACK_ORDER, 0x1C6
+.equ ATTRACT, 0xD5
+.equ AURA_SPHERE, 0x18C
+.equ AURORA_BEAM, 0x3E
+.equ AUTOTOMIZE, 0x1DB
+.equ AVALANCHE, 0x1A3
+.equ BABYDOLL_EYES, 0x260
+.equ BARRAGE, 0x8C
+.equ BARRIER, 0x70
+.equ BATON_PASS, 0xE2
+.equ BEAT_UP, 0xFB
+.equ BELCH, 0x232
+.equ BELLY_DRUM, 0xBB
+.equ BESTOW, 0x204
+.equ BIDE, 0x75
+.equ BIND, 0x14
+.equ BITE, 0x2C
+.equ BLAST_BURN, 0x133
+.equ BLAZE_KICK, 0x12B
+.equ BLIZZARD, 0x3B
+.equ BLOCK, 0x14F
+.equ BLUE_FLARE, 0x227
+.equ BODY_SLAM, 0x22
+.equ BOLT_STRIKE, 0x226
+.equ BONE_CLUB, 0x7D
+.equ BONE_RUSH, 0xC6
+.equ BONEMERANG, 0x9B
+.equ BOOMBURST, 0x24A
+.equ BOUNCE, 0x154
+.equ BRAVE_BIRD, 0x19D
+.equ BRICK_BREAK, 0x118
+.equ BRINE, 0x16A
+.equ BUBBLE, 0x91
+.equ BUBBLE_BEAM, 0x3D
+.equ BUG_BITE, 0x1C2
+.equ BUG_BUZZ, 0x195
+.equ BULK_UP, 0x153
+.equ BULLDOZE, 0x20B
+.equ BULLET_PUNCH, 0x1A2
+.equ BULLET_SEED, 0x14B
+.equ CALM_MIND, 0x15B
+.equ CAMOUFLAGE, 0x125
+.equ CAPTIVATE, 0x1BD
+.equ CELEBRATE, 0x25E
+.equ CHARGE, 0x10C
+.equ CHARGE_BEAM, 0x1C3
+.equ CHARM, 0xCC
+.equ CHATTER, 0x1C0
+.equ CHIP_AWAY, 0x1F2
+.equ CIRCLE_THROW, 0x1FD
+.equ CLAMP, 0x80
+.equ CLEAR_SMOG, 0x1F3
+.equ CLOSE_COMBAT, 0x172
+.equ COIL, 0x1E9
+.equ COMET_PUNCH, 0x4
+.equ CONFIDE, 0x24E
+.equ CONFUSE_RAY, 0x6D
+.equ CONFUSION, 0x5D
+.equ CONSTRICT, 0x84
+.equ CONVERSION, 0xA0
+.equ CONVERSION_2, 0xB0
+.equ COPYCAT, 0x17F
+.equ COSMIC_POWER, 0x142
+.equ COTTON_GUARD, 0x21A
+.equ COTTON_SPORE, 0xB2
+.equ COUNTER, 0x44
+.equ COVET, 0x157
+.equ CRABHAMMER, 0x98
+.equ CRAFTY_SHIELD, 0x242
+.equ CROSS_CHOP, 0xEE
+.equ CROSS_POISON, 0x1B8
+.equ CRUNCH, 0xF2
+.equ CRUSH_CLAW, 0x132
+.equ CRUSH_GRIP, 0x1CE
+.equ CURSE, 0xAE
+.equ CUT, 0xF
+.equ DARK_PULSE, 0x18F
+.equ DARK_VOID, 0x1D0
+.equ DAZZLING_GLEAM, 0x25D
+.equ DEFEND_ORDER, 0x1C7
+.equ DEFENSE_CURL, 0x6F
+.equ DEFOG, 0x1B0
+.equ DESTINY_BOND, 0xC2
+.equ DETECT, 0xC5
+.equ DIAMOND_STORM, 0x24F
+.equ DIG, 0x5B
+.equ DISABLE, 0x32
+.equ DISARMING_VOICE, 0x23E
+.equ DISCHARGE, 0x1B3
+.equ DIVE, 0x123
+.equ DIZZY_PUNCH, 0x92
+.equ DOOM_DESIRE, 0x161
+.equ DOUBLEEDGE, 0x26
+.equ DOUBLE_HIT, 0x1CA
+.equ DOUBLE_KICK, 0x18
+.equ DOUBLE_SLAP, 0x3
+.equ DOUBLE_TEAM, 0x68
+.equ DRACO_METEOR, 0x1B2
+.equ DRAGON_ASCENT, 0x26C
+.equ DRAGON_BREATH, 0xE1
+.equ DRAGON_CLAW, 0x151
+.equ DRAGON_DANCE, 0x15D
+.equ DRAGON_PULSE, 0x196
+.equ DRAGON_RAGE, 0x52
+.equ DRAGON_RUSH, 0x197
+.equ DRAGON_TAIL, 0x20D
+.equ DRAINING_KISS, 0x241
+.equ DRAIN_PUNCH, 0x199
+.equ DREAM_EATER, 0x8A
+.equ DRILL_PECK, 0x41
+.equ DRILL_RUN, 0x211
+.equ DUAL_CHOP, 0x212
+.equ DYNAMIC_PUNCH, 0xDF
+.equ EARTH_POWER, 0x19E
+.equ EARTHQUAKE, 0x59
+.equ ECHOED_VOICE, 0x1F1
+.equ EERIE_IMPULSE, 0x256
+.equ EGG_BOMB, 0x79
+.equ ELECTRIC_TERRAIN, 0x25C
+.equ ELECTRIFY, 0x246
+.equ ELECTRO_BALL, 0x1E6
+.equ ELECTROWEB, 0x20F
+.equ EMBARGO, 0x175
+.equ EMBER, 0x34
+.equ ENCORE, 0xE3
+.equ ENDEAVOR, 0x11B
+.equ ENDURE, 0xCB
+.equ ENERGY_BALL, 0x19C
+.equ ENTRAINMENT, 0x1EE
+.equ ERUPTION, 0x11C
+.equ EXPLOSION, 0x99
+.equ EXTRASENSORY, 0x146
+.equ EXTREME_SPEED, 0xF5
+.equ FACADE, 0x107
+.equ FEINT_ATTACK, 0xB9
+.equ FAIRY_LOCK, 0x24B
+.equ FAIRY_WIND, 0x248
+.equ FAKE_OUT, 0xFC
+.equ FAKE_TEARS, 0x139
+.equ FALSE_SWIPE, 0xCE
+.equ FEATHER_DANCE, 0x129
+.equ FEINT, 0x16C
+.equ FELL_STINGER, 0x235
+.equ FIERY_DANCE, 0x228
+.equ FINAL_GAMBIT, 0x203
+.equ FIRE_BLAST, 0x7E
+.equ FIRE_FANG, 0x1A8
+.equ FIRE_PLEDGE, 0x207
+.equ FIRE_PUNCH, 0x7
+.equ FIRE_SPIN, 0x53
+.equ FISSURE, 0x5A
+.equ FLAIL, 0xAF
+.equ FLAME_BURST, 0x1E1
+.equ FLAME_CHARGE, 0x1E8
+.equ FLAME_WHEEL, 0xAC
+.equ FLAMETHROWER, 0x35
+.equ FLARE_BLITZ, 0x18A
+.equ FLASH, 0x94
+.equ FLASH_CANNON, 0x1AE
+.equ FLATTER, 0x104
+.equ FLING, 0x176
+.equ FLOWER_SHIELD, 0x243
+.equ FLY, 0x13
+.equ FLYING_PRESS, 0x230
+.equ FOCUS_BLAST, 0x19B
+.equ FOCUS_ENERGY, 0x74
+.equ FOCUS_PUNCH, 0x108
+.equ FOLLOW_ME, 0x10A
+.equ FORCE_PALM, 0x18B
+.equ FORESIGHT, 0xC1
+.equ FORESTS_CURSE, 0x23B
+.equ FOUL_PLAY, 0x1EC
+.equ FREEZEDRY, 0x23D
+.equ FREEZE_SHOCK, 0x229
+.equ FRENZY_PLANT, 0x152
+.equ FROST_BREATH, 0x20C
+.equ FRUSTRATION, 0xDA
+.equ FURY_ATTACK, 0x1F
+.equ FURY_CUTTER, 0xD2
+.equ FURY_SWIPES, 0x9A
+.equ FUSION_BOLT, 0x22F
+.equ FUSION_FLARE, 0x22E
+.equ FUTURE_SIGHT, 0xF8
+.equ GASTRO_ACID, 0x17C
+.equ GEAR_GRIND, 0x220
+.equ GEOMANCY, 0x259
+.equ GIGA_DRAIN, 0xCA
+.equ GIGA_IMPACT, 0x1A0
+.equ GLACIATE, 0x225
+.equ GLARE, 0x89
+.equ GRASS_KNOT, 0x1BF
+.equ GRASS_PLEDGE, 0x208
+.equ GRASS_WHISTLE, 0x140
+.equ GRASSY_TERRAIN, 0x244
+.equ GRAVITY, 0x164
+.equ GROWL, 0x2D
+.equ GROWTH, 0x4A
+.equ GRUDGE, 0x120
+.equ GUARD_SPLIT, 0x1D6
+.equ GUARD_SWAP, 0x181
+.equ GUILLOTINE, 0xC
+.equ GUNK_SHOT, 0x1B9
+.equ GUST, 0x10
+.equ GYRO_BALL, 0x168
+.equ HAIL, 0x102
+.equ HAMMER_ARM, 0x167
+.equ HAPPY_HOUR, 0x25B
+.equ HARDEN, 0x6A
+.equ HAZE, 0x72
+.equ HEAD_CHARGE, 0x21F
+.equ HEAD_SMASH, 0x1C9
+.equ HEADBUTT, 0x1D
+.equ HEAL_BELL, 0xD7
+.equ HEAL_BLOCK, 0x179
+.equ HEAL_ORDER, 0x1C8
+.equ HEAL_PULSE, 0x1F9
+.equ HEALING_WISH, 0x169
+.equ HEART_STAMP, 0x213
+.equ HEART_SWAP, 0x187
+.equ HEAT_CRASH, 0x217
+.equ HEAT_WAVE, 0x101
+.equ HEAVY_SLAM, 0x1E4
+.equ HELPING_HAND, 0x10E
+.equ HEX, 0x1FA
+.equ HIDDEN_POWER, 0xED
+.equ HIGH_JUMP_KICK, 0x88
+.equ HOLD_BACK, 0x262
+.equ HOLD_HANDS, 0x267
+.equ HONE_CLAWS, 0x1D4
+.equ HORN_ATTACK, 0x1E
+.equ HORN_DRILL, 0x20
+.equ HORN_LEECH, 0x214
+.equ HOWL, 0x150
+.equ HURRICANE, 0x21E
+.equ HYDRO_CANNON, 0x134
+.equ HYDRO_PUMP, 0x38
+.equ HYPER_BEAM, 0x3F
+.equ HYPER_FANG, 0x9E
+.equ HYPERSPACE_FURY, 0x26D
+.equ HYPERSPACE_HOLE, 0x251
+.equ HYPER_VOICE, 0x130
+.equ HYPNOSIS, 0x5F
+.equ ICE_BALL, 0x12D
+.equ ICE_BEAM, 0x3A
+.equ ICE_BURN, 0x22A
+.equ ICE_FANG, 0x1A7
+.equ ICE_PUNCH, 0x8
+.equ ICE_SHARD, 0x1A4
+.equ ICICLE_CRASH, 0x22C
+.equ ICICLE_SPEAR, 0x14D
+.equ ICY_WIND, 0xC4
+.equ IMPRISON, 0x11E
+.equ INCINERATE, 0x1FE
+.equ INFERNO, 0x205
+.equ INFESTATION, 0x263
+.equ INGRAIN, 0x113
+.equ ION_DELUGE, 0x239
+.equ IRON_DEFENSE, 0x14E
+.equ IRON_HEAD, 0x1BA
+.equ IRON_TAIL, 0xE7
+.equ JUDGMENT, 0x1C1
+.equ JUMP_KICK, 0x1A
+.equ KARATE_CHOP, 0x2
+.equ KINESIS, 0x86
+.equ KINGS_SHIELD, 0x24C
+.equ KNOCK_OFF, 0x11A
+.equ LANDS_WRATH, 0x268
+.equ LAST_RESORT, 0x183
+.equ LAVA_PLUME, 0x1B4
+.equ LEAF_BLADE, 0x15C
+.equ LEAF_STORM, 0x1B5
+.equ LEAF_TORNADO, 0x218
+.equ LEECH_LIFE, 0x8D
+.equ LEECH_SEED, 0x49
+.equ LEER, 0x2B
+.equ LICK, 0x7A
+.equ LIGHT_OF_RUIN, 0x269
+.equ LIGHT_SCREEN, 0x71
+.equ LOCKON, 0xC7
+.equ LOVELY_KISS, 0x8E
+.equ LOW_KICK, 0x43
+.equ LOW_SWEEP, 0x1EA
+.equ LUCKY_CHANT, 0x17D
+.equ LUNAR_DANCE, 0x1CD
+.equ LUSTER_PURGE, 0x127
+.equ MACH_PUNCH, 0xB7
+.equ MAGIC_COAT, 0x115
+.equ MAGIC_ROOM, 0x1DE
+.equ MAGICAL_LEAF, 0x159
+.equ MAGMA_STORM, 0x1CF
+.equ MAGNET_BOMB, 0x1BB
+.equ MAGNETIC_FLUX, 0x25A
+.equ MAGNET_RISE, 0x189
+.equ MAGNITUDE, 0xDE
+.equ MAT_BLOCK, 0x231
+.equ ME_FIRST, 0x17E
+.equ MEAN_LOOK, 0xD4
+.equ MEDITATE, 0x60
+.equ MEGA_DRAIN, 0x48
+.equ MEGA_KICK, 0x19
+.equ MEGA_PUNCH, 0x5
+.equ MEGAHORN, 0xE0
+.equ MEMENTO, 0x106
+.equ METAL_BURST, 0x170
+.equ METAL_CLAW, 0xE8
+.equ METAL_SOUND, 0x13F
+.equ METEOR_MASH, 0x135
+.equ METRONOME, 0x76
+.equ MILK_DRINK, 0xD0
+.equ MIMIC, 0x66
+.equ MIND_READER, 0xAA
+.equ MINIMIZE, 0x6B
+.equ MIRACLE_EYE, 0x165
+.equ MIRROR_COAT, 0xF3
+.equ MIRROR_MOVE, 0x77
+.equ MIRROR_SHOT, 0x1AD
+.equ MIST, 0x36
+.equ MIST_BALL, 0x128
+.equ MISTY_TERRAIN, 0x245
+.equ MOONBLAST, 0x249
+.equ MOONLIGHT, 0xEC
+.equ MORNING_SUN, 0xEA
+.equ MUD_SLAP, 0xBD
+.equ MUD_BOMB, 0x1AA
+.equ MUD_SHOT, 0x155
+.equ MUD_SPORT, 0x12C
+.equ MUDDY_WATER, 0x14A
+.equ MYSTICAL_FIRE, 0x253
+.equ NASTY_PLOT, 0x1A1
+.equ NATURAL_GIFT, 0x16B
+.equ NATURE_POWER, 0x10B
+.equ NEEDLE_ARM, 0x12E
+.equ NIGHT_DAZE, 0x21B
+.equ NIGHT_SHADE, 0x65
+.equ NIGHT_SLASH, 0x190
+.equ NIGHTMARE, 0xAB
+.equ NOBLE_ROAR, 0x238
+.equ NUZZLE, 0x261
+.equ OBLIVION_WING, 0x265
+.equ OCTAZOOKA, 0xBE
+.equ ODOR_SLEUTH, 0x13C
+.equ OMINOUS_WIND, 0x1D2
+.equ ORIGIN_PULSE, 0x26A
+.equ OUTRAGE, 0xC8
+.equ OVERHEAT, 0x13B
+.equ PAIN_SPLIT, 0xDC
+.equ PARABOLIC_CHARGE, 0x23A
+.equ PARTING_SHOT, 0x23F
+.equ PAY_DAY, 0x6
+.equ PAYBACK, 0x173
+.equ PECK, 0x40
+.equ PERISH_SONG, 0xC3
+.equ PETAL_BLIZZARD, 0x23C
+.equ PETAL_DANCE, 0x50
+.equ PHANTOM_FORCE, 0x236
+.equ PIN_MISSILE, 0x2A
+.equ PLAY_NICE, 0x24D
+.equ PLAY_ROUGH, 0x247
+.equ PLUCK, 0x16D
+.equ POISON_FANG, 0x131
+.equ POISON_GAS, 0x8B
+.equ POISON_JAB, 0x18E
+.equ POISON_POWDER, 0x4D
+.equ POISON_STING, 0x28
+.equ POISON_TAIL, 0x156
+.equ POUND, 0x1
+.equ POWDER, 0x258
+.equ POWDER_SNOW, 0xB5
+.equ POWER_GEM, 0x198
+.equ POWER_SPLIT, 0x1D7
+.equ POWER_SWAP, 0x180
+.equ POWER_TRICK, 0x17B
+.equ POWERUP_PUNCH, 0x264
+.equ POWER_WHIP, 0x1B6
+.equ PRECIPICE_BLADES, 0x26B
+.equ PRESENT, 0xD9
+.equ PROTECT, 0xB6
+.equ PSYBEAM, 0x3C
+.equ PSYCH_UP, 0xF4
+.equ PSYCHIC, 0x5E
+.equ PSYCHO_BOOST, 0x162
+.equ PSYCHO_CUT, 0x1AB
+.equ PSYCHO_SHIFT, 0x177
+.equ PSYSHOCK, 0x1D9
+.equ PSYSTRIKE, 0x21C
+.equ PSYWAVE, 0x95
+.equ PUNISHMENT, 0x182
+.equ PURSUIT, 0xE4
+.equ QUASH, 0x1FF
+.equ QUICK_ATTACK, 0x62
+.equ QUICK_GUARD, 0x1F5
+.equ QUIVER_DANCE, 0x1E3
+.equ RAGE, 0x63
+.equ RAGE_POWDER, 0x1DC
+.equ RAIN_DANCE, 0xF0
+.equ RAPID_SPIN, 0xE5
+.equ RAZOR_LEAF, 0x4B
+.equ RAZOR_SHELL, 0x216
+.equ RAZOR_WIND, 0xD
+.equ RECOVER, 0x69
+.equ RECYCLE, 0x116
+.equ REFLECT, 0x73
+.equ REFLECT_TYPE, 0x201
+.equ REFRESH, 0x11F
+.equ RELIC_SONG, 0x223
+.equ REST, 0x9C
+.equ RETALIATE, 0x202
+.equ RETURN, 0xD8
+.equ REVENGE, 0x117
+.equ REVERSAL, 0xB3
+.equ ROAR, 0x2E
+.equ ROAR_OF_TIME, 0x1CB
+.equ ROCK_BLAST, 0x15E
+.equ ROCK_CLIMB, 0x1AF
+.equ ROCK_POLISH, 0x18D
+.equ ROCK_SLIDE, 0x9D
+.equ ROCK_SMASH, 0xF9
+.equ ROCK_THROW, 0x58
+.equ ROCK_TOMB, 0x13D
+.equ ROCK_WRECKER, 0x1B7
+.equ ROLE_PLAY, 0x110
+.equ ROLLING_KICK, 0x1B
+.equ ROLLOUT, 0xCD
+.equ ROOST, 0x163
+.equ ROTOTILLER, 0x233
+.equ ROUND, 0x1F0
+.equ SACRED_FIRE, 0xDD
+.equ SACRED_SWORD, 0x215
+.equ SAFEGUARD, 0xDB
+.equ SAND_ATTACK, 0x1C
+.equ SAND_TOMB, 0x148
+.equ SANDSTORM, 0xC9
+.equ SCALD, 0x1F7
+.equ SCARY_FACE, 0xB8
+.equ SCRATCH, 0xA
+.equ SCREECH, 0x67
+.equ SEARING_SHOT, 0x221
+.equ SECRET_POWER, 0x122
+.equ SECRET_SWORD, 0x224
+.equ SEED_BOMB, 0x192
+.equ SEED_FLARE, 0x1D1
+.equ SEISMIC_TOSS, 0x45
+.equ SELFDESTRUCT, 0x78
+.equ SHADOW_BALL, 0xF7
+.equ SHADOW_CLAW, 0x1A5
+.equ SHADOW_FORCE, 0x1D3
+.equ SHADOW_PUNCH, 0x145
+.equ SHADOW_SNEAK, 0x1A9
+.equ SHARPEN, 0x9F
+.equ SHEER_COLD, 0x149
+.equ SHELL_SMASH, 0x1F8
+.equ SHIFT_GEAR, 0x1FC
+.equ SHOCK_WAVE, 0x15F
+.equ SIGNAL_BEAM, 0x144
+.equ SILVER_WIND, 0x13E
+.equ SIMPLE_BEAM, 0x1ED
+.equ SING, 0x2F
+.equ SKETCH, 0xA6
+.equ SKILL_SWAP, 0x11D
+.equ SKULL_BASH, 0x82
+.equ SKY_ATTACK, 0x8F
+.equ SKY_DROP, 0x1FB
+.equ SKY_UPPERCUT, 0x147
+.equ SLACK_OFF, 0x12F
+.equ SLAM, 0x15
+.equ SLASH, 0xA3
+.equ SLEEP_POWDER, 0x4F
+.equ SLEEP_TALK, 0xD6
+.equ SLUDGE, 0x7C
+.equ SLUDGE_BOMB, 0xBC
+.equ SLUDGE_WAVE, 0x1E2
+.equ SMACK_DOWN, 0x1DF
+.equ SMELLING_SALTS, 0x109
+.equ SMOG, 0x7B
+.equ SMOKESCREEN, 0x6C
+.equ SNARL, 0x22B
+.equ SNATCH, 0x121
+.equ SNORE, 0xAD
+.equ SPIKY_SHIELD, 0x254
+.equ SOAK, 0x1E7
+.equ SOFTBOILED, 0x87
+.equ SOLAR_BEAM, 0x4C
+.equ SONIC_BOOM, 0x31
+.equ SPACIAL_REND, 0x1CC
+.equ SPARK, 0xD1
+.equ SPIDER_WEB, 0xA9
+.equ SPIKE_CANNON, 0x83
+.equ SPIKES, 0xBF
+.equ SPIT_UP, 0xFF
+.equ SPITE, 0xB4
+.equ SPLASH, 0x96
+.equ SPORE, 0x93
+.equ STEALTH_ROCK, 0x1BE
+.equ STEAM_ERUPTION, 0x250
+.equ STEEL_WING, 0xD3
+.equ STICKY_WEB, 0x234
+.equ STOCKPILE, 0xFE
+.equ STOMP, 0x17
+.equ STONE_EDGE, 0x1BC
+.equ STORED_POWER, 0x1F4
+.equ STORM_THROW, 0x1E0
+.equ STEAMROLLER, 0x219
+.equ STRENGTH, 0x46
+.equ STRING_SHOT, 0x51
+.equ STRUGGLE, 0xA5
+.equ STRUGGLE_BUG, 0x20A
+.equ STUN_SPORE, 0x4E
+.equ SUBMISSION, 0x42
+.equ SUBSTITUTE, 0xA4
+.equ SUCKER_PUNCH, 0x185
+.equ SUNNY_DAY, 0xF1
+.equ SUPER_FANG, 0xA2
+.equ SUPERPOWER, 0x114
+.equ SUPERSONIC, 0x30
+.equ SURF, 0x39
+.equ SWAGGER, 0xCF
+.equ SWALLOW, 0x100
+.equ SWEET_KISS, 0xBA
+.equ SWEET_SCENT, 0xE6
+.equ SWIFT, 0x81
+.equ SWITCHEROO, 0x19F
+.equ SWORDS_DANCE, 0xE
+.equ SYNCHRONOISE, 0x1E5
+.equ SYNTHESIS, 0xEB
+.equ TACKLE, 0x21
+.equ TAIL_GLOW, 0x126
+.equ TAIL_SLAP, 0x21D
+.equ TAIL_WHIP, 0x27
+.equ TAILWIND, 0x16E
+.equ TAKE_DOWN, 0x24
+.equ TAUNT, 0x10D
+.equ TECHNO_BLAST, 0x222
+.equ TEETER_DANCE, 0x12A
+.equ TELEKINESIS, 0x1DD
+.equ TELEPORT, 0x64
+.equ THIEF, 0xA8
+.equ THOUSAND_ARROWS, 0x266
+.equ THOUSAND_WAVES, 0x267
+.equ THRASH, 0x25
+.equ THUNDER, 0x57
+.equ THUNDER_FANG, 0x1A6
+.equ THUNDER_PUNCH, 0x9
+.equ THUNDER_SHOCK, 0x54
+.equ THUNDER_WAVE, 0x56
+.equ THUNDERBOLT, 0x55
+.equ TICKLE, 0x141
+.equ TOPSYTURVY, 0x240
+.equ TORMENT, 0x103
+.equ TOXIC, 0x5C
+.equ TOXIC_SPIKES, 0x186
+.equ TRANSFORM, 0x90
+.equ TRI_ATTACK, 0xA1
+.equ TRICK, 0x10F
+.equ TRICKORTREAT, 0x237
+.equ TRICK_ROOM, 0x1B1
+.equ TRIPLE_KICK, 0xA7
+.equ TRUMP_CARD, 0x178
+.equ TWINEEDLE, 0x29
+.equ TWISTER, 0xEF
+.equ UTURN, 0x171
+.equ UPROAR, 0xFD
+.equ VCREATE, 0x22D
+.equ VACUUM_WAVE, 0x19A
+.equ VENOM_DRENCH, 0x257
+.equ VENOSHOCK, 0x1DA
+.equ VICE_GRIP, 0xB
+.equ VINE_WHIP, 0x16
+.equ VITAL_THROW, 0xE9
+.equ VOLT_SWITCH, 0x209
+.equ VOLT_TACKLE, 0x158
+.equ WAKEUP_SLAP, 0x166
+.equ WATER_GUN, 0x37
+.equ WATER_PLEDGE, 0x206
+.equ WATER_PULSE, 0x160
+.equ WATER_SPORT, 0x15A
+.equ WATER_SPOUT, 0x143
+.equ WATERFALL, 0x7F
+.equ WATER_SHURIKEN, 0x252
+.equ WEATHER_BALL, 0x137
+.equ WHIRLPOOL, 0xFA
+.equ WHIRLWIND, 0x12
+.equ WIDE_GUARD, 0x1D5
+.equ WILD_CHARGE, 0x210
+.equ WILLOWISP, 0x105
+.equ WING_ATTACK, 0x11
+.equ WISH, 0x111
+.equ WITHDRAW, 0x6E
+.equ WONDER_ROOM, 0x1D8
+.equ WOOD_HAMMER, 0x1C4
+.equ WORK_UP, 0x20E
+.equ WORRY_SEED, 0x184
+.equ WRAP, 0x23
+.equ WRING_OUT, 0x17A
+.equ XSCISSOR, 0x194
+.equ YAWN, 0x119
+.equ ZAP_CANNON, 0xC0
+.equ ZEN_HEADBUTT, 0x1AC

src/include/battle_locations.h

@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 /**
- * @file pkmn_moves.h
+ * @file attack_names.h
  * @author Sturmvogel
  * @date 15 dec 2016
  * @brief Some globals used in-battle

src/include/battle_script.h

@@ -28,7 +28,7 @@
  */
 
 
-#include <pkmn_moves.h>
+#include <attack_names.h>
 
 @@ Banks
 #define BANK_USER	1

src/include/pkmn_abilities.h

@@ -0,0 +1,198 @@
+#ifndef ABILITY_IDS
+#define ABILITY_IDS
+
+/* ABILITY ENGLISH */
+#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/pkmn_structs/pkmn_abilities.h → src/include/pkmn_abilities_de.h

@@ -1,203 +1,7 @@
+#ifndef ABILITY_IDS
+#define ABILITY_IDS
 
-#ifndef ABILITY_IDS_H
-#define ABILITY_IDS_H
-
-/* ABILITY English */
-#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
-
-
-/* ABILITY Deutsch */
+/* ABILITY DEUTSCH */
 #define ABILITY_NONE 0
 #define ABILITY_DUFTNOTE 1
 #define ABILITY_NIESEL 2
@@ -434,4 +238,4 @@
 #define ABILITY_PRISMARUESTUNG 0
 #define ABILITY_ZEREBRALMACHT 0
 
-#endif /* #define ABILITY_IDS */
+#endif /* ABILITY_IDS_H */

src/include/pkmn_attributes.h

@@ -56,4 +56,7 @@
 #define ATTR_SPECIAL_DEFENCE 0x3F
 #define ATTR_SPECIES_2 0x41
 
-#endif /* PKMN_ATTRIBUTES_H */
+
+
+#endif /* PKMN_ATTRIBUTES_H */
+

src/include/pkmn_moves.h

@@ -0,0 +1,716 @@
+#ifndef MOVE_IDS_H
+#define MOVE_IDS_H
+
+#define MOVE_NICHTS 0
+#define MOVE_PFUND 1
+#define MOVE_KARATESCHLAG 2
+#define MOVE_DUPLEXHIEB 3
+#define MOVE_KOMETENHIEB 4
+#define MOVE_MEGAHIEB 5
+#define MOVE_ZAHLTAG 6
+#define MOVE_FEUERSCHLAG 7
+#define MOVE_EISHIEB 8
+#define MOVE_DONNERSCHLAG 9
+#define MOVE_KRATZER 10
+#define MOVE_KLAMMER 11
+#define MOVE_GUILLOTINE 12
+#define MOVE_KLINGENSTURM 13
+#define MOVE_SCHWERTTANZ 14
+#define MOVE_ZERSCHNEIDER 15
+#define MOVE_WINDSTOSS 16
+#define MOVE_FLUEGELSCHLAG 17
+#define MOVE_WIRBELWIND 18
+#define MOVE_FLIEGEN 19
+#define MOVE_KLAMMERGRIFF 20
+#define MOVE_SLAM 21
+#define MOVE_RANKENHIEB 22
+#define MOVE_STAMPFER 23
+#define MOVE_DOPPELKICK 24
+#define MOVE_MEGAKICK 25
+#define MOVE_SPRUNGKICK 26
+#define MOVE_FEGEKICK 27
+#define MOVE_SANDWIRBEL 28
+#define MOVE_KOPFNUSS 29
+#define MOVE_HORNATTACKE 30
+#define MOVE_FURIENSCHLAG 31
+#define MOVE_HORNBOHRER 32
+#define MOVE_TACKLE 33
+#define MOVE_BODYSLAM 34
+#define MOVE_WICKEL 35
+#define MOVE_BODYCHECK 36
+#define MOVE_FUCHTLER 37
+#define MOVE_RISIKOTACKLE 38
+#define MOVE_RUTENSCHLAG 39
+#define MOVE_GIFTSTACHEL 40
+#define MOVE_DUONADEL 41
+#define MOVE_NADELRAKETE 42
+#define MOVE_SILBERBLICK 43
+#define MOVE_BISS 44
+#define MOVE_HEULER 45
+#define MOVE_BRUELLER 46
+#define MOVE_GESANG 47
+#define MOVE_SUPERSCHALL 48
+#define MOVE_ULTRASCHALL 49
+#define MOVE_AUSSETZER 50
+#define MOVE_SAEURE 51
+#define MOVE_GLUT 52
+#define MOVE_FLAMMENWURF 53
+#define MOVE_WEISSNEBEL 54
+#define MOVE_AQUAKNARRE 55
+#define MOVE_HYDROPUMPE 56
+#define MOVE_SURFER 57
+#define MOVE_EISSTRAHL 58
+#define MOVE_BLIZZARD 59
+#define MOVE_PSYSTRAHL 60
+#define MOVE_BLUBBSTRAHL 61
+#define MOVE_AURORASTRAHL 62
+#define MOVE_HYPERSTRAHL 63
+#define MOVE_SCHNABEL 64
+#define MOVE_BOHRSCHNABEL 65
+#define MOVE_UEBERROLLER 66
+#define MOVE_FUSSKICK 67
+#define MOVE_KONTER 68
+#define MOVE_GEOWURF 69
+#define MOVE_STAERKE 70
+#define MOVE_ABSORBER 71
+#define MOVE_MEGASAUGER 72
+#define MOVE_EGELSAMEN 73
+#define MOVE_WACHSTUM 74
+#define MOVE_RASIERBLATT 75
+#define MOVE_SOLARSTRAHL 76
+#define MOVE_GIFTPUDER 77
+#define MOVE_STACHELSPORE 78
+#define MOVE_SCHLAFPUDER 79
+#define MOVE_BLAETTERTANZ 80
+#define MOVE_FADENSCHUSS 81
+#define MOVE_DRACHENWUT 82
+#define MOVE_FEUERWIRBEL 83
+#define MOVE_DONNERSCHOCK 84
+#define MOVE_DONNERBLITZ 85
+#define MOVE_DONNERWELLE 86
+#define MOVE_DONNER 87
+#define MOVE_STEINWURF 88
+#define MOVE_ERDBEBEN 89
+#define MOVE_GEOFISSUR 90
+#define MOVE_SCHAUFLER 91
+#define MOVE_TOXIN 92
+#define MOVE_KONFUSION 93
+#define MOVE_PSYCHOKINESE 94
+#define MOVE_HYPNOSE 95
+#define MOVE_MEDITATION 96
+#define MOVE_AGILITAET 97
+#define MOVE_RUCKZUCKHIEB 98
+#define MOVE_RASEREI 99
+#define MOVE_TELEPORT 100
+#define MOVE_NACHTNEBEL 101
+#define MOVE_MIMIKRY 102
+#define MOVE_KREIDESCHREI 103
+#define MOVE_DOPPELTEAM 104
+#define MOVE_GENESUNG 105
+#define MOVE_HAERTNER 106
+#define MOVE_KOMPRIMATOR 107
+#define MOVE_RAUCHWOLKE 108
+#define MOVE_KONFUSTRAHL 109
+#define MOVE_PANZERSCHUTZ 110
+#define MOVE_EINIGLER 111
+#define MOVE_BARRIERE 112
+#define MOVE_LICHTSCHILD 113
+#define MOVE_DUNKELNEBEL 114
+#define MOVE_REFLEKTOR 115
+#define MOVE_ENERGIEFOKUS 116
+#define MOVE_GEDULD 117
+#define MOVE_METRONOM 118
+#define MOVE_SPIEGELTRICK 119
+#define MOVE_FINALE 120
+#define MOVE_EIERBOMBE 121
+#define MOVE_SCHLECKER 122
+#define MOVE_SMOG 123
+#define MOVE_SCHLAMMBAD 124
+#define MOVE_KNOCHENKEULE 125
+#define MOVE_FEUERSTURM 126
+#define MOVE_KASKADE 127
+#define MOVE_SCHNAPPER 128
+#define MOVE_STERNSCHAUER 129
+#define MOVE_SCHAEDELWUMME 130
+#define MOVE_DORNKANONE 131
+#define MOVE_UMKLAMMERUNG 132
+#define MOVE_AMNESIE 133
+#define MOVE_PSYKRAFT 134
+#define MOVE_WEICHEI 135
+#define MOVE_TURMKICK 136
+#define MOVE_GIFTBLICK 137
+#define MOVE_TRAUMFRESSER 138
+#define MOVE_GIFTWOLKE 139
+#define MOVE_STAKKATO 140
+#define MOVE_BLUTSAUGER 141
+#define MOVE_TODESKUSS 142
+#define MOVE_HIMMELSFEGER 143
+#define MOVE_WANDLER 144
+#define MOVE_BLUBBER 145
+#define MOVE_IRRSCHLAG 146
+#define MOVE_PILZSPORE 147
+#define MOVE_BLITZ 148
+#define MOVE_PSYWELLE 149
+#define MOVE_PLATSCHER 150
+#define MOVE_SAEUREPANZER 151
+#define MOVE_KRABBHAMMER 152
+#define MOVE_EXPLOSION 153
+#define MOVE_KRATZFURIE 154
+#define MOVE_KNOCHMERANG 155
+#define MOVE_ERHOLUNG 156
+#define MOVE_STEINHAGEL 157
+#define MOVE_HYPERZAHN 158
+#define MOVE_SCHAERFER 159
+#define MOVE_UMWANDLUNG 160
+#define MOVE_TRIPLETTE 161
+#define MOVE_SUPERZAHN 162
+#define MOVE_SCHLITZER 163
+#define MOVE_DELEGATOR 164
+#define MOVE_VERZWEIFLER 165
+#define MOVE_NACHAHMER 166
+#define MOVE_DREIFACHKICK 167
+#define MOVE_RAUB 168
+#define MOVE_SPINNENNETZ 169
+#define MOVE_WILLENSLESER 170
+#define MOVE_NACHTMAHR 171
+#define MOVE_FLAMMENRAD 172
+#define MOVE_SCHNARCHER 173
+#define MOVE_FLUCH 174
+#define MOVE_DRESCHFLEGEL 175
+#define MOVE_UMWANDLUNG2 176
+#define MOVE_LUFTSTOSS 177
+#define MOVE_BAUMWOLLSAAT 178
+#define MOVE_GEGENSCHLAG 179
+#define MOVE_GROLL 180
+#define MOVE_PULVERSCHNEE 181
+#define MOVE_SCHUTZSCHILD 182
+#define MOVE_TEMPOHIEB 183
+#define MOVE_GRIMASSE 184
+#define MOVE_FINTE 185
+#define MOVE_BITTERKUSS 186
+#define MOVE_BAUCHTROMMEL 187
+#define MOVE_MATSCHBOMBE 188
+#define MOVE_LEHMSCHELLE 189
+#define MOVE_OCTAZOOKA 190
+#define MOVE_STACHLER 191
+#define MOVE_BLITZKANONE 192
+#define MOVE_GESICHTE 193
+#define MOVE_ABGANGSBUND 194
+#define MOVE_ABGESANG 195
+#define MOVE_EISSTURM 196
+#define MOVE_SCANNER 197
+#define MOVE_KNOCHENHATZ 198
+#define MOVE_ZIELSCHUSS 199
+#define MOVE_WUTANFALL 200
+#define MOVE_SANDSTURM 201
+#define MOVE_GIGASAUGER 202
+#define MOVE_AUSDAUER 203
+#define MOVE_CHARME 204
+#define MOVE_WALZER 205
+#define MOVE_TRUGSCHLAG 206
+#define MOVE_ANGEBEREI 207
+#define MOVE_MILCHGETRAENK 208
+#define MOVE_FUNKENSPRUNG 209
+#define MOVE_ZORNKLINGE 210
+#define MOVE_STAHLFLUEGEL 211
+#define MOVE_HORRORBLICK 212
+#define MOVE_ANZIEHUNG 213
+#define MOVE_SCHLAFREDE 214
+#define MOVE_VITALGLOCKE 215
+#define MOVE_RUECKKEHR 216
+#define MOVE_GESCHENK 217
+#define MOVE_FRUSTRATION 218
+#define MOVE_BODYGUARD 219
+#define MOVE_LEIDTEILER 220
+#define MOVE_LAEUTERFEUER 221
+#define MOVE_INTENSITAET 222
+#define MOVE_WUCHTSCHLAG 223
+#define MOVE_VIELENDER 224
+#define MOVE_FEUERODEM 225
+#define MOVE_STAFETTE 226
+#define MOVE_ZUGABE 227
+#define MOVE_VERFOLGUNG 228
+#define MOVE_TURBODREHER 229
+#define MOVE_LOCKDUFT 230
+#define MOVE_EISENSCHWEIF 231
+#define MOVE_METALLKLAUE 232
+#define MOVE_UEBERWURF 233
+#define MOVE_MORGENGRAUEN 234
+#define MOVE_SYNTHESE 235
+#define MOVE_MONDSCHEIN 236
+#define MOVE_KRAFTRESERVE 237
+#define MOVE_KREUZHIEB 238
+#define MOVE_WINDHOSE 239
+#define MOVE_REGENTANZ 240
+#define MOVE_SONNENTAG 241
+#define MOVE_KNIRSCHER 242
+#define MOVE_SPIEGELCAPE 243
+#define MOVE_PSYCHO_PLUS 244
+#define MOVE_TURBOTEMPO 245
+#define MOVE_ANTIK_KRAFT 246
+#define MOVE_SPUKBALL 247
+#define MOVE_SEHER 248
+#define MOVE_ZERTRUEMMERER 249
+#define MOVE_WHIRLPOOL 250
+#define MOVE_PRUEGLER 251
+#define MOVE_MOGELHIEB 252
+#define MOVE_AUFRUHR 253
+#define MOVE_HORTER 254
+#define MOVE_ENTFESSLER 255
+#define MOVE_VERZEHRER 256
+#define MOVE_HITZEWELLE 257
+#define MOVE_HAGELSTURM 258
+#define MOVE_FOLTERKNECHT 259
+#define MOVE_SCHMEICHLER 260
+#define MOVE_IRRLICHT 261
+#define MOVE_MEMENTO_MORI 262
+#define MOVE_FASSADE 263
+#define MOVE_POWER_PUNCH 264
+#define MOVE_RIECHSALZ 265
+#define MOVE_SPOTLIGHT 266
+#define MOVE_NATUR_KRAFT 267
+#define MOVE_LADEVORGANG 268
+#define MOVE_VERHOEHNER 269
+#define MOVE_RECHTE_HAND 270
+#define MOVE_TRICKBETRUG 271
+#define MOVE_ROLLENTAUSCH 272
+#define MOVE_WUNSCHTRAUM 273
+#define MOVE_ZUSCHUSS 274
+#define MOVE_VERWURZLER 275
+#define MOVE_KRAFTKOLOSS 276
+#define MOVE_MAGIEMANTEL 277
+#define MOVE_AUFBEREITUNG 278
+#define MOVE_VERGELTUNG 279
+#define MOVE_DURCHBRUCH 280
+#define MOVE_GAEHNER 281
+#define MOVE_ABSCHLAG 282
+#define MOVE_NOTSITUATION 283
+#define MOVE_ERUPTION 284
+#define MOVE_WERTEWECHSEL 285
+#define MOVE_BEGRENZER 286
+#define MOVE_HEILUNG 287
+#define MOVE_NACHSPIEL 288
+#define MOVE_UEBERNAHME 289
+#define MOVE_GEHEIMPOWER 290
+#define MOVE_TAUCHER 291
+#define MOVE_ARMSTOSS 292
+#define MOVE_TARNUNG 293
+#define MOVE_SCHWEIFGLANZ 294
+#define MOVE_SCHEINWERFER 295
+#define MOVE_NEBELBALL 296
+#define MOVE_DAUNENREIGEN 297
+#define MOVE_TAUMELTANZ 298
+#define MOVE_FEUERFEGER 299
+#define MOVE_LEHMSUHLER 300
+#define MOVE_FROSTBEULE 301
+#define MOVE_NIETENRANKE 302
+#define MOVE_TAGEDIEB 303
+#define MOVE_SCHALLWELLE 304
+#define MOVE_GIFTZAHN 305
+#define MOVE_ZERMALMKLAUE 306
+#define MOVE_LOHEKANONADE 307
+#define MOVE_AQUAHAUBITZE 308
+#define MOVE_STERNENHIEB 309
+#define MOVE_ERSTAUNER 310
+#define MOVE_METEOROLOGE 311
+#define MOVE_AROMAKUR 312
+#define MOVE_TRUGTRAENE 313
+#define MOVE_WINDSCHNITT 314
+#define MOVE_HITZEKOLLER 315
+#define MOVE_SCHNUEFFLER 316
+#define MOVE_FELSGRAB 317
+#define MOVE_SILBERHAUCH 318
+#define MOVE_METALLSOUND 319
+#define MOVE_GRASFLOETE 320
+#define MOVE_SPASSKANONE 321
+#define MOVE_KOSMIK_KRAFT 322
+#define MOVE_FONTRAENEN 323
+#define MOVE_AMPELLEUCHTE 324
+#define MOVE_FINSTERFAUST 325
+#define MOVE_SONDERSENSOR 326
+#define MOVE_HIMMELHIEB 327
+#define MOVE_SANDGRAB 328
+#define MOVE_EISESKAELTE 329
+#define MOVE_LEHMBRUEHE 330
+#define MOVE_KUGELSAAT 331
+#define MOVE_AERO_ASS 332
+#define MOVE_EISSPEER 333
+#define MOVE_EISENABWEHR 334
+#define MOVE_RUECKENTZUG 335
+#define MOVE_JAULER 336
+#define MOVE_DRACHENKLAUE 337
+#define MOVE_FLORA_STATUE 338
+#define MOVE_PROTZER 339
+#define MOVE_SPRUNGFEDER 340
+#define MOVE_LEHMSCHUSS 341
+#define MOVE_GIFTSCHWEIF 342
+#define MOVE_BEZIRZER 343
+#define MOVE_VOLTTACKLE 344
+#define MOVE_ZAUBERBLATT 345
+#define MOVE_NASSMACHER 346
+#define MOVE_GEDANKENGUT 347
+#define MOVE_LAUBKLINGE 348
+#define MOVE_DRACHENTANZ 349
+#define MOVE_FELSWURF 350
+#define MOVE_SCHOCKWELLE 351
+#define MOVE_AQUAWELLE 352
+#define MOVE_KISMETWUNSCH 353
+#define MOVE_PSYSCHUB 354
+#define MOVE_RUHEORT 355
+#define MOVE_ERDANZIEHUNG 356
+#define MOVE_WUNDERAUGE 357
+#define MOVE_WECKRUF 358
+#define MOVE_HAMMERARM 359
+#define MOVE_GYROBALL 360
+#define MOVE_HEILOPFER 361
+#define MOVE_LAKE 362
+#define MOVE_BEERENKRAEFTE 363
+#define MOVE_OFFENLEGUNG 364
+#define MOVE_PFLUECKER 365
+#define MOVE_RUECKENWIND 366
+#define MOVE_AKUPRESSUR 367
+#define MOVE_METALLSTOSS 368
+#define MOVE_KEHRTWENDE 369
+#define MOVE_NAHKAMPF 370
+#define MOVE_GEGENSTOSS 371
+#define MOVE_GEWISSHEIT 372
+#define MOVE_ITEMSPERRE 373
+#define MOVE_SCHLEUDER 374
+#define MOVE_PSYBANN 375
+#define MOVE_TRUMPFKARTE 376
+#define MOVE_HEILBLOCKADE 377
+#define MOVE_AUSWRINGEN 378
+#define MOVE_KRAFTTRICK 379
+#define MOVE_MAGENSAEFTE 380
+#define MOVE_BESCHWOERUNG 381
+#define MOVE_EGOTRIP 382
+#define MOVE_IMITATOR 383
+#define MOVE_KRAFTTAUSCH 384
+#define MOVE_SCHUTZTAUSCH 385
+#define MOVE_STRAFATTACKE 386
+#define MOVE_ZUFLUCHT 387
+#define MOVE_SORGENSAMEN 388
+#define MOVE_TIEFSCHLAG 389
+#define MOVE_GIFTSPITZEN 390
+#define MOVE_STATUSTAUSCH 391
+#define MOVE_WASSERRING 392
+#define MOVE_MAGNETFLUG 393
+#define MOVE_FLAMMENBLITZ 394
+#define MOVE_KRAFTWELLE 395
+#define MOVE_AURASPHAERE 396
+#define MOVE_STEINPOLITUR 397
+#define MOVE_GIFTHIEB 398
+#define MOVE_FINSTERAURA 399
+#define MOVE_NACHTHIEB 400
+#define MOVE_NASSSCHWEIF 401
+#define MOVE_SAMENBOMBEN 402
+#define MOVE_LUFTSCHNITT 403
+#define MOVE_KREUZSCHERE 404
+#define MOVE_KAEFERGEBRUMM 405
+#define MOVE_DRACHENPULS 406
+#define MOVE_DRACHENSTOSS 407
+#define MOVE_JUWELENKRAFT 408
+#define MOVE_ABLEITHIEB 409
+#define MOVE_VAKUUMWELLE 410
+#define MOVE_FOKUSSTOSS 411
+#define MOVE_ENERGIEBALL 412
+#define MOVE_STURZFLUG 413
+#define MOVE_ERDKRAEFTE 414
+#define MOVE_WECHSELDICH 415
+#define MOVE_GIGASTOSS 416
+#define MOVE_RAENKESCHMIED 417
+#define MOVE_PATRONENHIEB 418
+#define MOVE_LAWINE 419
+#define MOVE_EISSPLITTER 420
+#define MOVE_DUNKELKLAUE 421
+#define MOVE_DONNERZAHN 422
+#define MOVE_EISZAHN 423
+#define MOVE_FEUERZAHN 424
+#define MOVE_SCHATTENSTOSS 425
+#define MOVE_SCHLAMMBOMBE 426
+#define MOVE_PSYCHOKLINGE 427
+#define MOVE_ZEN_KOPFSTOSS 428
+#define MOVE_SPIEGELSALVE 429
+#define MOVE_LICHTKANONE 430
+#define MOVE_KRAXLER 431
+#define MOVE_AUFLOCKERN 432
+#define MOVE_BIZARRORAUM 433
+#define MOVE_DRACO_METEOR 434
+#define MOVE_LADUNGSSTOSS 435
+#define MOVE_FLAMMENSTURM 436
+#define MOVE_BLAETTERSTURM 437
+#define MOVE_BLATTGEISSEL 438
+#define MOVE_FELSWERFER 439
+#define MOVE_GIFTSTREICH 440
+#define MOVE_MUELLTREFFER 441
+#define MOVE_EISENSCHAEDEL 442
+#define MOVE_MAGNETBOMBE 443
+#define MOVE_STEINKANTE 444
+#define MOVE_LIEBREIZ 445
+#define MOVE_TARNSTEINE 446
+#define MOVE_STRAUCHLER 447
+#define MOVE_GESCHWAETZ 448
+#define MOVE_URTEILSKRAFT 449
+#define MOVE_KAEFERBISS 450
+#define MOVE_LADESTRAHL 451
+#define MOVE_HOLZHAMMER 452
+#define MOVE_WASSERDUESE 453
+#define MOVE_SCHLAGBEFEHL 454
+#define MOVE_BLOCKBEFEHL 455
+#define MOVE_HEILBEFEHL 456
+#define MOVE_KOPFSTOSS 457
+#define MOVE_DOPPELSCHLAG 458
+#define MOVE_ZEITENLAERM 459
+#define MOVE_RAUMSCHLAG 460
+#define MOVE_LUNARTANZ 461
+#define MOVE_QUETSCHGRIFF 462
+#define MOVE_LAVASTURM 463
+#define MOVE_SCHLUMMERORT 464
+#define MOVE_SCHOCKSAMEN 465
+#define MOVE_UNHEILBOEEN 466
+#define MOVE_SCHEMENKRAFT 467
+#define MOVE_KLAUENWETZER 468
+#define MOVE_RUNDUMSCHUTZ 469
+#define MOVE_SCHUTZTEILER 470
+#define MOVE_KRAFTTEILER 471
+#define MOVE_WUNDERRAUM 472
+#define MOVE_PSYCHOSCHOCK 473
+#define MOVE_GIFTSCHOCK 474
+#define MOVE_AUTOTOMIE 475
+#define MOVE_WUTPULVER 476
+#define MOVE_TELEKINESE 477
+#define MOVE_MAGIERAUM 478
+#define MOVE_KATAPULT 479
+#define MOVE_BERGSTURM 480
+#define MOVE_FUNKENFLUG 481
+#define MOVE_SCHLAMMWOGE 482
+#define MOVE_FALTERREIGEN 483
+#define MOVE_RAMMBOSS 484
+#define MOVE_SYNCHROLAERM 485
+#define MOVE_ELEKTROBALL 486
+#define MOVE_UEBERFLUTUNG 487
+#define MOVE_NITROLADUNG 488
+#define MOVE_EINROLLEN 489
+#define MOVE_FUSSTRITT 490
+#define MOVE_SAEURESPEIER 491
+#define MOVE_SCHMAROTZER 492
+#define MOVE_WANKELSTRAHL 493
+#define MOVE_ZWANGO 494
+#define MOVE_GALANTERIE 495
+#define MOVE_KANON 496
+#define MOVE_WIDERHALL 497
+#define MOVE_ZERMUERBEN 498
+#define MOVE_KLAERSMOG 499
+#define MOVE_KRAFTVORRAT 500
+#define MOVE_RAPIDSCHUTZ 501
+#define MOVE_SEITENTAUSCH 502
+#define MOVE_SIEDEWASSER 503
+#define MOVE_HAUSBRUCH 504
+#define MOVE_HEILWOGE 505
+#define MOVE_BUERDE 506
+#define MOVE_FREIER_FALL 507
+#define MOVE_GANGWECHSEL 508
+#define MOVE_UEBERKOPFWURF 509
+#define MOVE_EINAESCHERN 510
+#define MOVE_VERZOEGERUNG 511
+#define MOVE_AKROBATIK 512
+#define MOVE_TYPENSPIEGEL 513
+#define MOVE_HEIMZAHLUNG 514
+#define MOVE_WAGEMUT 515
+#define MOVE_OFFERTE 516
+#define MOVE_INFERNO 517
+#define MOVE_WASSERSAEULEN 518
+#define MOVE_FEUERSAEULEN 519
+#define MOVE_PFLANZENSAEULEN 520
+#define MOVE_VOLTWECHSEL 521
+#define MOVE_KAEFERTRUTZ 522
+#define MOVE_DAMPFWALZE 523
+#define MOVE_EISESODEM 524
+#define MOVE_DRACHENRUTE 525
+#define MOVE_KRAFTSCHUB 526
+#define MOVE_ELEKTRONETZ 527
+#define MOVE_STROMSTOSS 528
+#define MOVE_SCHLAGBOHRER 529
+#define MOVE_DOPPELHIEB 530
+#define MOVE_HERZSTEMPEL 531
+#define MOVE_HOLZGEWEIH 532
+#define MOVE_SANCTOKLINGE 533
+#define MOVE_KALKKLINGE 534
+#define MOVE_BRANDSTEMPEL 535
+#define MOVE_GRASMIXER 536
+#define MOVE_QUETSCHWALZE 537
+#define MOVE_WATTESCHILD 538
+#define MOVE_NACHTFLUT 539
+#define MOVE_PSYCHOSTOSS 540
+#define MOVE_KEHRSCHELLE 541
+#define MOVE_ORKAN 542
+#define MOVE_STEINSCHAEDEL 543
+#define MOVE_KLIKKDISKUS 544
+#define MOVE_FLAMMENBALL 545
+#define MOVE_TECHBLASTER 546
+#define MOVE_URGESANG 547
+#define MOVE_MYSTOSCHWERT 548
+#define MOVE_EISZEIT 549
+#define MOVE_BLITZSCHLAG 550
+#define MOVE_BLAUFLAMMEN 551
+#define MOVE_FEUERREIGEN 552
+#define MOVE_FROSTVOLT 553
+#define MOVE_FROSTHAUCH 554
+#define MOVE_STANDPAUKE 555
+#define MOVE_EISZAPFHAGEL 556
+#define MOVE_V_GENERATOR 557
+#define MOVE_KREUZFLAMME 558
+#define MOVE_KREUZDONNER 559
+#define MOVE_FLYING_PRESS 560
+#define MOVE_TATAMI_SCHILD 561
+#define MOVE_RUELPSER 562
+#define MOVE_PFLUEGER 563
+#define MOVE_KLEBENETZ 564
+#define MOVE_STACHELFINALE 565
+#define MOVE_PHANTOMKRAFT 566
+#define MOVE_HALLOWEEN 567
+#define MOVE_KAMPFGEBRUELL 568
+#define MOVE_PLASMASCHAUER 569
+#define MOVE_PARABOLLADUNG 570
+#define MOVE_WALDESFLUCH 571
+#define MOVE_BLUETENWIRBEL 572
+#define MOVE_GEFRIERTROCKNER 573
+#define MOVE_SAEUSELSTIMME 574
+#define MOVE_ABGANGSTIRADE 575
+#define MOVE_INVERTIGO 576
+#define MOVE_DIEBESKUSS 577
+#define MOVE_TRICKSCHUTZ 578
+#define MOVE_FLORASCHUTZ 579
+#define MOVE_GRASFELD 580
+#define MOVE_NEBELFELD 581
+#define MOVE_ELEKTRIFIZIERUNG 582
+#define MOVE_KNUDDLER 583
+#define MOVE_FEENBRISE 584
+#define MOVE_MONDGEWALT 585
+#define MOVE_UEBERSCHALLKNALL 586
+#define MOVE_FEENSCHLOSS 587
+#define MOVE_KOENIGSSCHILD 588
+#define MOVE_KAMERADSCHAFT 589
+#define MOVE_VERTRAUENSSACHE 590
+#define MOVE_DIAMANTSTURM 591
+#define MOVE_DAMPFSCHWALL 592
+#define MOVE_DIMENSIONSLOCH 593
+#define MOVE_WASSER_SHURIKEN 594
+#define MOVE_MAGIEFLAMME 595
+#define MOVE_SCHUTZSTACHELN 596
+#define MOVE_DUFTWOLKE 597
+#define MOVE_MYSTOWELLEN 598
+#define MOVE_GIFTFALLE 599
+#define MOVE_PULVERSCHLEUDER 600
+#define MOVE_GEOKONTROLLE 601
+#define MOVE_MAGNETREGLER 602
+#define MOVE_GOLDENE_ZEITEN 603
+#define MOVE_ELEKTROFELD 604
+#define MOVE_ZAUBERSCHEIN 605
+#define MOVE_EHRENTAG 606
+#define MOVE_HAENDCHENHALTEN 607
+#define MOVE_KULLERAUGEN 608
+#define MOVE_WANGENRUBBLER 609
+#define MOVE_ZURUECKHALTUNG 610
+#define MOVE_PLAGE 611
+#define MOVE_STEIGERUNGSHIEB 612
+#define MOVE_UNHEILSSCHWINGEN 613
+#define MOVE_TAUSEND_PFEILE 614
+#define MOVE_TAUSEND_WELLEN 615
+#define MOVE_BODENGEWALT 616
+#define MOVE_LUX_CALAMITATIS 617
+#define MOVE_URSPRUNGSWOGE 618
+#define MOVE_ABGRUNDSKLINGE 619
+#define MOVE_ZENITSTUERMER 620
+#define MOVE_DIMENSIONSWAHN 621
+#define MOVE_HYPER_SPRINTANGRIFF 622
+#define MOVE_FULMINANTE_FAUSTSCHLAEGE 623
+#define MOVE_FINALER_STEILFLUG 624
+#define MOVE_VERNICHTENDER_SAEUREREGEN 625
+#define MOVE_SEISMISCHE_ERUPTION 626
+#define MOVE_APOKALYPTISCHE_STEINPRESSE 627
+#define MOVE_WIRBELNDER_INSEKTENHIEB 628
+#define MOVE_EWIGE_NACHT 629
+#define MOVE_TURBO_SPIRALKOMBO 630
+#define MOVE_DYNAMISCHE_MAXIFLAMME 631
+#define MOVE_SUPER_WASSERTORNADO 632
+#define MOVE_BRILLANTE_BLUETENPRACHT 633
+#define MOVE_GIGAVOLT_FUNKENSALVE 634
+#define MOVE_PSYCHO_SCHMETTERSCHLAG 635
+#define MOVE_TOBENDER_GEOFROST 636
+#define MOVE_DRASTISCHES_DRACHENDROEHNEN 637
+#define MOVE_SCHWARZES_LOCH_DES_GRAUENS 638
+#define MOVE_ENTZUECKENDER_STERNENSTOSS 639
+#define MOVE_PERFEKTES_PIKA_PROJEKTIL 640
+#define MOVE_SANDSAMMLER 641
+#define MOVE_UEBERRUMPLER 642
+#define MOVE_BUNKER 643
+#define MOVE_SCHATTENFESSEL 644
+#define MOVE_DARK_LARIAT 645
+#define MOVE_SCHAUMSERENADE 646
+#define MOVE_EISHAMMER 647
+#define MOVE_FLORAKUR 648
+#define MOVE_PFERDESTAERKE 649
+#define MOVE_KRAFTABSORBER 650
+#define MOVE_SOLARKLINGE 651
+#define MOVE_BLATTWERK 652
+#define MOVE_RAMPENLICHT 653
+#define MOVE_GIFTFADEN 654
+#define MOVE_KONZENTRATION 655
+#define MOVE_HILFSMECHANIK 656
+#define MOVE_NECK_STRIKE 657
+#define MOVE_POLLENKNOEDEL 658
+#define MOVE_ANKERSCHUSS 659
+#define MOVE_PSYCHOFELD 660
+#define MOVE_ANFALLEN 661
+#define MOVE_FEUERPEITSCHE 662
+#define MOVE_UEBERHEBLICHKEIT 663
+#define MOVE_AUSBRENNEN 664
+#define MOVE_INITIATIVETAUSCH 665
+#define MOVE_SCHMALHORN 666
+#define MOVE_LAEUTERUNG 667
+#define MOVE_WECKTANZ 668
+#define MOVE_SANKTIONSKERN 669
+#define MOVE_TROPENKICK 670
+#define MOVE_KOMMANDO 671
+#define MOVE_SCHNABELKANONE 672
+#define MOVE_SCHUPPENRASSELN 673
+#define MOVE_DRACHENHAMMER 674
+#define MOVE_WIRBLER 675
+#define MOVE_AURORASCHLEIER 676
+#define MOVE_SCHATTEN_PFEILREGEN 677
+#define MOVE_HYPER_DARK_CRUSHER 678
+#define MOVE_GRANDIOSE_MEERESSYMPHONIE 679
+#define MOVE_ALOLAS_WAECHTER 680
+#define MOVE_STERNBILD_DES_SEELENRAUBES 681
+#define MOVE_BLITZ_WELLENRITT 682
+#define MOVE_SCHLUSS_MIT_LUSTIG 683
+#define MOVE_MACHT_DER_NEUN 684
+#define MOVE_SUPERNOVA_DES_URSPRUNGS 685
+#define MOVE_PANZERFALLE 686
+#define MOVE_KANONENBOUQUET 687
+#define MOVE_PSYCHOBEISSER 688
+#define MOVE_FRUSTSTAMPFER 689
+#define MOVE_SCHATTENKNOCHEN 690
+#define MOVE_TURBOFELSEN 691
+#define MOVE_AQUADURCHSTOSS 692
+#define MOVE_PRISMA_LASER 693
+#define MOVE_DIEBESSCHATTEN 694
+#define MOVE_STAHLGESTIRN 695
+#define MOVE_SCHATTENSTRAHL 696
+#define MOVE_TRAENENDRUESE 697
+#define MOVE_ELEKTROPIKSER 698
+#define MOVE_NATURZORN 699
+#define MOVE_MULTI_ANGRIFF 700
+#define MOVE_TAUSENDFACHER_DONNERBLITZ 701
+#define MOVE_KNALLKOPF 702
+#define MOVE_PLASMAFAEUSTE 703
+#define MOVE_PHOTONEN_GEYSIR 704
+#define MOVE_LICHT_DES_ERLOESCHENS 705
+#define MOVE_SCHMETTERNDE_SONNENWALZE 706
+#define MOVE_GEBALLTER_MONDLASER 707
+#define MOVE_HERZLICHE_KNUDDELKLOPPE 708
+#define MOVE_FATALER_STEINREGEN 709
+#define MOVE_RASSELNDER_SEELENTANZ 710
+
+#endif /* #define MOVE_IDS */

src/include/pkmn_stats.h

@@ -0,0 +1,75 @@
+#ifndef STATS_IDS
+#define STATS_IDS
+#include <pkmn_items.h>
+#include <pkmn_abilities_de.h>
+
+/* POKEMON TYPEN */
+#define STATS_TYP_NORMAL 0
+#define STATS_TYP_KAMPF 1
+#define STATS_TYP_FLUG 2
+#define STATS_TYP_GIFT 3
+#define STATS_TYP_BODEN 4
+#define STATS_TYP_GESTEIN 5
+#define STATS_TYP_KAEFER 6
+#define STATS_TYP_GEIST 7
+#define STATS_TYP_STAHL 8
+#define STATS_TYP_NULL 9
+#define STATS_TYP_FEUER 10
+#define STATS_TYP_WASSER 11
+#define STATS_TYP_PFLANZE 12
+#define STATS_TYP_ELEKTRO 13
+#define STATS_TYP_PSYCHO 14
+#define STATS_TYP_EIS 15
+#define STATS_TYP_DRACHE 16
+#define STATS_TYP_UNLICHT 17
+#define STATS_TYP_FEE 23
+
+/* POKEMON EI_GRUPPEN */
+#define STATS_EGG_GROUP_NONE 1
+#define STATS_EGG_GROUP_MONSTER 1
+#define STATS_EGG_GROUP_WASSER_1 2
+#define STATS_EGG_GROUP_KAEFER 3
+#define STATS_EGG_GROUP_FLUG 4
+#define STATS_EGG_GROUP_FELD 5
+#define STATS_EGG_GROUP_FEE 6
+#define STATS_EGG_GROUP_GRASS 7
+#define STATS_EGG_GROUP_HUMANOTYP 8
+#define STATS_EGG_GROUP_WASSER_3 9
+#define STATS_EGG_GROUP_MINERAL 10
+#define STATS_EGG_GROUP_AMORPH 11
+#define STATS_EGG_GROUP_WASSER_2 12
+#define STATS_EGG_GROUP_DITTO 13
+#define STATS_EGG_GROUP_DRACHE 14
+#define STATS_EGG_GROUP_UNBEKANNT 15
+
+/* POKEMON DEX FARBE */
+#define STATS_DEX_COLOR_ROT 0
+#define STATS_DEX_COLOR_BLAU 1
+#define STATS_DEX_COLOR_GELB 2
+#define STATS_DEX_COLOR_GRUEN 3
+#define STATS_DEX_COLOR_SCHWARZ 4
+#define STATS_DEX_COLOR_BRAUN 5
+#define STATS_DEX_COLOR_VIOLETT 6
+#define STATS_DEX_COLOR_GRAU 7
+#define STATS_DEX_COLOR_WEISS 8
+#define STATS_DEX_COLOR_ROSA 9
+
+/* POKEMON EP ERFAHRUNG LEVEL_UP */
+#define STATS_EP_LEVEL_UP_SCHNELL 0
+#define STATS_EP_LEVEL_UP_SEHR_LANGSAM 1
+#define STATS_EP_LEVEL_UP_SEHR_SCHNELL 2
+#define STATS_EP_LEVEL_UP_NORMAL 3
+#define STATS_EP_LEVEL_UP_SCHNELLER 4
+#define STATS_EP_LEVEL_UP_LANGSAM 5
+
+/* POKEMON GESCHLECHTER RATE */
+#define STATS_GENDER_RATE_BOY_100_PROCENT 0
+#define STATS_GENDER_RATE_BOY_87_5_PROCENT_GIRL_12_5_PROCENT 31
+#define STATS_GENDER_RATE_BOY_75_PROCENT_GIRL_25_PROCENT 63
+#define STATS_GENDER_RATE_BOY_50_PROCENT_GIRL_50_PROCENT 127
+#define STATS_GENDER_RATE_BOY_25_PROCENT_GIRL_75_PROCENT 191
+#define STATS_GENDER_RATE_BOY_12_5_PROCENT_GIRL_87_5_PROCENT 223
+#define STATS_GENDER_RATE_GIRL_100_PROCENT 254
+#define STATS_GENDER_RATE_OHNE_GESCHLECHT 255
+
+#endif /* #define STATS_IDS_H */

src/include/pkmn_structs/pkmn_stats.h

@@ -1,71 +0,0 @@
-#ifndef STATS_IDS_H
-#define STATS_IDS_H
-
-/* Pokémon Typen Deutsch */
-#define STATS_TYPE_NORMAL 0
-#define STATS_TYPE_KAMPF 1
-#define STATS_TYPE_FLUG 2
-#define STATS_TYPE_GIFT 3
-#define STATS_TYPE_BODEN 4
-#define STATS_TYPE_GESTEIN 5
-#define STATS_TYPE_KEAFER 6
-#define STATS_TYPE_GEIST 7
-#define STATS_TYPE_STAHL 8
-#define STATS_TYPE_UNKNOWN 9
-#define STATS_TYPE_FEUER 10
-#define STATS_TYPE_WASSER 11
-#define STATS_TYPE_PFLANZE 12
-#define STATS_TYPE_ELEKTRO 13
-#define STATS_TYPE_PSYCHO 14
-#define STATS_TYPE_EIS 15
-#define STATS_TYPE_DRACHE 16
-#define STATS_TYPE_UNLICHT 17
-#define STATS_TYPE_FEE 23
-
-/* Pokémon Ei-Gruppen Deutsch */
-#define STATS_EGG_GROUP_MONSTER 1
-#define STATS_EGG_GROUP_WASSER_1 2
-#define STATS_EGG_GROUP_KEAFER 3
-#define STATS_EGG_GROUP_FLUG 4
-#define STATS_EGG_GROUP_FELD 5
-#define STATS_EGG_GROUP_FEE 6
-#define STATS_EGG_GROUP_GRASS 7
-#define STATS_EGG_GROUP_HUMANOTYP 8
-#define STATS_EGG_GROUP_WASSER_3 9
-#define STATS_EGG_GROUP_MINERAL 10
-#define STATS_EGG_GROUP_AMORPH 11
-#define STATS_EGG_GROUP_WASSER_2 12
-#define STATS_EGG_GROUP_DITTO 13
-#define STATS_EGG_GROUP_DRACHE 14
-#define STATS_EGG_GROUP_UNBEKANNT 15
-
-/* Pokémon Dex-Farben Deutsch */
-#define STATS_DEX_COLOR_ROT 0
-#define STATS_DEX_COLOR_BLAU 1
-#define STATS_DEX_COLOR_GELB 2
-#define STATS_DEX_COLOR_GRÜN 3
-#define STATS_DEX_COLOR_SCHWARZ 4
-#define STATS_DEX_COLOR_BRAUN 5
-#define STATS_DEX_COLOR_VIOLETT 6
-#define STATS_DEX_COLOR_GRAU 7
-#define STATS_DEX_COLOR_WEIß 8
-#define STATS_DEX_COLOR_ROSA 9
-
-/* Pokémon Level-Aufstieg-Tempo Deutsch */
-#define STATS_EP_LEVEL_UP_SCHNELL 0
-#define STATS_EP_LEVEL_UP_SEHR_LANGSAM 1
-#define STATS_EP_LEVEL_UP_SEHR_SCHNELL 2
-#define STATS_EP_LEVEL_UP_NORMAL 3
-#define STATS_EP_LEVEL_UP_SCHNELLER 4
-#define STATS_EP_LEVEL_UP_LANGSAM 5
-
-/* Pokémon Geschlechter-Rate Deutsch */
-#define STATS_GENDER_M_100 0
-#define STATS_GENDER_M_87_F_12 31
-#define STATS_GENDER_M_75_F_25 63
-#define STATS_GENDER_M_50_F_50 127
-#define STATS_GENDER_M_25_F_75 191
-#define STATS_GENDER_M_12_F_87 223
-#define STATS_GENDER_KEINS 255
-
-#endif /* #define STATS_IDS */

src/include/maps_scripts/script_language.h → src/include/script_language.h

@@ -5,12 +5,7 @@
 #include <applymovements.h>
 #include <mugssprites.h>
 #include <battlescreen.h>
-#include <pkmn_names.h>
-#include <pkmn_abilities.h>
-#include <pkmn_items.h>
-#include <pkmn_moves.h>
-#include <pkmn_stats.h>
-
+#include <script_constant.h>
 
 @@ Costum Specials
 .equ SP_BATCHMAPTILE, 0x7
@@ -23,14 +18,6 @@
 .equ B_GE, 0x4
 .equ B_NE, 0x5
 
-@@ Compare operands
-.equ KLEINER, 0x0
-.equ GLEICH, 0x1
-.equ GROESSER, 0x2
-.equ KLEINERGLEICH, 0x3
-.equ GROESSERGLEICH, 0x4
-.equ UNGLEICH, 0x5
-
 @@ Important flags
 .equ FLAG_PKMN_MENU, 0x828
 .equ FLAG_POKDEX, 0x829
@@ -56,10 +43,6 @@
 .equ B_T, 0x0
 .equ B_F, 0x1
 
-@@ Flag operands
-.equ FALSCH, 0x0
-.equ WAHR, 0x1
-
 @@ callstd alias
 .equ ITEM_OBTAIN, 0x0
 .equ ITEM_FIND, 0x1