Merge branch 'data' of https://github.com/ProjectRevoTPP/pokeruby into data

4 files changed, 423 insertions, 365 deletions

diff --git a/include/mori_debug_menu.h b/include/mori_debug_menu.h
index f1dc0de93..9b0a39fe3 100644
--- a/include/mori_debug_menu.h
+++ b/include/mori_debug_menu.h
@@ -3,14 +3,14 @@
 
 bool8 sub_8083D4C(void);
 u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr);
-s8 MoriDebugMenu_Egg(void);
-s8 MoriDebugMenu_MaleEgg(void);
-s8 MoriDebugMenu_1000Steps(void);
-s8 MoriDebugMenu_10000Steps(void);
-s8 MoriDebugMenu_MoveTutor(void);
-s8 MoriDebugMenu_BreedEgg(void);
-s8 MoriDebugMenu_LongName(void);
-s8 MoriDebugMenu_PokeblockCase(void);
+u8 MoriDebugMenu_Egg(void);
+u8 MoriDebugMenu_MaleEgg(void);
+u8 MoriDebugMenu_1000Steps(void);
+u8 MoriDebugMenu_10000Steps(void);
+u8 MoriDebugMenu_MoveTutor(void);
+u8 MoriDebugMenu_BreedEgg(void);
+u8 MoriDebugMenu_LongName(void);
+u8 MoriDebugMenu_PokeblockCase(void);
 bool8 MoriDebugMenuProcessInput(void);
 s8 InitMoriDebugMenu(void);
 
diff --git a/include/moves.h b/include/moves.h
index e3b6d3113..9b9d3ff19 100644
--- a/include/moves.h
+++ b/include/moves.h
@@ -3,361 +3,361 @@
 
 enum
 {
-    MOVE_NONE,
-    MOVE_POUND,
-    MOVE_KARATE_CHOP,
-    MOVE_DOUBLE_SLAP,
-    MOVE_COMET_PUNCH,
-    MOVE_MEGA_PUNCH,
-    MOVE_PAY_DAY,
-    MOVE_FIRE_PUNCH,
-    MOVE_ICE_PUNCH,
-    MOVE_THUNDER_PUNCH,
-    MOVE_SCRATCH,
-    MOVE_VICE_GRIP,
-    MOVE_GUILLOTINE,
-    MOVE_RAZOR_WIND,
-    MOVE_SWORDS_DANCE,
-    MOVE_CUT,
-    MOVE_GUST,
-    MOVE_WING_ATTACK,
-    MOVE_WHIRLWIND,
-    MOVE_FLY,
-    MOVE_BIND,
-    MOVE_SLAM,
-    MOVE_VINE_WHIP,
-    MOVE_STOMP,
-    MOVE_DOUBLE_KICK,
-    MOVE_MEGA_KICK,
-    MOVE_JUMP_KICK,
-    MOVE_ROLLING_KICK,
-    MOVE_SAND_ATTACK,
-    MOVE_HEADBUTT,
-    MOVE_HORN_ATTACK,
-    MOVE_FURY_ATTACK,
-    MOVE_HORN_DRILL,
-    MOVE_TACKLE,
-    MOVE_BODY_SLAM,
-    MOVE_WRAP,
-    MOVE_TAKE_DOWN,
-    MOVE_THRASH,
-    MOVE_DOUBLE_EDGE,
-    MOVE_TAIL_WHIP,
-    MOVE_POISON_STING,
-    MOVE_TWINEEDLE,
-    MOVE_PIN_MISSILE,
-    MOVE_LEER,
-    MOVE_BITE,
-    MOVE_GROWL,
-    MOVE_ROAR,
-    MOVE_SING,
-    MOVE_SUPERSONIC,
-    MOVE_SONIC_BOOM,
-    MOVE_DISABLE,
-    MOVE_ACID,
-    MOVE_EMBER,
-    MOVE_FLAMETHROWER,
-    MOVE_MIST,
-    MOVE_WATER_GUN,
-    MOVE_HYDRO_PUMP,
-    MOVE_SURF,
-    MOVE_ICE_BEAM,
-    MOVE_BLIZZARD,
-    MOVE_PSYBEAM,
-    MOVE_BUBBLE_BEAM,
-    MOVE_AURORA_BEAM,
-    MOVE_HYPER_BEAM,
-    MOVE_PECK,
-    MOVE_DRILL_PECK,
-    MOVE_SUBMISSION,
-    MOVE_LOW_KICK,
-    MOVE_COUNTER,
-    MOVE_SEISMIC_TOSS,
-    MOVE_STRENGTH,
-    MOVE_ABSORB,
-    MOVE_MEGA_DRAIN,
-    MOVE_LEECH_SEED,
-    MOVE_GROWTH,
-    MOVE_RAZOR_LEAF,
-    MOVE_SOLAR_BEAM,
-    MOVE_POISON_POWDER,
-    MOVE_STUN_SPORE,
-    MOVE_SLEEP_POWDER,
-    MOVE_PETAL_DANCE,
-    MOVE_STRING_SHOT,
-    MOVE_DRAGON_RAGE,
-    MOVE_FIRE_SPIN,
-    MOVE_THUNDER_SHOCK,
-    MOVE_THUNDERBOLT,
-    MOVE_THUNDER_WAVE,
-    MOVE_THUNDER,
-    MOVE_ROCK_THROW,
-    MOVE_EARTHQUAKE,
-    MOVE_FISSURE,
-    MOVE_DIG,
-    MOVE_TOXIC,
-    MOVE_CONFUSION,
-    MOVE_PSYCHIC,
-    MOVE_HYPNOSIS,
-    MOVE_MEDITATE,
-    MOVE_AGILITY,
-    MOVE_QUICK_ATTACK,
-    MOVE_RAGE,
-    MOVE_TELEPORT,
-    MOVE_NIGHT_SHADE,
-    MOVE_MIMIC,
-    MOVE_SCREECH,
-    MOVE_DOUBLE_TEAM,
-    MOVE_RECOVER,
-    MOVE_HARDEN,
-    MOVE_MINIMIZE,
-    MOVE_SMOKESCREEN,
-    MOVE_CONFUSE_RAY,
-    MOVE_WITHDRAW,
-    MOVE_DEFENSE_CURL,
-    MOVE_BARRIER,
-    MOVE_LIGHT_SCREEN,
-    MOVE_HAZE,
-    MOVE_REFLECT,
-    MOVE_FOCUS_ENERGY,
-    MOVE_BIDE,
-    MOVE_METRONOME,
-    MOVE_MIRROR_MOVE,
-    MOVE_SELF_DESTRUCT,
-    MOVE_EGG_BOMB,
-    MOVE_LICK,
-    MOVE_SMOG,
-    MOVE_SLUDGE,
-    MOVE_BONE_CLUB,
-    MOVE_FIRE_BLAST,
-    MOVE_WATERFALL,
-    MOVE_CLAMP,
-    MOVE_SWIFT,
-    MOVE_SKULL_BASH,
-    MOVE_SPIKE_CANNON,
-    MOVE_CONSTRICT,
-    MOVE_AMNESIA,
-    MOVE_KINESIS,
-    MOVE_SOFT_BOILED,
-    MOVE_HI_JUMP_KICK,
-    MOVE_GLARE,
-    MOVE_DREAM_EATER,
-    MOVE_POISON_GAS,
-    MOVE_BARRAGE,
-    MOVE_LEECH_LIFE,
-    MOVE_LOVELY_KISS,
-    MOVE_SKY_ATTACK,
-    MOVE_TRANSFORM,
-    MOVE_BUBBLE,
-    MOVE_DIZZY_PUNCH,
-    MOVE_SPORE,
-    MOVE_FLASH,
-    MOVE_PSYWAVE,
-    MOVE_SPLASH,
-    MOVE_ACID_ARMOR,
-    MOVE_CRABHAMMER,
-    MOVE_EXPLOSION,
-    MOVE_FURY_SWIPES,
-    MOVE_BONEMERANG,
-    MOVE_REST,
-    MOVE_ROCK_SLIDE,
-    MOVE_HYPER_FANG,
-    MOVE_SHARPEN,
-    MOVE_CONVERSION,
-    MOVE_TRI_ATTACK,
-    MOVE_SUPER_FANG,
-    MOVE_SLASH,
-    MOVE_SUBSTITUTE,
-    MOVE_STRUGGLE,
-    MOVE_SKETCH,
-    MOVE_TRIPLE_KICK,
-    MOVE_THIEF,
-    MOVE_SPIDER_WEB,
-    MOVE_MIND_READER,
-    MOVE_NIGHTMARE,
-    MOVE_FLAME_WHEEL,
-    MOVE_SNORE,
-    MOVE_CURSE,
-    MOVE_FLAIL,
-    MOVE_CONVERSION_2,
-    MOVE_AEROBLAST,
-    MOVE_COTTON_SPORE,
-    MOVE_REVERSAL,
-    MOVE_SPITE,
-    MOVE_POWDER_SNOW,
-    MOVE_PROTECT,
-    MOVE_MACH_PUNCH,
-    MOVE_SCARY_FACE,
-    MOVE_FAINT_ATTACK,
-    MOVE_SWEET_KISS,
-    MOVE_BELLY_DRUM,
-    MOVE_SLUDGE_BOMB,
-    MOVE_MUD_SLAP,
-    MOVE_OCTAZOOKA,
-    MOVE_SPIKES,
-    MOVE_ZAP_CANNON,
-    MOVE_FORESIGHT,
-    MOVE_DESTINY_BOND,
-    MOVE_PERISH_SONG,
-    MOVE_ICY_WIND,
-    MOVE_DETECT,
-    MOVE_BONE_RUSH,
-    MOVE_LOCK_ON,
-    MOVE_OUTRAGE,
-    MOVE_SANDSTORM,
-    MOVE_GIGA_DRAIN,
-    MOVE_ENDURE,
-    MOVE_CHARM,
-    MOVE_ROLLOUT,
-    MOVE_FALSE_SWIPE,
-    MOVE_SWAGGER,
-    MOVE_MILK_DRINK,
-    MOVE_SPARK,
-    MOVE_FURY_CUTTER,
-    MOVE_STEEL_WING,
-    MOVE_MEAN_LOOK,
-    MOVE_ATTRACT,
-    MOVE_SLEEP_TALK,
-    MOVE_HEAL_BELL,
-    MOVE_RETURN,
-    MOVE_PRESENT,
-    MOVE_FRUSTRATION,
-    MOVE_SAFEGUARD,
-    MOVE_PAIN_SPLIT,
-    MOVE_SACRED_FIRE,
-    MOVE_MAGNITUDE,
-    MOVE_DYNAMIC_PUNCH,
-    MOVE_MEGAHORN,
-    MOVE_DRAGON_BREATH,
-    MOVE_BATON_PASS,
-    MOVE_ENCORE,
-    MOVE_PURSUIT,
-    MOVE_RAPID_SPIN,
-    MOVE_SWEET_SCENT,
-    MOVE_IRON_TAIL,
-    MOVE_METAL_CLAW,
-    MOVE_VITAL_THROW,
-    MOVE_MORNING_SUN,
-    MOVE_SYNTHESIS,
-    MOVE_MOONLIGHT,
-    MOVE_HIDDEN_POWER,
-    MOVE_CROSS_CHOP,
-    MOVE_TWISTER,
-    MOVE_RAIN_DANCE,
-    MOVE_SUNNY_DAY,
-    MOVE_CRUNCH,
-    MOVE_MIRROR_COAT,
-    MOVE_PSYCH_UP,
-    MOVE_EXTREME_SPEED,
-    MOVE_ANCIENT_POWER,
-    MOVE_SHADOW_BALL,
-    MOVE_FUTURE_SIGHT,
-    MOVE_ROCK_SMASH,
-    MOVE_WHIRLPOOL,
-    MOVE_BEAT_UP,
-    MOVE_FAKE_OUT,
-    MOVE_UPROAR,
-    MOVE_STOCKPILE,
-    MOVE_SPIT_UP,
-    MOVE_SWALLOW,
-    MOVE_HEAT_WAVE,
-    MOVE_HAIL,
-    MOVE_TORMENT,
-    MOVE_FLATTER,
-    MOVE_WILL_O_WISP,
-    MOVE_MEMENTO,
-    MOVE_FACADE,
-    MOVE_FOCUS_PUNCH,
-    MOVE_SMELLING_SALT,
-    MOVE_FOLLOW_ME,
-    MOVE_NATURE_POWER,
-    MOVE_CHARGE,
-    MOVE_TAUNT,
-    MOVE_HELPING_HAND,
-    MOVE_TRICK,
-    MOVE_ROLE_PLAY,
-    MOVE_WISH,
-    MOVE_ASSIST,
-    MOVE_INGRAIN,
-    MOVE_SUPERPOWER,
-    MOVE_MAGIC_COAT,
-    MOVE_RECYCLE,
-    MOVE_REVENGE,
-    MOVE_BRICK_BREAK,
-    MOVE_YAWN,
-    MOVE_KNOCK_OFF,
-    MOVE_ENDEAVOR,
-    MOVE_ERUPTION,
-    MOVE_SKILL_SWAP,
-    MOVE_IMPRISON,
-    MOVE_REFRESH,
-    MOVE_GRUDGE,
-    MOVE_SNATCH,
-    MOVE_SECRET_POWER,
-    MOVE_DIVE,
-    MOVE_ARM_THRUST,
-    MOVE_CAMOUFLAGE,
-    MOVE_TAIL_GLOW,
-    MOVE_LUSTER_PURGE,
-    MOVE_MIST_BALL,
-    MOVE_FEATHER_DANCE,
-    MOVE_TEETER_DANCE,
-    MOVE_BLAZE_KICK,
-    MOVE_MUD_SPORT,
-    MOVE_ICE_BALL,
-    MOVE_NEEDLE_ARM,
-    MOVE_SLACK_OFF,
-    MOVE_HYPER_VOICE,
-    MOVE_POISON_FANG,
-    MOVE_CRUSH_CLAW,
-    MOVE_BLAST_BURN,
-    MOVE_HYDRO_CANNON,
-    MOVE_METEOR_MASH,
-    MOVE_ASTONISH,
-    MOVE_WEATHER_BALL,
-    MOVE_AROMATHERAPY,
-    MOVE_FAKE_TEARS,
-    MOVE_AIR_CUTTER,
-    MOVE_OVERHEAT,
-    MOVE_ODOR_SLEUTH,
-    MOVE_ROCK_TOMB,
-    MOVE_SILVER_WIND,
-    MOVE_METAL_SOUND,
-    MOVE_GRASS_WHISTLE,
-    MOVE_TICKLE,
-    MOVE_COSMIC_POWER,
-    MOVE_WATER_SPOUT,
-    MOVE_SIGNAL_BEAM,
-    MOVE_SHADOW_PUNCH,
-    MOVE_EXTRASENSORY,
-    MOVE_SKY_UPPERCUT,
-    MOVE_SAND_TOMB,
-    MOVE_SHEER_COLD,
-    MOVE_MUDDY_WATER,
-    MOVE_BULLET_SEED,
-    MOVE_AERIAL_ACE,
-    MOVE_ICICLE_SPEAR,
-    MOVE_IRON_DEFENSE,
-    MOVE_BLOCK,
-    MOVE_HOWL,
-    MOVE_DRAGON_CLAW,
-    MOVE_FRENZY_PLANT,
-    MOVE_BULK_UP,
-    MOVE_BOUNCE,
-    MOVE_MUD_SHOT,
-    MOVE_POISON_TAIL,
-    MOVE_COVET,
-    MOVE_VOLT_TACKLE,
-    MOVE_MAGICAL_LEAF,
-    MOVE_WATER_SPORT,
-    MOVE_CALM_MIND,
-    MOVE_LEAF_BLADE,
-    MOVE_DRAGON_DANCE,
-    MOVE_ROCK_BLAST,
-    MOVE_SHOCK_WAVE,
-    MOVE_WATER_PULSE,
-    MOVE_DOOM_DESIRE,
-    MOVE_PSYCHO_BOOST,
+ /*0x0000*/ MOVE_NONE,
+ /*0x0001*/ MOVE_POUND,
+ /*0x0002*/ MOVE_KARATE_CHOP,
+ /*0x0003*/ MOVE_DOUBLE_SLAP,
+ /*0x0004*/ MOVE_COMET_PUNCH,
+ /*0x0005*/ MOVE_MEGA_PUNCH,
+ /*0x0006*/ MOVE_PAY_DAY,
+ /*0x0007*/ MOVE_FIRE_PUNCH,
+ /*0x0008*/ MOVE_ICE_PUNCH,
+ /*0x0009*/ MOVE_THUNDER_PUNCH,
+ /*0x000a*/ MOVE_SCRATCH,
+ /*0x000b*/ MOVE_VICE_GRIP,
+ /*0x000c*/ MOVE_GUILLOTINE,
+ /*0x000d*/ MOVE_RAZOR_WIND,
+ /*0x000e*/ MOVE_SWORDS_DANCE,
+ /*0x000f*/ MOVE_CUT,
+ /*0x0010*/ MOVE_GUST,
+ /*0x0011*/ MOVE_WING_ATTACK,
+ /*0x0012*/ MOVE_WHIRLWIND,
+ /*0x0013*/ MOVE_FLY,
+ /*0x0014*/ MOVE_BIND,
+ /*0x0015*/ MOVE_SLAM,
+ /*0x0016*/ MOVE_VINE_WHIP,
+ /*0x0017*/ MOVE_STOMP,
+ /*0x0018*/ MOVE_DOUBLE_KICK,
+ /*0x0019*/ MOVE_MEGA_KICK,
+ /*0x001a*/ MOVE_JUMP_KICK,
+ /*0x001b*/ MOVE_ROLLING_KICK,
+ /*0x001c*/ MOVE_SAND_ATTACK,
+ /*0x001d*/ MOVE_HEADBUTT,
+ /*0x001e*/ MOVE_HORN_ATTACK,
+ /*0x001f*/ MOVE_FURY_ATTACK,
+ /*0x0020*/ MOVE_HORN_DRILL,
+ /*0x0021*/ MOVE_TACKLE,
+ /*0x0022*/ MOVE_BODY_SLAM,
+ /*0x0023*/ MOVE_WRAP,
+ /*0x0024*/ MOVE_TAKE_DOWN,
+ /*0x0025*/ MOVE_THRASH,
+ /*0x0026*/ MOVE_DOUBLE_EDGE,
+ /*0x0027*/ MOVE_TAIL_WHIP,
+ /*0x0028*/ MOVE_POISON_STING,
+ /*0x0029*/ MOVE_TWINEEDLE,
+ /*0x002a*/ MOVE_PIN_MISSILE,
+ /*0x002b*/ MOVE_LEER,
+ /*0x002c*/ MOVE_BITE,
+ /*0x002d*/ MOVE_GROWL,
+ /*0x002e*/ MOVE_ROAR,
+ /*0x002f*/ MOVE_SING,
+ /*0x0030*/ MOVE_SUPERSONIC,
+ /*0x0031*/ MOVE_SONIC_BOOM,
+ /*0x0032*/ MOVE_DISABLE,
+ /*0x0033*/ MOVE_ACID,
+ /*0x0034*/ MOVE_EMBER,
+ /*0x0035*/ MOVE_FLAMETHROWER,
+ /*0x0036*/ MOVE_MIST,
+ /*0x0037*/ MOVE_WATER_GUN,
+ /*0x0038*/ MOVE_HYDRO_PUMP,
+ /*0x0039*/ MOVE_SURF,
+ /*0x003a*/ MOVE_ICE_BEAM,
+ /*0x003b*/ MOVE_BLIZZARD,
+ /*0x003c*/ MOVE_PSYBEAM,
+ /*0x003d*/ MOVE_BUBBLE_BEAM,
+ /*0x003e*/ MOVE_AURORA_BEAM,
+ /*0x003f*/ MOVE_HYPER_BEAM,
+ /*0x0040*/ MOVE_PECK,
+ /*0x0041*/ MOVE_DRILL_PECK,
+ /*0x0042*/ MOVE_SUBMISSION,
+ /*0x0043*/ MOVE_LOW_KICK,
+ /*0x0044*/ MOVE_COUNTER,
+ /*0x0045*/ MOVE_SEISMIC_TOSS,
+ /*0x0046*/ MOVE_STRENGTH,
+ /*0x0047*/ MOVE_ABSORB,
+ /*0x0048*/ MOVE_MEGA_DRAIN,
+ /*0x0049*/ MOVE_LEECH_SEED,
+ /*0x004a*/ MOVE_GROWTH,
+ /*0x004b*/ MOVE_RAZOR_LEAF,
+ /*0x004c*/ MOVE_SOLAR_BEAM,
+ /*0x004d*/ MOVE_POISON_POWDER,
+ /*0x004e*/ MOVE_STUN_SPORE,
+ /*0x004f*/ MOVE_SLEEP_POWDER,
+ /*0x0050*/ MOVE_PETAL_DANCE,
+ /*0x0051*/ MOVE_STRING_SHOT,
+ /*0x0052*/ MOVE_DRAGON_RAGE,
+ /*0x0053*/ MOVE_FIRE_SPIN,
+ /*0x0054*/ MOVE_THUNDER_SHOCK,
+ /*0x0055*/ MOVE_THUNDERBOLT,
+ /*0x0056*/ MOVE_THUNDER_WAVE,
+ /*0x0057*/ MOVE_THUNDER,
+ /*0x0058*/ MOVE_ROCK_THROW,
+ /*0x0059*/ MOVE_EARTHQUAKE,
+ /*0x005a*/ MOVE_FISSURE,
+ /*0x005b*/ MOVE_DIG,
+ /*0x005c*/ MOVE_TOXIC,
+ /*0x005d*/ MOVE_CONFUSION,
+ /*0x005e*/ MOVE_PSYCHIC,
+ /*0x005f*/ MOVE_HYPNOSIS,
+ /*0x0060*/ MOVE_MEDITATE,
+ /*0x0061*/ MOVE_AGILITY,
+ /*0x0062*/ MOVE_QUICK_ATTACK,
+ /*0x0063*/ MOVE_RAGE,
+ /*0x0064*/ MOVE_TELEPORT,
+ /*0x0065*/ MOVE_NIGHT_SHADE,
+ /*0x0066*/ MOVE_MIMIC,
+ /*0x0067*/ MOVE_SCREECH,
+ /*0x0068*/ MOVE_DOUBLE_TEAM,
+ /*0x0069*/ MOVE_RECOVER,
+ /*0x006a*/ MOVE_HARDEN,
+ /*0x006b*/ MOVE_MINIMIZE,
+ /*0x006c*/ MOVE_SMOKESCREEN,
+ /*0x006d*/ MOVE_CONFUSE_RAY,
+ /*0x006e*/ MOVE_WITHDRAW,
+ /*0x006f*/ MOVE_DEFENSE_CURL,
+ /*0x0070*/ MOVE_BARRIER,
+ /*0x0071*/ MOVE_LIGHT_SCREEN,
+ /*0x0072*/ MOVE_HAZE,
+ /*0x0073*/ MOVE_REFLECT,
+ /*0x0074*/ MOVE_FOCUS_ENERGY,
+ /*0x0075*/ MOVE_BIDE,
+ /*0x0076*/ MOVE_METRONOME,
+ /*0x0077*/ MOVE_MIRROR_MOVE,
+ /*0x0078*/ MOVE_SELF_DESTRUCT,
+ /*0x0079*/ MOVE_EGG_BOMB,
+ /*0x007a*/ MOVE_LICK,
+ /*0x007b*/ MOVE_SMOG,
+ /*0x007c*/ MOVE_SLUDGE,
+ /*0x007d*/ MOVE_BONE_CLUB,
+ /*0x007e*/ MOVE_FIRE_BLAST,
+ /*0x007f*/ MOVE_WATERFALL,
+ /*0x0080*/ MOVE_CLAMP,
+ /*0x0081*/ MOVE_SWIFT,
+ /*0x0082*/ MOVE_SKULL_BASH,
+ /*0x0083*/ MOVE_SPIKE_CANNON,
+ /*0x0084*/ MOVE_CONSTRICT,
+ /*0x0085*/ MOVE_AMNESIA,
+ /*0x0086*/ MOVE_KINESIS,
+ /*0x0087*/ MOVE_SOFT_BOILED,
+ /*0x0088*/ MOVE_HI_JUMP_KICK,
+ /*0x0089*/ MOVE_GLARE,
+ /*0x008a*/ MOVE_DREAM_EATER,
+ /*0x008b*/ MOVE_POISON_GAS,
+ /*0x008c*/ MOVE_BARRAGE,
+ /*0x008d*/ MOVE_LEECH_LIFE,
+ /*0x008e*/ MOVE_LOVELY_KISS,
+ /*0x008f*/ MOVE_SKY_ATTACK,
+ /*0x0090*/ MOVE_TRANSFORM,
+ /*0x0091*/ MOVE_BUBBLE,
+ /*0x0092*/ MOVE_DIZZY_PUNCH,
+ /*0x0093*/ MOVE_SPORE,
+ /*0x0094*/ MOVE_FLASH,
+ /*0x0095*/ MOVE_PSYWAVE,
+ /*0x0096*/ MOVE_SPLASH,
+ /*0x0097*/ MOVE_ACID_ARMOR,
+ /*0x0098*/ MOVE_CRABHAMMER,
+ /*0x0099*/ MOVE_EXPLOSION,
+ /*0x009a*/ MOVE_FURY_SWIPES,
+ /*0x009b*/ MOVE_BONEMERANG,
+ /*0x009c*/ MOVE_REST,
+ /*0x009d*/ MOVE_ROCK_SLIDE,
+ /*0x009e*/ MOVE_HYPER_FANG,
+ /*0x009f*/ MOVE_SHARPEN,
+ /*0x00a0*/ MOVE_CONVERSION,
+ /*0x00a1*/ MOVE_TRI_ATTACK,
+ /*0x00a2*/ MOVE_SUPER_FANG,
+ /*0x00a3*/ MOVE_SLASH,
+ /*0x00a4*/ MOVE_SUBSTITUTE,
+ /*0x00a5*/ MOVE_STRUGGLE,
+ /*0x00a6*/ MOVE_SKETCH,
+ /*0x00a7*/ MOVE_TRIPLE_KICK,
+ /*0x00a8*/ MOVE_THIEF,
+ /*0x00a9*/ MOVE_SPIDER_WEB,
+ /*0x00aa*/ MOVE_MIND_READER,
+ /*0x00ab*/ MOVE_NIGHTMARE,
+ /*0x00ac*/ MOVE_FLAME_WHEEL,
+ /*0x00ad*/ MOVE_SNORE,
+ /*0x00ae*/ MOVE_CURSE,
+ /*0x00af*/ MOVE_FLAIL,
+ /*0x00b0*/ MOVE_CONVERSION_2,
+ /*0x00b1*/ MOVE_AEROBLAST,
+ /*0x00b2*/ MOVE_COTTON_SPORE,
+ /*0x00b3*/ MOVE_REVERSAL,
+ /*0x00b4*/ MOVE_SPITE,
+ /*0x00b5*/ MOVE_POWDER_SNOW,
+ /*0x00b6*/ MOVE_PROTECT,
+ /*0x00b7*/ MOVE_MACH_PUNCH,
+ /*0x00b8*/ MOVE_SCARY_FACE,
+ /*0x00b9*/ MOVE_FAINT_ATTACK,
+ /*0x00ba*/ MOVE_SWEET_KISS,
+ /*0x00bb*/ MOVE_BELLY_DRUM,
+ /*0x00bc*/ MOVE_SLUDGE_BOMB,
+ /*0x00bd*/ MOVE_MUD_SLAP,
+ /*0x00be*/ MOVE_OCTAZOOKA,
+ /*0x00bf*/ MOVE_SPIKES,
+ /*0x00c0*/ MOVE_ZAP_CANNON,
+ /*0x00c1*/ MOVE_FORESIGHT,
+ /*0x00c2*/ MOVE_DESTINY_BOND,
+ /*0x00c3*/ MOVE_PERISH_SONG,
+ /*0x00c4*/ MOVE_ICY_WIND,
+ /*0x00c5*/ MOVE_DETECT,
+ /*0x00c6*/ MOVE_BONE_RUSH,
+ /*0x00c7*/ MOVE_LOCK_ON,
+ /*0x00c8*/ MOVE_OUTRAGE,
+ /*0x00c9*/ MOVE_SANDSTORM,
+ /*0x00ca*/ MOVE_GIGA_DRAIN,
+ /*0x00cb*/ MOVE_ENDURE,
+ /*0x00cc*/ MOVE_CHARM,
+ /*0x00cd*/ MOVE_ROLLOUT,
+ /*0x00ce*/ MOVE_FALSE_SWIPE,
+ /*0x00cf*/ MOVE_SWAGGER,
+ /*0x00d0*/ MOVE_MILK_DRINK,
+ /*0x00d1*/ MOVE_SPARK,
+ /*0x00d2*/ MOVE_FURY_CUTTER,
+ /*0x00d3*/ MOVE_STEEL_WING,
+ /*0x00d4*/ MOVE_MEAN_LOOK,
+ /*0x00d5*/ MOVE_ATTRACT,
+ /*0x00d6*/ MOVE_SLEEP_TALK,
+ /*0x00d7*/ MOVE_HEAL_BELL,
+ /*0x00d8*/ MOVE_RETURN,
+ /*0x00d9*/ MOVE_PRESENT,
+ /*0x00da*/ MOVE_FRUSTRATION,
+ /*0x00db*/ MOVE_SAFEGUARD,
+ /*0x00dc*/ MOVE_PAIN_SPLIT,
+ /*0x00dd*/ MOVE_SACRED_FIRE,
+ /*0x00de*/ MOVE_MAGNITUDE,
+ /*0x00df*/ MOVE_DYNAMIC_PUNCH,
+ /*0x00e0*/ MOVE_MEGAHORN,
+ /*0x00e1*/ MOVE_DRAGON_BREATH,
+ /*0x00e2*/ MOVE_BATON_PASS,
+ /*0x00e3*/ MOVE_ENCORE,
+ /*0x00e4*/ MOVE_PURSUIT,
+ /*0x00e5*/ MOVE_RAPID_SPIN,
+ /*0x00e6*/ MOVE_SWEET_SCENT,
+ /*0x00e7*/ MOVE_IRON_TAIL,
+ /*0x00e8*/ MOVE_METAL_CLAW,
+ /*0x00e9*/ MOVE_VITAL_THROW,
+ /*0x00ea*/ MOVE_MORNING_SUN,
+ /*0x00eb*/ MOVE_SYNTHESIS,
+ /*0x00ec*/ MOVE_MOONLIGHT,
+ /*0x00ed*/ MOVE_HIDDEN_POWER,
+ /*0x00ee*/ MOVE_CROSS_CHOP,
+ /*0x00ef*/ MOVE_TWISTER,
+ /*0x00f0*/ MOVE_RAIN_DANCE,
+ /*0x00f1*/ MOVE_SUNNY_DAY,
+ /*0x00f2*/ MOVE_CRUNCH,
+ /*0x00f3*/ MOVE_MIRROR_COAT,
+ /*0x00f4*/ MOVE_PSYCH_UP,
+ /*0x00f5*/ MOVE_EXTREME_SPEED,
+ /*0x00f6*/ MOVE_ANCIENT_POWER,
+ /*0x00f7*/ MOVE_SHADOW_BALL,
+ /*0x00f8*/ MOVE_FUTURE_SIGHT,
+ /*0x00f9*/ MOVE_ROCK_SMASH,
+ /*0x00fa*/ MOVE_WHIRLPOOL,
+ /*0x00fb*/ MOVE_BEAT_UP,
+ /*0x00fc*/ MOVE_FAKE_OUT,
+ /*0x00fd*/ MOVE_UPROAR,
+ /*0x00fe*/ MOVE_STOCKPILE,
+ /*0x00ff*/ MOVE_SPIT_UP,
+ /*0x0100*/ MOVE_SWALLOW,
+ /*0x0101*/ MOVE_HEAT_WAVE,
+ /*0x0102*/ MOVE_HAIL,
+ /*0x0103*/ MOVE_TORMENT,
+ /*0x0104*/ MOVE_FLATTER,
+ /*0x0105*/ MOVE_WILL_O_WISP,
+ /*0x0106*/ MOVE_MEMENTO,
+ /*0x0107*/ MOVE_FACADE,
+ /*0x0108*/ MOVE_FOCUS_PUNCH,
+ /*0x0109*/ MOVE_SMELLING_SALT,
+ /*0x010a*/ MOVE_FOLLOW_ME,
+ /*0x010b*/ MOVE_NATURE_POWER,
+ /*0x010c*/ MOVE_CHARGE,
+ /*0x010d*/ MOVE_TAUNT,
+ /*0x010e*/ MOVE_HELPING_HAND,
+ /*0x010f*/ MOVE_TRICK,
+ /*0x0110*/ MOVE_ROLE_PLAY,
+ /*0x0111*/ MOVE_WISH,
+ /*0x0112*/ MOVE_ASSIST,
+ /*0x0113*/ MOVE_INGRAIN,
+ /*0x0114*/ MOVE_SUPERPOWER,
+ /*0x0115*/ MOVE_MAGIC_COAT,
+ /*0x0116*/ MOVE_RECYCLE,
+ /*0x0117*/ MOVE_REVENGE,
+ /*0x0118*/ MOVE_BRICK_BREAK,
+ /*0x0119*/ MOVE_YAWN,
+ /*0x011a*/ MOVE_KNOCK_OFF,
+ /*0x011b*/ MOVE_ENDEAVOR,
+ /*0x011c*/ MOVE_ERUPTION,
+ /*0x011d*/ MOVE_SKILL_SWAP,
+ /*0x011e*/ MOVE_IMPRISON,
+ /*0x011f*/ MOVE_REFRESH,
+ /*0x0120*/ MOVE_GRUDGE,
+ /*0x0121*/ MOVE_SNATCH,
+ /*0x0122*/ MOVE_SECRET_POWER,
+ /*0x0123*/ MOVE_DIVE,
+ /*0x0124*/ MOVE_ARM_THRUST,
+ /*0x0125*/ MOVE_CAMOUFLAGE,
+ /*0x0126*/ MOVE_TAIL_GLOW,
+ /*0x0127*/ MOVE_LUSTER_PURGE,
+ /*0x0128*/ MOVE_MIST_BALL,
+ /*0x0129*/ MOVE_FEATHER_DANCE,
+ /*0x012a*/ MOVE_TEETER_DANCE,
+ /*0x012b*/ MOVE_BLAZE_KICK,
+ /*0x012c*/ MOVE_MUD_SPORT,
+ /*0x012d*/ MOVE_ICE_BALL,
+ /*0x012e*/ MOVE_NEEDLE_ARM,
+ /*0x012f*/ MOVE_SLACK_OFF,
+ /*0x0130*/ MOVE_HYPER_VOICE,
+ /*0x0131*/ MOVE_POISON_FANG,
+ /*0x0132*/ MOVE_CRUSH_CLAW,
+ /*0x0133*/ MOVE_BLAST_BURN,
+ /*0x0134*/ MOVE_HYDRO_CANNON,
+ /*0x0135*/ MOVE_METEOR_MASH,
+ /*0x0136*/ MOVE_ASTONISH,
+ /*0x0137*/ MOVE_WEATHER_BALL,
+ /*0x0138*/ MOVE_AROMATHERAPY,
+ /*0x0139*/ MOVE_FAKE_TEARS,
+ /*0x013a*/ MOVE_AIR_CUTTER,
+ /*0x013b*/ MOVE_OVERHEAT,
+ /*0x013c*/ MOVE_ODOR_SLEUTH,
+ /*0x013d*/ MOVE_ROCK_TOMB,
+ /*0x013e*/ MOVE_SILVER_WIND,
+ /*0x013f*/ MOVE_METAL_SOUND,
+ /*0x0140*/ MOVE_GRASS_WHISTLE,
+ /*0x0141*/ MOVE_TICKLE,
+ /*0x0142*/ MOVE_COSMIC_POWER,
+ /*0x0143*/ MOVE_WATER_SPOUT,
+ /*0x0144*/ MOVE_SIGNAL_BEAM,
+ /*0x0145*/ MOVE_SHADOW_PUNCH,
+ /*0x0146*/ MOVE_EXTRASENSORY,
+ /*0x0147*/ MOVE_SKY_UPPERCUT,
+ /*0x0148*/ MOVE_SAND_TOMB,
+ /*0x0149*/ MOVE_SHEER_COLD,
+ /*0x014a*/ MOVE_MUDDY_WATER,
+ /*0x014b*/ MOVE_BULLET_SEED,
+ /*0x014c*/ MOVE_AERIAL_ACE,
+ /*0x014d*/ MOVE_ICICLE_SPEAR,
+ /*0x014e*/ MOVE_IRON_DEFENSE,
+ /*0x014f*/ MOVE_BLOCK,
+ /*0x0150*/ MOVE_HOWL,
+ /*0x0151*/ MOVE_DRAGON_CLAW,
+ /*0x0152*/ MOVE_FRENZY_PLANT,
+ /*0x0153*/ MOVE_BULK_UP,
+ /*0x0154*/ MOVE_BOUNCE,
+ /*0x0155*/ MOVE_MUD_SHOT,
+ /*0x0156*/ MOVE_POISON_TAIL,
+ /*0x0157*/ MOVE_COVET,
+ /*0x0158*/ MOVE_VOLT_TACKLE,
+ /*0x0159*/ MOVE_MAGICAL_LEAF,
+ /*0x015a*/ MOVE_WATER_SPORT,
+ /*0x015b*/ MOVE_CALM_MIND,
+ /*0x015c*/ MOVE_LEAF_BLADE,
+ /*0x015d*/ MOVE_DRAGON_DANCE,
+ /*0x015e*/ MOVE_ROCK_BLAST,
+ /*0x015f*/ MOVE_SHOCK_WAVE,
+ /*0x0160*/ MOVE_WATER_PULSE,
+ /*0x0161*/ MOVE_DOOM_DESIRE,
+ /*0x0162*/ MOVE_PSYCHO_BOOST,
 };
 
 #endif // GUARD_MOVES_H
\ No newline at end of file
diff --git a/include/region_map_sections.h b/include/region_map_sections.h
new file mode 100755
index 000000000..3b7c5d9eb
--- /dev/null
+++ b/include/region_map_sections.h
@@ -0,0 +1,60 @@
+#ifndef GUARD_REGIONMAPSEC_H
+#define GUARD_REGIONMAPSEC_H
+
+enum
+{
+    MAPSEC_LittlerootTown, // 0x00
+    MAPSEC_OldaleTown,     // 0x01
+    MAPSEC_DewfordTown,    // 0x02
+    MAPSEC_LavaridgeTown,  // 0x03
+    MAPSEC_FallarborTown,  // 0x04
+    MAPSEC_VerdanturfTown, // 0x05
+    MAPSEC_PacifidlogTown, // 0x06
+    MAPSEC_PetalburgCity,  // 0x07
+    MAPSEC_SlateportCity,  // 0x08
+    MAPSEC_MauvilleCity,   // 0x09
+    MAPSEC_RustboroCity,   // 0x0A
+    MAPSEC_FortreeCity,    // 0x0B
+    MAPSEC_LilycoveCity,   // 0x0C
+    MAPSEC_MossdeepCity,   // 0x0D
+    MAPSEC_SootopolisCity, // 0x0E
+    MAPSEC_EverGrandeCity, // 0x0F
+    MAPSEC_Route101,       // 0x10
+    MAPSEC_Route102,       // 0x11
+    MAPSEC_Route103,       // 0x12
+    MAPSEC_Route104,       // 0x13
+    MAPSEC_Route105,       // 0x14
+    MAPSEC_Route106,       // 0x15
+    MAPSEC_Route107,       // 0x16
+    MAPSEC_Route108,       // 0x17
+    MAPSEC_Route109,       // 0x18
+    MAPSEC_Route110,       // 0x19
+    MAPSEC_Route111,       // 0x1A
+    MAPSEC_Route112,       // 0x1B
+    MAPSEC_Route113,       // 0x1C
+    MAPSEC_Route114,       // 0x1D
+    MAPSEC_Route115,       // 0x1E
+    MAPSEC_Route116,       // 0x1F
+    MAPSEC_Route117,       // 0x20
+    MAPSEC_Route118,       // 0x21
+    MAPSEC_Route119,       // 0x22
+    MAPSEC_Route120,       // 0x23
+    MAPSEC_Route121,       // 0x24
+    MAPSEC_Route122,       // 0x25
+    MAPSEC_Route123,       // 0x26
+    MAPSEC_Route124,       // 0x27
+    MAPSEC_Route125,       // 0x28
+    MAPSEC_Route126,       // 0x29
+    MAPSEC_Route127,       // 0x2A
+    MAPSEC_Route128,       // 0x2B
+    MAPSEC_Route129,       // 0x2C
+    MAPSEC_Route130,       // 0x2D
+    MAPSEC_Route131,       // 0x2E
+    MAPSEC_Route132,       // 0x2F
+    MAPSEC_Route133,       // 0x30
+    MAPSEC_Route134,       // 0x31
+    MAPSEC_MtChimney,      // 0x38
+    MAPSEC_Nothing,        // 0x58
+};
+
+#endif // GUARD_REGIONMAPSEC_H
diff --git a/include/tv.h b/include/tv.h
index a933e1779..0f355043c 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -18,8 +18,6 @@ enum
     TVSHOW_MASS_OUTBREAK = 41,
 };
 
-extern u8 *const gUnknown_083D1464[3];
-
 void ClearTVShowData(void);
 u8 sub_80BDEAC(u8 *);
 void sub_80BE028(void);