merge with master

2018-08-12 12:11:35 +02:00
parent e787d5b602 40cf61307b
commit 957dcd01b3
148 changed files with 6964 additions and 11586 deletions
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -42,5 +42,6 @@ void sub_81628A0(union BattleTowerRecord *);
 void sub_8162614(u16 trainerId, u8);
 void ConvertBattleFrontierTrainerSpeechToString(u16 *words);
 void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
+void GetEreaderTrainerName(u8 *dest);

 #endif //GUARD_BATTLE_TOWER_H
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CABLE_CLUB_H
 #define GUARD_CABLE_CLUB_H

+#include "task.h"
+
 // Exported type declarations

 // Exported RAM declarations
@@ -11,5 +13,6 @@ void sub_80B37D4(TaskFunc taskFunc);
 u8 sub_80B3050(void);
 void sub_80B360C(void);
 bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
+void sub_80B3AF8(u8 taskId);

 #endif //GUARD_CABLE_CLUB_H
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -199,7 +199,7 @@
 #define FLAG_0x0C4               0xC4
 #define FLAG_0x0C5               0xC5
 #define FLAG_0x0C6               0xC6
-#define FLAG_0x0C7               0xC7
+#define FLAG_RUSTURF_TUNNEL_OPENED               0xC7
 #define FLAG_0x0C8               0xC8
 #define FLAG_0x0C9               0xC9
 #define FLAG_0x0CA               0xCA
@@ -532,10 +532,10 @@
 #define FLAG_0x210               0x210
 #define FLAG_0x211               0x211
 #define FLAG_0x212               0x212
-#define FLAG_0x213               0x213
-#define FLAG_0x214               0x214
-#define FLAG_0x215               0x215
-#define FLAG_0x216               0x216
+#define FLAG_HIDDEN_ITEM_1F               0x213
+#define FLAG_HIDDEN_ITEM_20               0x214
+#define FLAG_HIDDEN_ITEM_21               0x215
+#define FLAG_HIDDEN_ITEM_22               0x216
 #define FLAG_0x217               0x217
 #define FLAG_0x218               0x218
 #define FLAG_0x219               0x219
@@ -597,7 +597,7 @@
 #define FLAG_0x251               0x251
 #define FLAG_0x252               0x252
 #define FLAG_0x253               0x253
-#define FLAG_0x254               0x254
+#define FLAG_HIDDEN_ITEM_BLACK_GLASSES               0x254
 #define FLAG_0x255               0x255
 #define FLAG_0x256               0x256
 #define FLAG_0x257               0x257
@@ -790,10 +790,10 @@
 #define FLAG_0x312               0x312
 #define FLAG_0x313               0x313
 #define FLAG_0x314               0x314
-#define FLAG_0x315               0x315
-#define FLAG_0x316               0x316
-#define FLAG_0x317               0x317
-#define FLAG_0x318               0x318
+#define FLAG_HIDE_FANCLUB_OLD_LADY               0x315
+#define FLAG_HIDE_FANCLUB_BOY               0x316
+#define FLAG_HIDE_FANCLUB_LITTLE_BOY               0x317
+#define FLAG_HIDE_FANCLUB_LADY               0x318
 #define FLAG_0x319               0x319
 #define FLAG_0x31A               0x31A
 #define FLAG_0x31B               0x31B
@@ -932,8 +932,8 @@
 #define FLAG_0x3A0               0x3A0
 #define FLAG_0x3A1               0x3A1
 #define FLAG_0x3A2               0x3A2
-#define FLAG_0x3A3               0x3A3
-#define FLAG_0x3A4               0x3A4
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1               0x3A3
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2               0x3A4
 #define FLAG_0x3A5               0x3A5
 #define FLAG_0x3A6               0x3A6
 #define FLAG_0x3A7               0x3A7
--- a/include/constants/heal_locations.h
+++ b/include/constants/heal_locations.h
@@ -0,0 +1,27 @@
+#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H
+#define GUARD_CONSTANTS_HEAL_LOCATIONS_H
+
+#define HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 1
+#define HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F 2
+#define HEAL_LOCATION_PETALBURG_CITY 3
+#define HEAL_LOCATION_SLATEPORT_CITY 4
+#define HEAL_LOCATION_MAUVILLE_CITY 5
+#define HEAL_LOCATION_RUSTBORO_CITY 6
+#define HEAL_LOCATION_FORTREE_CITY 7
+#define HEAL_LOCATION_LILYCOVE_CITY 8
+#define HEAL_LOCATION_MOSSDEEP_CITY 9
+#define HEAL_LOCATION_SOOTOPOLIS_CITY 10
+#define HEAL_LOCATION_EVER_GRANDE_CITY_1 11
+#define HEAL_LOCATION_LITTLEROOT_TOWN_1 12
+#define HEAL_LOCATION_LITTLEROOT_TOWN_2 13
+#define HEAL_LOCATION_OLDALE_TOWN 14
+#define HEAL_LOCATION_DEWFORD_TOWN 15
+#define HEAL_LOCATION_LAVARIDGE_TOWN 16
+#define HEAL_LOCATION_FALLARBOR_TOWN 17
+#define HEAL_LOCATION_VERDANTURF_TOWN 18
+#define HEAL_LOCATION_PACIFIDLOG_TOWN 19
+#define HEAL_LOCATION_EVER_GRANDE_CITY_2 20
+#define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21
+#define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22
+
+#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -49,13 +49,13 @@
 #define VAR_RECYCLE_GOODS          0x4020
 #define VAR_REPEL_STEP_COUNT       0x4021
 #define VAR_ICE_STEP_COUNT         0x4022
-#define VAR_FIRST_POKE             0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
+#define VAR_STARTER_MON            0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
 #define VAR_MIRAGE_RND_H           0x4024
 #define VAR_MIRAGE_RND_L           0x4025
 #define VAR_SECRET_BASE_MAP        0x4026
-#define VAR_0x4027                 0x4027
-#define VAR_0x4028                 0x4028
-#define VAR_0x4029                 0x4029
+#define VAR_CYCLING_ROAD_RECORD_COLLISIONS                 0x4027
+#define VAR_CYCLING_ROAD_RECORD_TIME_L                 0x4028
+#define VAR_CYCLING_ROAD_RECORD_TIME_H                 0x4029
 #define VAR_HAPPINESS_STEP_COUNTER 0x402A
 #define VAR_POISON_STEP_COUNTER    0x402B
 #define VAR_RESET_RTC_ENABLE       0x402C
@@ -81,8 +81,8 @@
 #define VAR_ALTERING_CAVE_WILD_SET 0x403E
 #define VAR_0x403F                 0x403F
 #define VAR_DAYS                   0x4040
-#define VAR_0x4041                 0x4041
-#define VAR_0x4042                 0x4042
+#define VAR_FANCLUB_UNKNOWN_1                 0x4041
+#define VAR_FANCLUB_UNKNOWN_2                 0x4042
 #define VAR_DEPT_STORE_FLOOR       0x4043
 #define VAR_0x4044                 0x4044
 #define VAR_POKELOT_PRIZE          0x4045
@@ -165,12 +165,12 @@
 #define VAR_0x4092                 0x4092
 #define VAR_0x4093                 0x4093
 #define VAR_0x4094                 0x4094
-#define VAR_0x4095                 0x4095
+#define VAR_LILYCOVE_FAN_CLUB_STATE                 0x4095
 #define VAR_0x4096                 0x4096
 #define VAR_0x4097                 0x4097
 #define VAR_0x4098                 0x4098
 #define VAR_0x4099                 0x4099
-#define VAR_0x409A                 0x409A
+#define VAR_RUSTURF_TUNNEL_STATE                 0x409A
 #define VAR_0x409B                 0x409B
 #define VAR_0x409C                 0x409C
 #define VAR_0x409D                 0x409D
@@ -185,7 +185,7 @@
 #define VAR_0x40A6                 0x40A6
 #define VAR_0x40A7                 0x40A7
 #define VAR_0x40A8                 0x40A8
-#define VAR_0x40A9                 0x40A9
+#define VAR_CYCLING_CHALLENGE_STATE                 0x40A9
 #define VAR_0x40AA                 0x40AA
 #define VAR_0x40AB                 0x40AB
 #define VAR_0x40AC                 0x40AC
@@ -196,7 +196,7 @@
 #define VAR_0x40B1                 0x40B1
 #define VAR_0x40B2                 0x40B2
 #define VAR_WEATHER_INSTITUTE_STATE                 0x40B3
-#define VAR_PORTHOLE               0x40B4
+#define VAR_PORTHOLE_STATE               0x40B4
 #define VAR_0x40B5                 0x40B5
 #define VAR_0x40B6                 0x40B6
 #define VAR_0x40B7                 0x40B7
@@ -210,7 +210,7 @@
 #define VAR_0x40BF                 0x40BF
 #define VAR_0x40C0                 0x40C0
 #define VAR_0x40C1                 0x40C1
-#define VAR_0x40C2                 0x40C2
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY                 0x40C2
 #define VAR_0x40C3                 0x40C3
 #define VAR_0x40C4                 0x40C4
 #define VAR_0x40C5                 0x40C5
--- a/include/data/pokemon/level_up_learnset_pointers.h
+++ b/include/data/pokemon/level_up_learnset_pointers.h
@@ -1,420 +1,420 @@
 #ifndef POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H
 #define POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H

-const u16 *const gLevelUpLearnsets[] =
+const u16 *const gLevelUpLearnsets[NUM_SPECIES] =
 {
-    gBulbasaurLevelUpLearnset,
-    gBulbasaurLevelUpLearnset,
-    gIvysaurLevelUpLearnset,
-    gVenusaurLevelUpLearnset,
-    gCharmanderLevelUpLearnset,
-    gCharmeleonLevelUpLearnset,
-    gCharizardLevelUpLearnset,
-    gSquirtleLevelUpLearnset,
-    gWartortleLevelUpLearnset,
-    gBlastoiseLevelUpLearnset,
-    gCaterpieLevelUpLearnset,
-    gMetapodLevelUpLearnset,
-    gButterfreeLevelUpLearnset,
-    gWeedleLevelUpLearnset,
-    gKakunaLevelUpLearnset,
-    gBeedrillLevelUpLearnset,
-    gPidgeyLevelUpLearnset,
-    gPidgeottoLevelUpLearnset,
-    gPidgeotLevelUpLearnset,
-    gRattataLevelUpLearnset,
-    gRaticateLevelUpLearnset,
-    gSpearowLevelUpLearnset,
-    gFearowLevelUpLearnset,
-    gEkansLevelUpLearnset,
-    gArbokLevelUpLearnset,
-    gPikachuLevelUpLearnset,
-    gRaichuLevelUpLearnset,
-    gSandshrewLevelUpLearnset,
-    gSandslashLevelUpLearnset,
-    gNidoranFLevelUpLearnset,
-    gNidorinaLevelUpLearnset,
-    gNidoqueenLevelUpLearnset,
-    gNidoranMLevelUpLearnset,
-    gNidorinoLevelUpLearnset,
-    gNidokingLevelUpLearnset,
-    gClefairyLevelUpLearnset,
-    gClefableLevelUpLearnset,
-    gVulpixLevelUpLearnset,
-    gNinetalesLevelUpLearnset,
-    gJigglypuffLevelUpLearnset,
-    gWigglytuffLevelUpLearnset,
-    gZubatLevelUpLearnset,
-    gGolbatLevelUpLearnset,
-    gOddishLevelUpLearnset,
-    gGloomLevelUpLearnset,
-    gVileplumeLevelUpLearnset,
-    gParasLevelUpLearnset,
-    gParasectLevelUpLearnset,
-    gVenonatLevelUpLearnset,
-    gVenomothLevelUpLearnset,
-    gDiglettLevelUpLearnset,
-    gDugtrioLevelUpLearnset,
-    gMeowthLevelUpLearnset,
-    gPersianLevelUpLearnset,
-    gPsyduckLevelUpLearnset,
-    gGolduckLevelUpLearnset,
-    gMankeyLevelUpLearnset,
-    gPrimeapeLevelUpLearnset,
-    gGrowlitheLevelUpLearnset,
-    gArcanineLevelUpLearnset,
-    gPoliwagLevelUpLearnset,
-    gPoliwhirlLevelUpLearnset,
-    gPoliwrathLevelUpLearnset,
-    gAbraLevelUpLearnset,
-    gKadabraLevelUpLearnset,
-    gAlakazamLevelUpLearnset,
-    gMachopLevelUpLearnset,
-    gMachokeLevelUpLearnset,
-    gMachampLevelUpLearnset,
-    gBellsproutLevelUpLearnset,
-    gWeepinbellLevelUpLearnset,
-    gVictreebelLevelUpLearnset,
-    gTentacoolLevelUpLearnset,
-    gTentacruelLevelUpLearnset,
-    gGeodudeLevelUpLearnset,
-    gGravelerLevelUpLearnset,
-    gGolemLevelUpLearnset,
-    gPonytaLevelUpLearnset,
-    gRapidashLevelUpLearnset,
-    gSlowpokeLevelUpLearnset,
-    gSlowbroLevelUpLearnset,
-    gMagnemiteLevelUpLearnset,
-    gMagnetonLevelUpLearnset,
-    gFarfetchdLevelUpLearnset,
-    gDoduoLevelUpLearnset,
-    gDodrioLevelUpLearnset,
-    gSeelLevelUpLearnset,
-    gDewgongLevelUpLearnset,
-    gGrimerLevelUpLearnset,
-    gMukLevelUpLearnset,
-    gShellderLevelUpLearnset,
-    gCloysterLevelUpLearnset,
-    gGastlyLevelUpLearnset,
-    gHaunterLevelUpLearnset,
-    gGengarLevelUpLearnset,
-    gOnixLevelUpLearnset,
-    gDrowzeeLevelUpLearnset,
-    gHypnoLevelUpLearnset,
-    gKrabbyLevelUpLearnset,
-    gKinglerLevelUpLearnset,
-    gVoltorbLevelUpLearnset,
-    gElectrodeLevelUpLearnset,
-    gExeggcuteLevelUpLearnset,
-    gExeggutorLevelUpLearnset,
-    gCuboneLevelUpLearnset,
-    gMarowakLevelUpLearnset,
-    gHitmonleeLevelUpLearnset,
-    gHitmonchanLevelUpLearnset,
-    gLickitungLevelUpLearnset,
-    gKoffingLevelUpLearnset,
-    gWeezingLevelUpLearnset,
-    gRhyhornLevelUpLearnset,
-    gRhydonLevelUpLearnset,
-    gChanseyLevelUpLearnset,
-    gTangelaLevelUpLearnset,
-    gKangaskhanLevelUpLearnset,
-    gHorseaLevelUpLearnset,
-    gSeadraLevelUpLearnset,
-    gGoldeenLevelUpLearnset,
-    gSeakingLevelUpLearnset,
-    gStaryuLevelUpLearnset,
-    gStarmieLevelUpLearnset,
-    gMrmimeLevelUpLearnset,
-    gScytherLevelUpLearnset,
-    gJynxLevelUpLearnset,
-    gElectabuzzLevelUpLearnset,
-    gMagmarLevelUpLearnset,
-    gPinsirLevelUpLearnset,
-    gTaurosLevelUpLearnset,
-    gMagikarpLevelUpLearnset,
-    gGyaradosLevelUpLearnset,
-    gLaprasLevelUpLearnset,
-    gDittoLevelUpLearnset,
-    gEeveeLevelUpLearnset,
-    gVaporeonLevelUpLearnset,
-    gJolteonLevelUpLearnset,
-    gFlareonLevelUpLearnset,
-    gPorygonLevelUpLearnset,
-    gOmanyteLevelUpLearnset,
-    gOmastarLevelUpLearnset,
-    gKabutoLevelUpLearnset,
-    gKabutopsLevelUpLearnset,
-    gAerodactylLevelUpLearnset,
-    gSnorlaxLevelUpLearnset,
-    gArticunoLevelUpLearnset,
-    gZapdosLevelUpLearnset,
-    gMoltresLevelUpLearnset,
-    gDratiniLevelUpLearnset,
-    gDragonairLevelUpLearnset,
-    gDragoniteLevelUpLearnset,
-    gMewtwoLevelUpLearnset,
-    gMewLevelUpLearnset,
-    gChikoritaLevelUpLearnset,
-    gBayleefLevelUpLearnset,
-    gMeganiumLevelUpLearnset,
-    gCyndaquilLevelUpLearnset,
-    gQuilavaLevelUpLearnset,
-    gTyphlosionLevelUpLearnset,
-    gTotodileLevelUpLearnset,
-    gCroconawLevelUpLearnset,
-    gFeraligatrLevelUpLearnset,
-    gSentretLevelUpLearnset,
-    gFurretLevelUpLearnset,
-    gHoothootLevelUpLearnset,
-    gNoctowlLevelUpLearnset,
-    gLedybaLevelUpLearnset,
-    gLedianLevelUpLearnset,
-    gSpinarakLevelUpLearnset,
-    gAriadosLevelUpLearnset,
-    gCrobatLevelUpLearnset,
-    gChinchouLevelUpLearnset,
-    gLanturnLevelUpLearnset,
-    gPichuLevelUpLearnset,
-    gCleffaLevelUpLearnset,
-    gIgglybuffLevelUpLearnset,
-    gTogepiLevelUpLearnset,
-    gTogeticLevelUpLearnset,
-    gNatuLevelUpLearnset,
-    gXatuLevelUpLearnset,
-    gMareepLevelUpLearnset,
-    gFlaaffyLevelUpLearnset,
-    gAmpharosLevelUpLearnset,
-    gBellossomLevelUpLearnset,
-    gMarillLevelUpLearnset,
-    gAzumarillLevelUpLearnset,
-    gSudowoodoLevelUpLearnset,
-    gPolitoedLevelUpLearnset,
-    gHoppipLevelUpLearnset,
-    gSkiploomLevelUpLearnset,
-    gJumpluffLevelUpLearnset,
-    gAipomLevelUpLearnset,
-    gSunkernLevelUpLearnset,
-    gSunfloraLevelUpLearnset,
-    gYanmaLevelUpLearnset,
-    gWooperLevelUpLearnset,
-    gQuagsireLevelUpLearnset,
-    gEspeonLevelUpLearnset,
-    gUmbreonLevelUpLearnset,
-    gMurkrowLevelUpLearnset,
-    gSlowkingLevelUpLearnset,
-    gMisdreavusLevelUpLearnset,
-    gUnownLevelUpLearnset,
-    gWobbuffetLevelUpLearnset,
-    gGirafarigLevelUpLearnset,
-    gPinecoLevelUpLearnset,
-    gForretressLevelUpLearnset,
-    gDunsparceLevelUpLearnset,
-    gGligarLevelUpLearnset,
-    gSteelixLevelUpLearnset,
-    gSnubbullLevelUpLearnset,
-    gGranbullLevelUpLearnset,
-    gQwilfishLevelUpLearnset,
-    gScizorLevelUpLearnset,
-    gShuckleLevelUpLearnset,
-    gHeracrossLevelUpLearnset,
-    gSneaselLevelUpLearnset,
-    gTeddiursaLevelUpLearnset,
-    gUrsaringLevelUpLearnset,
-    gSlugmaLevelUpLearnset,
-    gMagcargoLevelUpLearnset,
-    gSwinubLevelUpLearnset,
-    gPiloswineLevelUpLearnset,
-    gCorsolaLevelUpLearnset,
-    gRemoraidLevelUpLearnset,
-    gOctilleryLevelUpLearnset,
-    gDelibirdLevelUpLearnset,
-    gMantineLevelUpLearnset,
-    gSkarmoryLevelUpLearnset,
-    gHoundourLevelUpLearnset,
-    gHoundoomLevelUpLearnset,
-    gKingdraLevelUpLearnset,
-    gPhanpyLevelUpLearnset,
-    gDonphanLevelUpLearnset,
-    gPorygon2LevelUpLearnset,
-    gStantlerLevelUpLearnset,
-    gSmeargleLevelUpLearnset,
-    gTyrogueLevelUpLearnset,
-    gHitmontopLevelUpLearnset,
-    gSmoochumLevelUpLearnset,
-    gElekidLevelUpLearnset,
-    gMagbyLevelUpLearnset,
-    gMiltankLevelUpLearnset,
-    gBlisseyLevelUpLearnset,
-    gRaikouLevelUpLearnset,
-    gEnteiLevelUpLearnset,
-    gSuicuneLevelUpLearnset,
-    gLarvitarLevelUpLearnset,
-    gPupitarLevelUpLearnset,
-    gTyranitarLevelUpLearnset,
-    gLugiaLevelUpLearnset,
-    gHoOhLevelUpLearnset,
-    gCelebiLevelUpLearnset,
-    gSpecies252LevelUpLearnset,
-    gSpecies253LevelUpLearnset,
-    gSpecies254LevelUpLearnset,
-    gSpecies255LevelUpLearnset,
-    gSpecies256LevelUpLearnset,
-    gSpecies257LevelUpLearnset,
-    gSpecies258LevelUpLearnset,
-    gSpecies259LevelUpLearnset,
-    gSpecies260LevelUpLearnset,
-    gSpecies261LevelUpLearnset,
-    gSpecies262LevelUpLearnset,
-    gSpecies263LevelUpLearnset,
-    gSpecies264LevelUpLearnset,
-    gSpecies265LevelUpLearnset,
-    gSpecies266LevelUpLearnset,
-    gSpecies267LevelUpLearnset,
-    gSpecies268LevelUpLearnset,
-    gSpecies269LevelUpLearnset,
-    gSpecies270LevelUpLearnset,
-    gSpecies271LevelUpLearnset,
-    gSpecies272LevelUpLearnset,
-    gSpecies273LevelUpLearnset,
-    gSpecies274LevelUpLearnset,
-    gSpecies275LevelUpLearnset,
-    gSpecies276LevelUpLearnset,
-    gTreeckoLevelUpLearnset,
-    gGrovyleLevelUpLearnset,
-    gSceptileLevelUpLearnset,
-    gTorchicLevelUpLearnset,
-    gCombuskenLevelUpLearnset,
-    gBlazikenLevelUpLearnset,
-    gMudkipLevelUpLearnset,
-    gMarshtompLevelUpLearnset,
-    gSwampertLevelUpLearnset,
-    gPoochyenaLevelUpLearnset,
-    gMightyenaLevelUpLearnset,
-    gZigzagoonLevelUpLearnset,
-    gLinooneLevelUpLearnset,
-    gWurmpleLevelUpLearnset,
-    gSilcoonLevelUpLearnset,
-    gBeautiflyLevelUpLearnset,
-    gCascoonLevelUpLearnset,
-    gDustoxLevelUpLearnset,
-    gLotadLevelUpLearnset,
-    gLombreLevelUpLearnset,
-    gLudicoloLevelUpLearnset,
-    gSeedotLevelUpLearnset,
-    gNuzleafLevelUpLearnset,
-    gShiftryLevelUpLearnset,
-    gNincadaLevelUpLearnset,
-    gNinjaskLevelUpLearnset,
-    gShedinjaLevelUpLearnset,
-    gTaillowLevelUpLearnset,
-    gSwellowLevelUpLearnset,
-    gShroomishLevelUpLearnset,
-    gBreloomLevelUpLearnset,
-    gSpindaLevelUpLearnset,
-    gWingullLevelUpLearnset,
-    gPelipperLevelUpLearnset,
-    gSurskitLevelUpLearnset,
-    gMasquerainLevelUpLearnset,
-    gWailmerLevelUpLearnset,
-    gWailordLevelUpLearnset,
-    gSkittyLevelUpLearnset,
-    gDelcattyLevelUpLearnset,
-    gKecleonLevelUpLearnset,
-    gBaltoyLevelUpLearnset,
-    gClaydolLevelUpLearnset,
-    gNosepassLevelUpLearnset,
-    gTorkoalLevelUpLearnset,
-    gSableyeLevelUpLearnset,
-    gBarboachLevelUpLearnset,
-    gWhiscashLevelUpLearnset,
-    gLuvdiscLevelUpLearnset,
-    gCorphishLevelUpLearnset,
-    gCrawdauntLevelUpLearnset,
-    gFeebasLevelUpLearnset,
-    gMiloticLevelUpLearnset,
-    gCarvanhaLevelUpLearnset,
-    gSharpedoLevelUpLearnset,
-    gTrapinchLevelUpLearnset,
-    gVibravaLevelUpLearnset,
-    gFlygonLevelUpLearnset,
-    gMakuhitaLevelUpLearnset,
-    gHariyamaLevelUpLearnset,
-    gElectrikeLevelUpLearnset,
-    gManectricLevelUpLearnset,
-    gNumelLevelUpLearnset,
-    gCameruptLevelUpLearnset,
-    gSphealLevelUpLearnset,
-    gSealeoLevelUpLearnset,
-    gWalreinLevelUpLearnset,
-    gCacneaLevelUpLearnset,
-    gCacturneLevelUpLearnset,
-    gSnoruntLevelUpLearnset,
-    gGlalieLevelUpLearnset,
-    gLunatoneLevelUpLearnset,
-    gSolrockLevelUpLearnset,
-    gAzurillLevelUpLearnset,
-    gSpoinkLevelUpLearnset,
-    gGrumpigLevelUpLearnset,
-    gPlusleLevelUpLearnset,
-    gMinunLevelUpLearnset,
-    gMawileLevelUpLearnset,
-    gMedititeLevelUpLearnset,
-    gMedichamLevelUpLearnset,
-    gSwabluLevelUpLearnset,
-    gAltariaLevelUpLearnset,
-    gWynautLevelUpLearnset,
-    gDuskullLevelUpLearnset,
-    gDusclopsLevelUpLearnset,
-    gRoseliaLevelUpLearnset,
-    gSlakothLevelUpLearnset,
-    gVigorothLevelUpLearnset,
-    gSlakingLevelUpLearnset,
-    gGulpinLevelUpLearnset,
-    gSwalotLevelUpLearnset,
-    gTropiusLevelUpLearnset,
-    gWhismurLevelUpLearnset,
-    gLoudredLevelUpLearnset,
-    gExploudLevelUpLearnset,
-    gClamperlLevelUpLearnset,
-    gHuntailLevelUpLearnset,
-    gGorebyssLevelUpLearnset,
-    gAbsolLevelUpLearnset,
-    gShuppetLevelUpLearnset,
-    gBanetteLevelUpLearnset,
-    gSeviperLevelUpLearnset,
-    gZangooseLevelUpLearnset,
-    gRelicanthLevelUpLearnset,
-    gAronLevelUpLearnset,
-    gLaironLevelUpLearnset,
-    gAggronLevelUpLearnset,
-    gCastformLevelUpLearnset,
-    gVolbeatLevelUpLearnset,
-    gIllumiseLevelUpLearnset,
-    gLileepLevelUpLearnset,
-    gCradilyLevelUpLearnset,
-    gAnorithLevelUpLearnset,
-    gArmaldoLevelUpLearnset,
-    gRaltsLevelUpLearnset,
-    gKirliaLevelUpLearnset,
-    gGardevoirLevelUpLearnset,
-    gBagonLevelUpLearnset,
-    gShelgonLevelUpLearnset,
-    gSalamenceLevelUpLearnset,
-    gBeldumLevelUpLearnset,
-    gMetangLevelUpLearnset,
-    gMetagrossLevelUpLearnset,
-    gRegirockLevelUpLearnset,
-    gRegiceLevelUpLearnset,
-    gRegisteelLevelUpLearnset,
-    gKyogreLevelUpLearnset,
-    gGroudonLevelUpLearnset,
-    gRayquazaLevelUpLearnset,
-    gLatiasLevelUpLearnset,
-    gLatiosLevelUpLearnset,
-    gJirachiLevelUpLearnset,
-    gDeoxysLevelUpLearnset,
-    gChimechoLevelUpLearnset
+    [SPECIES_NONE] = sBulbasaurLevelUpLearnset,
+    [SPECIES_BULBASAUR] = sBulbasaurLevelUpLearnset,
+    [SPECIES_IVYSAUR] = sIvysaurLevelUpLearnset,
+    [SPECIES_VENUSAUR] = sVenusaurLevelUpLearnset,
+    [SPECIES_CHARMANDER] = sCharmanderLevelUpLearnset,
+    [SPECIES_CHARMELEON] = sCharmeleonLevelUpLearnset,
+    [SPECIES_CHARIZARD] = sCharizardLevelUpLearnset,
+    [SPECIES_SQUIRTLE] = sSquirtleLevelUpLearnset,
+    [SPECIES_WARTORTLE] = sWartortleLevelUpLearnset,
+    [SPECIES_BLASTOISE] = sBlastoiseLevelUpLearnset,
+    [SPECIES_CATERPIE] = sCaterpieLevelUpLearnset,
+    [SPECIES_METAPOD] = sMetapodLevelUpLearnset,
+    [SPECIES_BUTTERFREE] = sButterfreeLevelUpLearnset,
+    [SPECIES_WEEDLE] = sWeedleLevelUpLearnset,
+    [SPECIES_KAKUNA] = sKakunaLevelUpLearnset,
+    [SPECIES_BEEDRILL] = sBeedrillLevelUpLearnset,
+    [SPECIES_PIDGEY] = sPidgeyLevelUpLearnset,
+    [SPECIES_PIDGEOTTO] = sPidgeottoLevelUpLearnset,
+    [SPECIES_PIDGEOT] = sPidgeotLevelUpLearnset,
+    [SPECIES_RATTATA] = sRattataLevelUpLearnset,
+    [SPECIES_RATICATE] = sRaticateLevelUpLearnset,
+    [SPECIES_SPEAROW] = sSpearowLevelUpLearnset,
+    [SPECIES_FEAROW] = sFearowLevelUpLearnset,
+    [SPECIES_EKANS] = sEkansLevelUpLearnset,
+    [SPECIES_ARBOK] = sArbokLevelUpLearnset,
+    [SPECIES_PIKACHU] = sPikachuLevelUpLearnset,
+    [SPECIES_RAICHU] = sRaichuLevelUpLearnset,
+    [SPECIES_SANDSHREW] = sSandshrewLevelUpLearnset,
+    [SPECIES_SANDSLASH] = sSandslashLevelUpLearnset,
+    [SPECIES_NIDORAN_F] = sNidoranFLevelUpLearnset,
+    [SPECIES_NIDORINA] = sNidorinaLevelUpLearnset,
+    [SPECIES_NIDOQUEEN] = sNidoqueenLevelUpLearnset,
+    [SPECIES_NIDORAN_M] = sNidoranMLevelUpLearnset,
+    [SPECIES_NIDORINO] = sNidorinoLevelUpLearnset,
+    [SPECIES_NIDOKING] = sNidokingLevelUpLearnset,
+    [SPECIES_CLEFAIRY] = sClefairyLevelUpLearnset,
+    [SPECIES_CLEFABLE] = sClefableLevelUpLearnset,
+    [SPECIES_VULPIX] = sVulpixLevelUpLearnset,
+    [SPECIES_NINETALES] = sNinetalesLevelUpLearnset,
+    [SPECIES_JIGGLYPUFF] = sJigglypuffLevelUpLearnset,
+    [SPECIES_WIGGLYTUFF] = sWigglytuffLevelUpLearnset,
+    [SPECIES_ZUBAT] = sZubatLevelUpLearnset,
+    [SPECIES_GOLBAT] = sGolbatLevelUpLearnset,
+    [SPECIES_ODDISH] = sOddishLevelUpLearnset,
+    [SPECIES_GLOOM] = sGloomLevelUpLearnset,
+    [SPECIES_VILEPLUME] = sVileplumeLevelUpLearnset,
+    [SPECIES_PARAS] = sParasLevelUpLearnset,
+    [SPECIES_PARASECT] = sParasectLevelUpLearnset,
+    [SPECIES_VENONAT] = sVenonatLevelUpLearnset,
+    [SPECIES_VENOMOTH] = sVenomothLevelUpLearnset,
+    [SPECIES_DIGLETT] = sDiglettLevelUpLearnset,
+    [SPECIES_DUGTRIO] = sDugtrioLevelUpLearnset,
+    [SPECIES_MEOWTH] = sMeowthLevelUpLearnset,
+    [SPECIES_PERSIAN] = sPersianLevelUpLearnset,
+    [SPECIES_PSYDUCK] = sPsyduckLevelUpLearnset,
+    [SPECIES_GOLDUCK] = sGolduckLevelUpLearnset,
+    [SPECIES_MANKEY] = sMankeyLevelUpLearnset,
+    [SPECIES_PRIMEAPE] = sPrimeapeLevelUpLearnset,
+    [SPECIES_GROWLITHE] = sGrowlitheLevelUpLearnset,
+    [SPECIES_ARCANINE] = sArcanineLevelUpLearnset,
+    [SPECIES_POLIWAG] = sPoliwagLevelUpLearnset,
+    [SPECIES_POLIWHIRL] = sPoliwhirlLevelUpLearnset,
+    [SPECIES_POLIWRATH] = sPoliwrathLevelUpLearnset,
+    [SPECIES_ABRA] = sAbraLevelUpLearnset,
+    [SPECIES_KADABRA] = sKadabraLevelUpLearnset,
+    [SPECIES_ALAKAZAM] = sAlakazamLevelUpLearnset,
+    [SPECIES_MACHOP] = sMachopLevelUpLearnset,
+    [SPECIES_MACHOKE] = sMachokeLevelUpLearnset,
+    [SPECIES_MACHAMP] = sMachampLevelUpLearnset,
+    [SPECIES_BELLSPROUT] = sBellsproutLevelUpLearnset,
+    [SPECIES_WEEPINBELL] = sWeepinbellLevelUpLearnset,
+    [SPECIES_VICTREEBEL] = sVictreebelLevelUpLearnset,
+    [SPECIES_TENTACOOL] = sTentacoolLevelUpLearnset,
+    [SPECIES_TENTACRUEL] = sTentacruelLevelUpLearnset,
+    [SPECIES_GEODUDE] = sGeodudeLevelUpLearnset,
+    [SPECIES_GRAVELER] = sGravelerLevelUpLearnset,
+    [SPECIES_GOLEM] = sGolemLevelUpLearnset,
+    [SPECIES_PONYTA] = sPonytaLevelUpLearnset,
+    [SPECIES_RAPIDASH] = sRapidashLevelUpLearnset,
+    [SPECIES_SLOWPOKE] = sSlowpokeLevelUpLearnset,
+    [SPECIES_SLOWBRO] = sSlowbroLevelUpLearnset,
+    [SPECIES_MAGNEMITE] = sMagnemiteLevelUpLearnset,
+    [SPECIES_MAGNETON] = sMagnetonLevelUpLearnset,
+    [SPECIES_FARFETCHD] = sFarfetchdLevelUpLearnset,
+    [SPECIES_DODUO] = sDoduoLevelUpLearnset,
+    [SPECIES_DODRIO] = sDodrioLevelUpLearnset,
+    [SPECIES_SEEL] = sSeelLevelUpLearnset,
+    [SPECIES_DEWGONG] = sDewgongLevelUpLearnset,
+    [SPECIES_GRIMER] = sGrimerLevelUpLearnset,
+    [SPECIES_MUK] = sMukLevelUpLearnset,
+    [SPECIES_SHELLDER] = sShellderLevelUpLearnset,
+    [SPECIES_CLOYSTER] = sCloysterLevelUpLearnset,
+    [SPECIES_GASTLY] = sGastlyLevelUpLearnset,
+    [SPECIES_HAUNTER] = sHaunterLevelUpLearnset,
+    [SPECIES_GENGAR] = sGengarLevelUpLearnset,
+    [SPECIES_ONIX] = sOnixLevelUpLearnset,
+    [SPECIES_DROWZEE] = sDrowzeeLevelUpLearnset,
+    [SPECIES_HYPNO] = sHypnoLevelUpLearnset,
+    [SPECIES_KRABBY] = sKrabbyLevelUpLearnset,
+    [SPECIES_KINGLER] = sKinglerLevelUpLearnset,
+    [SPECIES_VOLTORB] = sVoltorbLevelUpLearnset,
+    [SPECIES_ELECTRODE] = sElectrodeLevelUpLearnset,
+    [SPECIES_EXEGGCUTE] = sExeggcuteLevelUpLearnset,
+    [SPECIES_EXEGGUTOR] = sExeggutorLevelUpLearnset,
+    [SPECIES_CUBONE] = sCuboneLevelUpLearnset,
+    [SPECIES_MAROWAK] = sMarowakLevelUpLearnset,
+    [SPECIES_HITMONLEE] = sHitmonleeLevelUpLearnset,
+    [SPECIES_HITMONCHAN] = sHitmonchanLevelUpLearnset,
+    [SPECIES_LICKITUNG] = sLickitungLevelUpLearnset,
+    [SPECIES_KOFFING] = sKoffingLevelUpLearnset,
+    [SPECIES_WEEZING] = sWeezingLevelUpLearnset,
+    [SPECIES_RHYHORN] = sRhyhornLevelUpLearnset,
+    [SPECIES_RHYDON] = sRhydonLevelUpLearnset,
+    [SPECIES_CHANSEY] = sChanseyLevelUpLearnset,
+    [SPECIES_TANGELA] = sTangelaLevelUpLearnset,
+    [SPECIES_KANGASKHAN] = sKangaskhanLevelUpLearnset,
+    [SPECIES_HORSEA] = sHorseaLevelUpLearnset,
+    [SPECIES_SEADRA] = sSeadraLevelUpLearnset,
+    [SPECIES_GOLDEEN] = sGoldeenLevelUpLearnset,
+    [SPECIES_SEAKING] = sSeakingLevelUpLearnset,
+    [SPECIES_STARYU] = sStaryuLevelUpLearnset,
+    [SPECIES_STARMIE] = sStarmieLevelUpLearnset,
+    [SPECIES_MR_MIME] = sMrmimeLevelUpLearnset,
+    [SPECIES_SCYTHER] = sScytherLevelUpLearnset,
+    [SPECIES_JYNX] = sJynxLevelUpLearnset,
+    [SPECIES_ELECTABUZZ] = sElectabuzzLevelUpLearnset,
+    [SPECIES_MAGMAR] = sMagmarLevelUpLearnset,
+    [SPECIES_PINSIR] = sPinsirLevelUpLearnset,
+    [SPECIES_TAUROS] = sTaurosLevelUpLearnset,
+    [SPECIES_MAGIKARP] = sMagikarpLevelUpLearnset,
+    [SPECIES_GYARADOS] = sGyaradosLevelUpLearnset,
+    [SPECIES_LAPRAS] = sLaprasLevelUpLearnset,
+    [SPECIES_DITTO] = sDittoLevelUpLearnset,
+    [SPECIES_EEVEE] = sEeveeLevelUpLearnset,
+    [SPECIES_VAPOREON] = sVaporeonLevelUpLearnset,
+    [SPECIES_JOLTEON] = sJolteonLevelUpLearnset,
+    [SPECIES_FLAREON] = sFlareonLevelUpLearnset,
+    [SPECIES_PORYGON] = sPorygonLevelUpLearnset,
+    [SPECIES_OMANYTE] = sOmanyteLevelUpLearnset,
+    [SPECIES_OMASTAR] = sOmastarLevelUpLearnset,
+    [SPECIES_KABUTO] = sKabutoLevelUpLearnset,
+    [SPECIES_KABUTOPS] = sKabutopsLevelUpLearnset,
+    [SPECIES_AERODACTYL] = sAerodactylLevelUpLearnset,
+    [SPECIES_SNORLAX] = sSnorlaxLevelUpLearnset,
+    [SPECIES_ARTICUNO] = sArticunoLevelUpLearnset,
+    [SPECIES_ZAPDOS] = sZapdosLevelUpLearnset,
+    [SPECIES_MOLTRES] = sMoltresLevelUpLearnset,
+    [SPECIES_DRATINI] = sDratiniLevelUpLearnset,
+    [SPECIES_DRAGONAIR] = sDragonairLevelUpLearnset,
+    [SPECIES_DRAGONITE] = sDragoniteLevelUpLearnset,
+    [SPECIES_MEWTWO] = sMewtwoLevelUpLearnset,
+    [SPECIES_MEW] = sMewLevelUpLearnset,
+    [SPECIES_CHIKORITA] = sChikoritaLevelUpLearnset,
+    [SPECIES_BAYLEEF] = sBayleefLevelUpLearnset,
+    [SPECIES_MEGANIUM] = sMeganiumLevelUpLearnset,
+    [SPECIES_CYNDAQUIL] = sCyndaquilLevelUpLearnset,
+    [SPECIES_QUILAVA] = sQuilavaLevelUpLearnset,
+    [SPECIES_TYPHLOSION] = sTyphlosionLevelUpLearnset,
+    [SPECIES_TOTODILE] = sTotodileLevelUpLearnset,
+    [SPECIES_CROCONAW] = sCroconawLevelUpLearnset,
+    [SPECIES_FERALIGATR] = sFeraligatrLevelUpLearnset,
+    [SPECIES_SENTRET] = sSentretLevelUpLearnset,
+    [SPECIES_FURRET] = sFurretLevelUpLearnset,
+    [SPECIES_HOOTHOOT] = sHoothootLevelUpLearnset,
+    [SPECIES_NOCTOWL] = sNoctowlLevelUpLearnset,
+    [SPECIES_LEDYBA] = sLedybaLevelUpLearnset,
+    [SPECIES_LEDIAN] = sLedianLevelUpLearnset,
+    [SPECIES_SPINARAK] = sSpinarakLevelUpLearnset,
+    [SPECIES_ARIADOS] = sAriadosLevelUpLearnset,
+    [SPECIES_CROBAT] = sCrobatLevelUpLearnset,
+    [SPECIES_CHINCHOU] = sChinchouLevelUpLearnset,
+    [SPECIES_LANTURN] = sLanturnLevelUpLearnset,
+    [SPECIES_PICHU] = sPichuLevelUpLearnset,
+    [SPECIES_CLEFFA] = sCleffaLevelUpLearnset,
+    [SPECIES_IGGLYBUFF] = sIgglybuffLevelUpLearnset,
+    [SPECIES_TOGEPI] = sTogepiLevelUpLearnset,
+    [SPECIES_TOGETIC] = sTogeticLevelUpLearnset,
+    [SPECIES_NATU] = sNatuLevelUpLearnset,
+    [SPECIES_XATU] = sXatuLevelUpLearnset,
+    [SPECIES_MAREEP] = sMareepLevelUpLearnset,
+    [SPECIES_FLAAFFY] = sFlaaffyLevelUpLearnset,
+    [SPECIES_AMPHAROS] = sAmpharosLevelUpLearnset,
+    [SPECIES_BELLOSSOM] = sBellossomLevelUpLearnset,
+    [SPECIES_MARILL] = sMarillLevelUpLearnset,
+    [SPECIES_AZUMARILL] = sAzumarillLevelUpLearnset,
+    [SPECIES_SUDOWOODO] = sSudowoodoLevelUpLearnset,
+    [SPECIES_POLITOED] = sPolitoedLevelUpLearnset,
+    [SPECIES_HOPPIP] = sHoppipLevelUpLearnset,
+    [SPECIES_SKIPLOOM] = sSkiploomLevelUpLearnset,
+    [SPECIES_JUMPLUFF] = sJumpluffLevelUpLearnset,
+    [SPECIES_AIPOM] = sAipomLevelUpLearnset,
+    [SPECIES_SUNKERN] = sSunkernLevelUpLearnset,
+    [SPECIES_SUNFLORA] = sSunfloraLevelUpLearnset,
+    [SPECIES_YANMA] = sYanmaLevelUpLearnset,
+    [SPECIES_WOOPER] = sWooperLevelUpLearnset,
+    [SPECIES_QUAGSIRE] = sQuagsireLevelUpLearnset,
+    [SPECIES_ESPEON] = sEspeonLevelUpLearnset,
+    [SPECIES_UMBREON] = sUmbreonLevelUpLearnset,
+    [SPECIES_MURKROW] = sMurkrowLevelUpLearnset,
+    [SPECIES_SLOWKING] = sSlowkingLevelUpLearnset,
+    [SPECIES_MISDREAVUS] = sMisdreavusLevelUpLearnset,
+    [SPECIES_UNOWN] = sUnownLevelUpLearnset,
+    [SPECIES_WOBBUFFET] = sWobbuffetLevelUpLearnset,
+    [SPECIES_GIRAFARIG] = sGirafarigLevelUpLearnset,
+    [SPECIES_PINECO] = sPinecoLevelUpLearnset,
+    [SPECIES_FORRETRESS] = sForretressLevelUpLearnset,
+    [SPECIES_DUNSPARCE] = sDunsparceLevelUpLearnset,
+    [SPECIES_GLIGAR] = sGligarLevelUpLearnset,
+    [SPECIES_STEELIX] = sSteelixLevelUpLearnset,
+    [SPECIES_SNUBBULL] = sSnubbullLevelUpLearnset,
+    [SPECIES_GRANBULL] = sGranbullLevelUpLearnset,
+    [SPECIES_QWILFISH] = sQwilfishLevelUpLearnset,
+    [SPECIES_SCIZOR] = sScizorLevelUpLearnset,
+    [SPECIES_SHUCKLE] = sShuckleLevelUpLearnset,
+    [SPECIES_HERACROSS] = sHeracrossLevelUpLearnset,
+    [SPECIES_SNEASEL] = sSneaselLevelUpLearnset,
+    [SPECIES_TEDDIURSA] = sTeddiursaLevelUpLearnset,
+    [SPECIES_URSARING] = sUrsaringLevelUpLearnset,
+    [SPECIES_SLUGMA] = sSlugmaLevelUpLearnset,
+    [SPECIES_MAGCARGO] = sMagcargoLevelUpLearnset,
+    [SPECIES_SWINUB] = sSwinubLevelUpLearnset,
+    [SPECIES_PILOSWINE] = sPiloswineLevelUpLearnset,
+    [SPECIES_CORSOLA] = sCorsolaLevelUpLearnset,
+    [SPECIES_REMORAID] = sRemoraidLevelUpLearnset,
+    [SPECIES_OCTILLERY] = sOctilleryLevelUpLearnset,
+    [SPECIES_DELIBIRD] = sDelibirdLevelUpLearnset,
+    [SPECIES_MANTINE] = sMantineLevelUpLearnset,
+    [SPECIES_SKARMORY] = sSkarmoryLevelUpLearnset,
+    [SPECIES_HOUNDOUR] = sHoundourLevelUpLearnset,
+    [SPECIES_HOUNDOOM] = sHoundoomLevelUpLearnset,
+    [SPECIES_KINGDRA] = sKingdraLevelUpLearnset,
+    [SPECIES_PHANPY] = sPhanpyLevelUpLearnset,
+    [SPECIES_DONPHAN] = sDonphanLevelUpLearnset,
+    [SPECIES_PORYGON2] = sPorygon2LevelUpLearnset,
+    [SPECIES_STANTLER] = sStantlerLevelUpLearnset,
+    [SPECIES_SMEARGLE] = sSmeargleLevelUpLearnset,
+    [SPECIES_TYROGUE] = sTyrogueLevelUpLearnset,
+    [SPECIES_HITMONTOP] = sHitmontopLevelUpLearnset,
+    [SPECIES_SMOOCHUM] = sSmoochumLevelUpLearnset,
+    [SPECIES_ELEKID] = sElekidLevelUpLearnset,
+    [SPECIES_MAGBY] = sMagbyLevelUpLearnset,
+    [SPECIES_MILTANK] = sMiltankLevelUpLearnset,
+    [SPECIES_BLISSEY] = sBlisseyLevelUpLearnset,
+    [SPECIES_RAIKOU] = sRaikouLevelUpLearnset,
+    [SPECIES_ENTEI] = sEnteiLevelUpLearnset,
+    [SPECIES_SUICUNE] = sSuicuneLevelUpLearnset,
+    [SPECIES_LARVITAR] = sLarvitarLevelUpLearnset,
+    [SPECIES_PUPITAR] = sPupitarLevelUpLearnset,
+    [SPECIES_TYRANITAR] = sTyranitarLevelUpLearnset,
+    [SPECIES_LUGIA] = sLugiaLevelUpLearnset,
+    [SPECIES_HO_OH] = sHoOhLevelUpLearnset,
+    [SPECIES_CELEBI] = sCelebiLevelUpLearnset,
+    [SPECIES_OLD_UNOWN_B] = sSpecies252LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_C] = sSpecies253LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_D] = sSpecies254LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_E] = sSpecies255LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_F] = sSpecies256LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_G] = sSpecies257LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_H] = sSpecies258LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_I] = sSpecies259LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_J] = sSpecies260LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_K] = sSpecies261LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_L] = sSpecies262LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_M] = sSpecies263LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_N] = sSpecies264LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_O] = sSpecies265LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_P] = sSpecies266LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_Q] = sSpecies267LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_R] = sSpecies268LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_S] = sSpecies269LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_T] = sSpecies270LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_U] = sSpecies271LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_V] = sSpecies272LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_W] = sSpecies273LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_X] = sSpecies274LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_Y] = sSpecies275LevelUpLearnset,
+    [SPECIES_OLD_UNOWN_Z] = sSpecies276LevelUpLearnset,
+    [SPECIES_TREECKO] = sTreeckoLevelUpLearnset,
+    [SPECIES_GROVYLE] = sGrovyleLevelUpLearnset,
+    [SPECIES_SCEPTILE] = sSceptileLevelUpLearnset,
+    [SPECIES_TORCHIC] = sTorchicLevelUpLearnset,
+    [SPECIES_COMBUSKEN] = sCombuskenLevelUpLearnset,
+    [SPECIES_BLAZIKEN] = sBlazikenLevelUpLearnset,
+    [SPECIES_MUDKIP] = sMudkipLevelUpLearnset,
+    [SPECIES_MARSHTOMP] = sMarshtompLevelUpLearnset,
+    [SPECIES_SWAMPERT] = sSwampertLevelUpLearnset,
+    [SPECIES_POOCHYENA] = sPoochyenaLevelUpLearnset,
+    [SPECIES_MIGHTYENA] = sMightyenaLevelUpLearnset,
+    [SPECIES_ZIGZAGOON] = sZigzagoonLevelUpLearnset,
+    [SPECIES_LINOONE] = sLinooneLevelUpLearnset,
+    [SPECIES_WURMPLE] = sWurmpleLevelUpLearnset,
+    [SPECIES_SILCOON] = sSilcoonLevelUpLearnset,
+    [SPECIES_BEAUTIFLY] = sBeautiflyLevelUpLearnset,
+    [SPECIES_CASCOON] = sCascoonLevelUpLearnset,
+    [SPECIES_DUSTOX] = sDustoxLevelUpLearnset,
+    [SPECIES_LOTAD] = sLotadLevelUpLearnset,
+    [SPECIES_LOMBRE] = sLombreLevelUpLearnset,
+    [SPECIES_LUDICOLO] = sLudicoloLevelUpLearnset,
+    [SPECIES_SEEDOT] = sSeedotLevelUpLearnset,
+    [SPECIES_NUZLEAF] = sNuzleafLevelUpLearnset,
+    [SPECIES_SHIFTRY] = sShiftryLevelUpLearnset,
+    [SPECIES_NINCADA] = sNincadaLevelUpLearnset,
+    [SPECIES_NINJASK] = sNinjaskLevelUpLearnset,
+    [SPECIES_SHEDINJA] = sShedinjaLevelUpLearnset,
+    [SPECIES_TAILLOW] = sTaillowLevelUpLearnset,
+    [SPECIES_SWELLOW] = sSwellowLevelUpLearnset,
+    [SPECIES_SHROOMISH] = sShroomishLevelUpLearnset,
+    [SPECIES_BRELOOM] = sBreloomLevelUpLearnset,
+    [SPECIES_SPINDA] = sSpindaLevelUpLearnset,
+    [SPECIES_WINGULL] = sWingullLevelUpLearnset,
+    [SPECIES_PELIPPER] = sPelipperLevelUpLearnset,
+    [SPECIES_SURSKIT] = sSurskitLevelUpLearnset,
+    [SPECIES_MASQUERAIN] = sMasquerainLevelUpLearnset,
+    [SPECIES_WAILMER] = sWailmerLevelUpLearnset,
+    [SPECIES_WAILORD] = sWailordLevelUpLearnset,
+    [SPECIES_SKITTY] = sSkittyLevelUpLearnset,
+    [SPECIES_DELCATTY] = sDelcattyLevelUpLearnset,
+    [SPECIES_KECLEON] = sKecleonLevelUpLearnset,
+    [SPECIES_BALTOY] = sBaltoyLevelUpLearnset,
+    [SPECIES_CLAYDOL] = sClaydolLevelUpLearnset,
+    [SPECIES_NOSEPASS] = sNosepassLevelUpLearnset,
+    [SPECIES_TORKOAL] = sTorkoalLevelUpLearnset,
+    [SPECIES_SABLEYE] = sSableyeLevelUpLearnset,
+    [SPECIES_BARBOACH] = sBarboachLevelUpLearnset,
+    [SPECIES_WHISCASH] = sWhiscashLevelUpLearnset,
+    [SPECIES_LUVDISC] = sLuvdiscLevelUpLearnset,
+    [SPECIES_CORPHISH] = sCorphishLevelUpLearnset,
+    [SPECIES_CRAWDAUNT] = sCrawdauntLevelUpLearnset,
+    [SPECIES_FEEBAS] = sFeebasLevelUpLearnset,
+    [SPECIES_MILOTIC] = sMiloticLevelUpLearnset,
+    [SPECIES_CARVANHA] = sCarvanhaLevelUpLearnset,
+    [SPECIES_SHARPEDO] = sSharpedoLevelUpLearnset,
+    [SPECIES_TRAPINCH] = sTrapinchLevelUpLearnset,
+    [SPECIES_VIBRAVA] = sVibravaLevelUpLearnset,
+    [SPECIES_FLYGON] = sFlygonLevelUpLearnset,
+    [SPECIES_MAKUHITA] = sMakuhitaLevelUpLearnset,
+    [SPECIES_HARIYAMA] = sHariyamaLevelUpLearnset,
+    [SPECIES_ELECTRIKE] = sElectrikeLevelUpLearnset,
+    [SPECIES_MANECTRIC] = sManectricLevelUpLearnset,
+    [SPECIES_NUMEL] = sNumelLevelUpLearnset,
+    [SPECIES_CAMERUPT] = sCameruptLevelUpLearnset,
+    [SPECIES_SPHEAL] = sSphealLevelUpLearnset,
+    [SPECIES_SEALEO] = sSealeoLevelUpLearnset,
+    [SPECIES_WALREIN] = sWalreinLevelUpLearnset,
+    [SPECIES_CACNEA] = sCacneaLevelUpLearnset,
+    [SPECIES_CACTURNE] = sCacturneLevelUpLearnset,
+    [SPECIES_SNORUNT] = sSnoruntLevelUpLearnset,
+    [SPECIES_GLALIE] = sGlalieLevelUpLearnset,
+    [SPECIES_LUNATONE] = sLunatoneLevelUpLearnset,
+    [SPECIES_SOLROCK] = sSolrockLevelUpLearnset,
+    [SPECIES_AZURILL] = sAzurillLevelUpLearnset,
+    [SPECIES_SPOINK] = sSpoinkLevelUpLearnset,
+    [SPECIES_GRUMPIG] = sGrumpigLevelUpLearnset,
+    [SPECIES_PLUSLE] = sPlusleLevelUpLearnset,
+    [SPECIES_MINUN] = sMinunLevelUpLearnset,
+    [SPECIES_MAWILE] = sMawileLevelUpLearnset,
+    [SPECIES_MEDITITE] = sMedititeLevelUpLearnset,
+    [SPECIES_MEDICHAM] = sMedichamLevelUpLearnset,
+    [SPECIES_SWABLU] = sSwabluLevelUpLearnset,
+    [SPECIES_ALTARIA] = sAltariaLevelUpLearnset,
+    [SPECIES_WYNAUT] = sWynautLevelUpLearnset,
+    [SPECIES_DUSKULL] = sDuskullLevelUpLearnset,
+    [SPECIES_DUSCLOPS] = sDusclopsLevelUpLearnset,
+    [SPECIES_ROSELIA] = sRoseliaLevelUpLearnset,
+    [SPECIES_SLAKOTH] = sSlakothLevelUpLearnset,
+    [SPECIES_VIGOROTH] = sVigorothLevelUpLearnset,
+    [SPECIES_SLAKING] = sSlakingLevelUpLearnset,
+    [SPECIES_GULPIN] = sGulpinLevelUpLearnset,
+    [SPECIES_SWALOT] = sSwalotLevelUpLearnset,
+    [SPECIES_TROPIUS] = sTropiusLevelUpLearnset,
+    [SPECIES_WHISMUR] = sWhismurLevelUpLearnset,
+    [SPECIES_LOUDRED] = sLoudredLevelUpLearnset,
+    [SPECIES_EXPLOUD] = sExploudLevelUpLearnset,
+    [SPECIES_CLAMPERL] = sClamperlLevelUpLearnset,
+    [SPECIES_HUNTAIL] = sHuntailLevelUpLearnset,
+    [SPECIES_GOREBYSS] = sGorebyssLevelUpLearnset,
+    [SPECIES_ABSOL] = sAbsolLevelUpLearnset,
+    [SPECIES_SHUPPET] = sShuppetLevelUpLearnset,
+    [SPECIES_BANETTE] = sBanetteLevelUpLearnset,
+    [SPECIES_SEVIPER] = sSeviperLevelUpLearnset,
+    [SPECIES_ZANGOOSE] = sZangooseLevelUpLearnset,
+    [SPECIES_RELICANTH] = sRelicanthLevelUpLearnset,
+    [SPECIES_ARON] = sAronLevelUpLearnset,
+    [SPECIES_LAIRON] = sLaironLevelUpLearnset,
+    [SPECIES_AGGRON] = sAggronLevelUpLearnset,
+    [SPECIES_CASTFORM] = sCastformLevelUpLearnset,
+    [SPECIES_VOLBEAT] = sVolbeatLevelUpLearnset,
+    [SPECIES_ILLUMISE] = sIllumiseLevelUpLearnset,
+    [SPECIES_LILEEP] = sLileepLevelUpLearnset,
+    [SPECIES_CRADILY] = sCradilyLevelUpLearnset,
+    [SPECIES_ANORITH] = sAnorithLevelUpLearnset,
+    [SPECIES_ARMALDO] = sArmaldoLevelUpLearnset,
+    [SPECIES_RALTS] = sRaltsLevelUpLearnset,
+    [SPECIES_KIRLIA] = sKirliaLevelUpLearnset,
+    [SPECIES_GARDEVOIR] = sGardevoirLevelUpLearnset,
+    [SPECIES_BAGON] = sBagonLevelUpLearnset,
+    [SPECIES_SHELGON] = sShelgonLevelUpLearnset,
+    [SPECIES_SALAMENCE] = sSalamenceLevelUpLearnset,
+    [SPECIES_BELDUM] = sBeldumLevelUpLearnset,
+    [SPECIES_METANG] = sMetangLevelUpLearnset,
+    [SPECIES_METAGROSS] = sMetagrossLevelUpLearnset,
+    [SPECIES_REGIROCK] = sRegirockLevelUpLearnset,
+    [SPECIES_REGICE] = sRegiceLevelUpLearnset,
+    [SPECIES_REGISTEEL] = sRegisteelLevelUpLearnset,
+    [SPECIES_KYOGRE] = sKyogreLevelUpLearnset,
+    [SPECIES_GROUDON] = sGroudonLevelUpLearnset,
+    [SPECIES_RAYQUAZA] = sRayquazaLevelUpLearnset,
+    [SPECIES_LATIAS] = sLatiasLevelUpLearnset,
+    [SPECIES_LATIOS] = sLatiosLevelUpLearnset,
+    [SPECIES_JIRACHI] = sJirachiLevelUpLearnset,
+    [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset,
+    [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset,
 };

 #endif //POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H
--- a/include/data/pokemon/level_up_learnsets.h
+++ b/include/data/pokemon/level_up_learnsets.h
--- a/include/data2.h
+++ b/include/data2.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_DATA2_H
 #define GUARD_DATA2_H

-#include "constants/species.h"
+#define MOVE_NAME_LENGTH 12

 struct MonCoords
 {
@@ -15,10 +15,10 @@ extern struct MonCoords gTrainerBackPicCoords[];
 extern struct MonCoords gTrainerFrontPicCoords[];

 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
-extern const u8 gMoveNames[][13];
+extern const u8 gMoveNames[][MOVE_NAME_LENGTH + 1];
 extern struct CompressedSpriteSheet gUnknown_0831C620;
 extern struct CompressedSpritePalette gUnknown_0831C628;
 extern const struct SpriteTemplate gUnknown_0831C688;
-extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
+extern const struct CompressedSpriteSheet gMonBackPicTable[];

 #endif // GUARD_DATA2_H
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -73,5 +73,6 @@ void sub_8126B2C(u8 taskId);
 void sub_8127208(u8 taskId);
 void sub_8127250(u8 *dest, u8 decorCat);
 bool8 IsSelectedDecorInThePC(void);
+u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u16 paletteTag);

 #endif //GUARD_DECORATION_H
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -185,6 +185,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject);
 u8 GetMoveDirectionFastAnimNum(u8);
 u8 GetMoveDirectionFasterAnimNum(u8);
 u8 GetMoveDirectionFastestAnimNum(u8);
+void CameraObjectSetFollowedObjectId(u8 objectId);

 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -74,7 +74,10 @@ enum FieldEffectScriptIdx
    FLDEFF_USE_FLY_ANCIENT_TOMB,
    FLDEFF_PCTURN_ON,
    FLDEFF_HALL_OF_FAME_RECORD,
-    FLDEFF_USE_TELEPORT
+    FLDEFF_USE_TELEPORT,
+    FLDEFF_64,
+    FLDEFF_65,
+    FLDEFF_66,
 };

 extern s32 gFieldEffectArguments[8];
--- a/include/field_region_map.h
+++ b/include/field_region_map.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_FIELD_REGION_MAP_H
+#define GUARD_FIELD_REGION_MAP_H
+
+void FieldInitRegionMap(MainCallback callback);
+
+#endif // GUARD_FIELD_REGION_MAP_H
--- a/include/field_screen.h
+++ b/include/field_screen.h
@@ -15,5 +15,6 @@ void sub_80AC3D0(void);
 void sub_80AC3E4(void);
 void PreservePaletteInWeather(u8);
 void sub_80AF128(void);
+void sub_80AB104(u8);

 #endif //GUARD_FIELD_SCREEN_H
--- a/include/global.h
+++ b/include/global.h
@@ -163,6 +163,16 @@ enum
    OPTIONS_BATTLE_STYLE_SET
 };

+struct Coords8 {
+    s8 x;
+    s8 y;
+};
+
+struct UCoords8 {
+    u8 x;
+    u8 y;
+};
+
 struct Coords16
 {
    s16 x;
@@ -344,7 +354,8 @@ struct BattleFrontier
    /*0xCA9*/ u8 field_CA9_f:1;   // 0x80
    /*0xCAA*/ u16 field_CAA[4];
    /*0xCB2*/ u16 field_CB2;
-    /*0xCB4*/ u16 field_CB4[30];
+    /*0xCB4*/ u16 field_CB4[22];
+    /*0xCE0*/ u16 field_CE0[4][2];
    /*0xCF0*/ u16 field_CF0[2];
    /*0xCF4*/ u16 field_CF4[2];
    /*0xCF8*/ u16 field_CF8[2];
@@ -355,24 +366,21 @@ struct BattleFrontier
    /*0xD09*/ u8 filler_D09;
    /*0xD0A*/ u8 filler_D0A;
    /*0xD0B*/ u8 filler_D0B;
-    /*0xD0C*/ u8 filler_D0C;
-    /*0xD0D*/ u8 filler_D0D;
-    /*0xD0E*/ u8 filler_D0E;
-    /*0xD0F*/ u8 filler_D0F;
+    /*0xD0C*/ u16 field_D0C[2];
    /*0xD10*/ u8 filler_D10;
    /*0xD11*/ u8 filler_D11;
    /*0xD12*/ u8 filler_D12;
    /*0xD13*/ u8 filler_D13;
    /*0xD14*/ u16 field_D14[2];
-    /*0xD18*/ u8 field_D18[0xB8];
+    /*0xD18*/ u8 field_D18[0xB0];
+    /*0xDC8*/ u16 field_DC8[2];
+    /*0xDCC*/ u8 filler_DCC[4];
    /*0xDD0*/ u16 field_DD0[2];
    /*0xDD4*/ u16 field_DD4[2];
    /*0xDD8*/ u16 field_DD8;
-    /*0xDDA*/ u16 field_DDA;
-    /*0xDDC*/ u16 field_DDC;
+    /*0xDDA*/ u16 field_DDA[2];
    /*0xDDE*/ u16 field_DDE[2];
-    /*0xDE2*/ u16 field_DE2;
-    /*0xDE4*/ u16 field_DE4;
+    /*0xDE2*/ u16 field_DE2[2];
    /*0xDE6*/ u16 field_DE6;
    /*0xDE8*/ u16 field_DE8;
    /*0xDEA*/ u16 field_DEA[2];
@@ -387,11 +395,9 @@ struct BattleFrontier
    /*0xDFE*/ u16 field_DFE;
    /*0xE00*/ u16 field_E00;
    /*0xE02*/ u16 field_E02;
-    /*0xE04*/ u16 field_E04;
-    /*0xE06*/ u16 field_E06;
+    /*0xE04*/ u16 field_E04[2];
    /*0xE08*/ u16 field_E08[9];
-    /*0xE1A*/ u16 field_E1A;
-    /*0xE1C*/ u16 field_E1C;
+    /*0xE1A*/ u16 field_E1A[2];
    /*0xE1E*/ u16 field_E1E[7];
    /*0xE2C*/ struct PyramidBag pyramidBag;
    /*0xE58*/ u16 field_E58;
--- a/include/heal_location.h
+++ b/include/heal_location.h
@@ -1,13 +1,6 @@
 #ifndef GUARD_HEAL_LOCATION_H
 #define GUARD_HEAL_LOCATION_H

-// Exported type declarations
-
-struct UnkStruct_0859F534 {
-    const union AffineAnimCmd *const *const affineAnims;
-    void (* callback)(struct Sprite *sprite);
-};
-
 struct HealLocation
 {
    s8 group;
@@ -16,10 +9,8 @@ struct HealLocation
    u16 y;
 };

-// Exported RAM declarations
+u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum);
+const struct HealLocation *GetHealLocationByMap(u16 mapGroup, u16 mapNum);
+const struct HealLocation *GetHealLocation(u32 index);

-// Exported ROM declarations
-
-const struct HealLocation *GetHealLocationPointer(u32 loc);
-
-#endif //GUARD_HEAL_LOCATION_H
+#endif // GUARD_HEAL_LOCATION_H
--- a/include/match_call.h
+++ b/include/match_call.h
@@ -10,4 +10,6 @@ enum {
    MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR
 };

+s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
+
 #endif //GUARD_MATCH_CALL_H
--- a/include/menu.h
+++ b/include/menu.h
@@ -51,7 +51,7 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
 void reset_temp_tile_data_buffers(void);
 void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
 bool8 free_temp_tile_data_buffers_if_possible(void);
-struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16);
+struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
 void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
 void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
 s8 ProcessMenuInputNoWrap_(void);
@@ -84,5 +84,6 @@ void sub_819A344(u8 a0, u8 *dest, u8 color);
 void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
 u8 AddMapNamePopUpWindow(void);
+void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);

 #endif // GUARD_MENU_H
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -34,6 +34,8 @@ struct Struct203CEC8

 extern struct Struct203CEC8 gUnknown_0203CEC8;

+extern const u16 gUnknown_0861500C[];
+
 bool8 pokemon_has_move(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
@@ -54,5 +56,6 @@ void sub_81B8518(u8 unused);
 u8 sub_81B1360(void);
 void sub_81B8904(u8 arg0, void (*callback)(void));
 void OpenPartyMenuInBattle(u8 caseId);
+u16 ItemIdToBattleMoveId(u16 itemId);

 #endif // GUARD_PARTY_MENU_H
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -9,5 +9,7 @@ struct BoxPokemon *GetBoxedMonPtr(u8, u8);
 void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
 void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
+bool8 CheckFreePokemonStorageSpace(void);
+u8 StorageGetCurrentBox(void);

 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -8,5 +8,6 @@
 // Exported ROM declarations

 void sub_8018438(void);
+u16 mevent_081445C0(u8);

 #endif //GUARD_rom_8011DC0_H
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -9,8 +9,9 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
-u8 convert_pixel_width_to_tile_width(s32);
+s32 convert_pixel_width_to_tile_width(s32);
 u8 CreateWindowFromRect(u8, u8, u8, u8);
 void sub_80E2A78(u8);
+u32 display_text_and_get_width(const u8*, u32);

 #endif //GUARD_SCRIPT_MENU_H
--- a/include/strings.h
+++ b/include/strings.h
@@ -466,4 +466,304 @@ extern const u8 gText_WinLoseDraw[];
 extern const u8 gText_ColorTransparent[];
 extern const u8 gText_Slash[];

+extern const u8 gText_99TimesPlus[];
+extern const u8 gText_1MinutePlus[];
+extern const u8 gText_SpaceSeconds[];
+extern const u8 gText_SpaceTimes[];
+
+extern const u8 gText_BigGuy[];
+extern const u8 gText_BigGirl[];
+extern const u8 gText_Son[];
+extern const u8 gText_Daughter[];
+
+extern const u8 gText_1F[];
+extern const u8 gText_2F[];
+extern const u8 gText_3F[];
+extern const u8 gText_4F[];
+extern const u8 gText_5F[];
+extern const u8 gText_6F[];
+extern const u8 gText_7F[];
+extern const u8 gText_8F[];
+extern const u8 gText_9F[];
+extern const u8 gText_10F[];
+extern const u8 gText_11F[];
+extern const u8 gText_B1F[];
+extern const u8 gText_B2F[];
+extern const u8 gText_B3F[];
+extern const u8 gText_B4F[];
+extern const u8 gText_Rooftop[];
+extern const u8 gText_ElevatorNowOn[];
+
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BlueFlute[];
+extern const u8 gText_YellowFlute[];
+extern const u8 gText_RedFlute[];
+extern const u8 gText_WhiteFlute[];
+extern const u8 gText_BlackFlute[];
+extern const u8 gText_PrettyChair[];
+extern const u8 gText_PrettyDesk[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_0Pts[];
+extern const u8 gText_10Pts[];
+extern const u8 gText_20Pts[];
+extern const u8 gText_30Pts[];
+extern const u8 gText_40Pts[];
+extern const u8 gText_50Pts[];
+extern const u8 gText_60Pts[];
+extern const u8 gText_70Pts[];
+extern const u8 gText_80Pts[];
+extern const u8 gText_90Pts[];
+extern const u8 gText_100Pts[];
+extern const u8 gText_QuestionMark[];
+
+extern const u8 gText_KissPoster16BP[];
+extern const u8 gText_KissCushion32BP[];
+extern const u8 gText_SmoochumDoll32BP[];
+extern const u8 gText_TogepiDoll48BP[];
+extern const u8 gText_MeowthDoll48BP[];
+extern const u8 gText_ClefairyDoll48BP[];
+extern const u8 gText_DittoDoll48BP[];
+extern const u8 gText_CyndaquilDoll80BP[];
+extern const u8 gText_ChikoritaDoll80BP[];
+extern const u8 gText_TotodileDoll80BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_LaprasDoll128BP[];
+extern const u8 gText_SnorlaxDoll128BP[];
+extern const u8 gText_VenusaurDoll256BP[];
+extern const u8 gText_CharizardDoll256BP[];
+extern const u8 gText_BlastoiseDoll256BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Protein1BP[];
+extern const u8 gText_Calcium1BP[];
+extern const u8 gText_Iron1BP[];
+extern const u8 gText_Zinc1BP[];
+extern const u8 gText_Carbos1BP[];
+extern const u8 gText_HpUp1BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Leftovers48BP[];
+extern const u8 gText_WhiteHerb48BP[];
+extern const u8 gText_QuickClaw48BP[];
+extern const u8 gText_MentalHerb48BP[];
+extern const u8 gText_BrightPowder64BP[];
+extern const u8 gText_ChoiceBand64BP[];
+extern const u8 gText_KingsRock64BP[];
+extern const u8 gText_FocusBand64BP[];
+extern const u8 gText_ScopeLens64BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_EnergyPowder50[];
+extern const u8 gText_EnergyRoot80[];
+extern const u8 gText_HealPowder50[];
+extern const u8 gText_RevivalHerb300[];
+extern const u8 gText_Protein1000[];
+extern const u8 gText_Iron1000[];
+extern const u8 gText_Carbos1000[];
+extern const u8 gText_Calcium1000[];
+extern const u8 gText_Zinc1000[];
+extern const u8 gText_HPUp1000[];
+extern const u8 gText_PPUp3000[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BattleTower2[];
+extern const u8 gText_BattleDome[];
+extern const u8 gText_BattlePalace[];
+extern const u8 gText_BattleArena[];
+extern const u8 gText_BattleFactory[];
+extern const u8 gText_BattlePike[];
+extern const u8 gText_BattlePyramid[];
+extern const u8 gText_RankingHall[];
+extern const u8 gText_ExchangeService[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Softboiled16BP[];
+extern const u8 gText_SeismicToss24BP[];
+extern const u8 gText_DreamEater24BP[];
+extern const u8 gText_MegaPunch24BP[];
+extern const u8 gText_MegaKick48BP[];
+extern const u8 gText_BodySlam48BP[];
+extern const u8 gText_RockSlide48BP[];
+extern const u8 gText_Counter48BP[];
+extern const u8 gText_ThunderWave48BP[];
+extern const u8 gText_SwordsDance48BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_DefenseCurl16BP[];
+extern const u8 gText_Snore24BP[];
+extern const u8 gText_MudSlap24BP[];
+extern const u8 gText_Swift24BP[];
+extern const u8 gText_IcyWind24BP[];
+extern const u8 gText_Endure48BP[];
+extern const u8 gText_PsychUp48BP[];
+extern const u8 gText_IcePunch48BP[];
+extern const u8 gText_ThunderPunch48BP[];
+extern const u8 gText_FirePunch48BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_SlateportCity[];
+extern const u8 gText_BattleFrontier[];
+extern const u8 gText_SouthernIsland[];
+extern const u8 gText_NavelRock[];
+extern const u8 gText_BirthIsland[];
+extern const u8 gText_FarawayIsland[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BattleTrainers[];
+extern const u8 gText_BattleBasics[];
+extern const u8 gText_PokemonNature[];
+extern const u8 gText_PokemonMoves[];
+extern const u8 gText_Underpowered[];
+extern const u8 gText_WhenInDanger[];
+extern const u8 gText_Exit[];
+
+extern const u8 BattleFrontier_Lounge2_Text_260971[];
+extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
+extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
+extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
+extern const u8 BattleFrontier_Lounge2_Text_261A91[];
+extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
+extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
+extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
+extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
+extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
+extern const u8 BattleFrontier_Lounge2_Text_260F74[];
+extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
+extern const u8 BattleFrontier_Lounge2_Text_261591[];
+extern const u8 BattleFrontier_Lounge2_Text_26166F[];
+extern const u8 BattleFrontier_Lounge2_Text_261282[];
+extern const u8 BattleFrontier_Lounge2_Text_261329[];
+extern const u8 BattleFrontier_Lounge2_Text_261403[];
+extern const u8 BattleFrontier_Lounge2_Text_261026[];
+extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
+extern const u8 BattleFrontier_Lounge2_Text_261194[];
+extern const u8 BattleFrontier_Lounge2_Text_26174D[];
+extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
+extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
+
+extern const u8 BattleFrontier_Lounge5_Text_26468D[];
+extern const u8 BattleFrontier_Lounge5_Text_2646E5[];
+extern const u8 BattleFrontier_Lounge5_Text_264741[];
+extern const u8 BattleFrontier_Lounge5_Text_2647A4[];
+extern const u8 BattleFrontier_Lounge5_Text_2647FC[];
+extern const u8 BattleFrontier_Lounge5_Text_264858[];
+extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
+extern const u8 BattleFrontier_Lounge5_Text_264916[];
+extern const u8 BattleFrontier_Lounge5_Text_264972[];
+extern const u8 BattleFrontier_Lounge5_Text_2649D5[];
+extern const u8 BattleFrontier_Lounge5_Text_264A3F[];
+extern const u8 BattleFrontier_Lounge5_Text_264A9B[];
+extern const u8 BattleFrontier_Lounge5_Text_264AF3[];
+extern const u8 BattleFrontier_Lounge5_Text_264B5D[];
+extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
+extern const u8 BattleFrontier_Lounge5_Text_264BC3[];
+extern const u8 BattleFrontier_Lounge5_Text_264C36[];
+extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
+extern const u8 BattleFrontier_Lounge5_Text_264C95[];
+extern const u8 BattleFrontier_Lounge5_Text_264D01[];
+extern const u8 BattleFrontier_Lounge5_Text_264D6B[];
+extern const u8 BattleFrontier_Lounge5_Text_264DD7[];
+extern const u8 BattleFrontier_Lounge5_Text_264E33[];
+extern const u8 BattleFrontier_Lounge5_Text_264E8F[];
+extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
+
+extern const u8 BattleFrontier_Lounge3_Text_262261[];
+extern const u8 BattleFrontier_Lounge3_Text_26230D[];
+extern const u8 BattleFrontier_Lounge3_Text_2623B9[];
+extern const u8 BattleFrontier_Lounge3_Text_262464[];
+extern const u8 BattleFrontier_Lounge3_Text_26250E[];
+extern const u8 BattleFrontier_Lounge3_Text_2625B8[];
+extern const u8 BattleFrontier_Lounge3_Text_26266A[];
+extern const u8 BattleFrontier_Lounge3_Text_26271C[];
+extern const u8 BattleFrontier_Lounge3_Text_2627C9[];
+extern const u8 BattleFrontier_Lounge3_Text_262876[];
+extern const u8 BattleFrontier_Lounge3_Text_26291A[];
+extern const u8 BattleFrontier_Lounge3_Text_2629BC[];
+
+extern const u8 BattleFrontier_Lounge3_Text_262C04[];
+extern const u8 BattleFrontier_Lounge3_Text_262C90[];
+extern const u8 BattleFrontier_Lounge3_Text_262D1C[];
+extern const u8 BattleFrontier_Lounge3_Text_262DA7[];
+extern const u8 BattleFrontier_Lounge3_Text_262E34[];
+extern const u8 BattleFrontier_Lounge3_Text_262EC1[];
+extern const u8 BattleFrontier_Lounge3_Text_262F56[];
+extern const u8 BattleFrontier_Lounge3_Text_262FEB[];
+extern const u8 BattleFrontier_Lounge3_Text_263078[];
+extern const u8 BattleFrontier_Lounge3_Text_263105[];
+extern const u8 BattleFrontier_Lounge3_Text_26318C[];
+extern const u8 BattleFrontier_Lounge3_Text_263211[];
+
+extern const u8 gText_BP[];
+
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260201[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260287[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E[];
+
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C[];
+
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260397[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260436[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C[];
+
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260542[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260575[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2[];
+extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260613[];
+
+extern const u8 BattleFrontier_Lounge7_Text_265E30[];
+extern const u8 BattleFrontier_Lounge7_Text_265E5B[];
+extern const u8 BattleFrontier_Lounge7_Text_265E8A[];
+extern const u8 BattleFrontier_Lounge7_Text_265EC0[];
+extern const u8 BattleFrontier_Lounge7_Text_265EED[];
+extern const u8 BattleFrontier_Lounge7_Text_265F1C[];
+extern const u8 BattleFrontier_Lounge7_Text_265F47[];
+extern const u8 BattleFrontier_Lounge7_Text_265F77[];
+extern const u8 BattleFrontier_Lounge7_Text_265FAA[];
+extern const u8 BattleFrontier_Lounge7_Text_265FDD[];
+
+extern const u8 BattleFrontier_Lounge7_Text_26600A[];
+extern const u8 BattleFrontier_Lounge7_Text_26603E[];
+extern const u8 BattleFrontier_Lounge7_Text_266070[];
+extern const u8 BattleFrontier_Lounge7_Text_2660A6[];
+extern const u8 BattleFrontier_Lounge7_Text_2660D0[];
+extern const u8 BattleFrontier_Lounge7_Text_2660FF[];
+extern const u8 BattleFrontier_Lounge7_Text_26612D[];
+extern const u8 BattleFrontier_Lounge7_Text_26615F[];
+extern const u8 BattleFrontier_Lounge7_Text_266185[];
+extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
+
+extern const u8 gText_YourPartnerHasRetired[];
+
+extern const u8 gText_Wallace[];
+extern const u8 gText_Steven[];
+extern const u8 gText_Brawly[];
+extern const u8 gText_Winona[];
+extern const u8 gText_Phoebe[];
+extern const u8 gText_Glacia[];
+
 #endif //GUARD_STRINGS_H
--- a/include/tv.h
+++ b/include/tv.h
@@ -49,5 +49,6 @@ void TV_PutSecretBaseVisitOnTheAir(void);
 void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
 void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
 void UpdateTVScreensOnMap(int, int);
+void TV_PrintIntToStringVar(u8 varIdx, int value);

 #endif //GUARD_TV_H
--- a/include/wallclock.h
+++ b/include/wallclock.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_WALLCLOCK_H
 #define GUARD_WALLCLOCK_H

-void Cb2_StartWallClock(void);
+void CB2_StartWallClock(void);
+void CB2_ViewWallClock(void);

 #endif //GUARD_WALLCLOCK_H