clean up main_menu.c

4 files changed, 445 insertions, 54 deletions

diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index 3e4d74726..c0a981e6c 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -12818,8 +12818,8 @@ sub_80472D8: @ 80472D8
 	bx r1
 	thumb_func_end sub_80472D8
 
-	thumb_func_start AddTextPrinterForMessage
-AddTextPrinterForMessage: @ 80472F0
+	thumb_func_start CreatePokeballSprite
+CreatePokeballSprite: @ 80472F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -12924,7 +12924,7 @@ _080473C0: .4byte gUnknown_0820A98C
 _080473C4: .4byte gSpriteTemplate_820AAB4
 _080473C8: .4byte 0x02020004
 _080473CC: .4byte sub_80473D0
-	thumb_func_end AddTextPrinterForMessage
+	thumb_func_end CreatePokeballSprite
 
 	thumb_func_start sub_80473D0
 sub_80473D0: @ 80473D0
@@ -24555,7 +24555,7 @@ _0804D314:
 	str r2, [sp, 0xC]
 	movs r2, 0x78
 	movs r3, 0x54
-	bl AddTextPrinterForMessage
+	bl CreatePokeballSprite
 	ldr r0, [r6]
 	ldr r5, _0804D3C0
 	adds r0, r5
diff --git a/include/species.h b/include/species.h
new file mode 100644
index 000000000..1d663c145
--- /dev/null
+++ b/include/species.h
@@ -0,0 +1,391 @@
+#ifndef GUARD_SPECIES_H
+#define GUARD_SPECIES_H
+
+#define SPECIES_BULBASAUR  0x001
+#define SPECIES_IVYSAUR    0x002
+#define SPECIES_VENUSAUR   0x003
+#define SPECIES_CHARMANDER 0x004
+#define SPECIES_CHARMELEON 0x005
+#define SPECIES_CHARIZARD  0x006
+#define SPECIES_SQUIRTLE   0x007
+#define SPECIES_WARTORTLE  0x008
+#define SPECIES_BLASTOISE  0x009
+#define SPECIES_CATERPIE   0x00a
+#define SPECIES_METAPOD    0x00b
+#define SPECIES_BUTTERFREE 0x00c
+#define SPECIES_WEEDLE     0x00d
+#define SPECIES_KAKUNA     0x00e
+#define SPECIES_BEEDRILL   0x00f
+#define SPECIES_PIDGEY     0x010
+#define SPECIES_PIDGEOTTO  0x011
+#define SPECIES_PIDGEOT    0x012
+#define SPECIES_RATTATA    0x013
+#define SPECIES_RATICATE   0x014
+#define SPECIES_SPEAROW    0x015
+#define SPECIES_FEAROW     0x016
+#define SPECIES_EKANS      0x017
+#define SPECIES_ARBOK      0x018
+#define SPECIES_PIKACHU    0x019
+#define SPECIES_RAICHU     0x01a
+#define SPECIES_SANDSHREW  0x01b
+#define SPECIES_SANDSLASH  0x01c
+#define SPECIES_NIDORAN_F  0x01d
+#define SPECIES_NIDORINA   0x01e
+#define SPECIES_NIDOQUEEN  0x01f
+#define SPECIES_NIDORAN_M  0x020
+#define SPECIES_NIDORINO   0x021
+#define SPECIES_NIDOKING   0x022
+#define SPECIES_CLEFAIRY   0x023
+#define SPECIES_CLEFABLE   0x024
+#define SPECIES_VULPIX     0x025
+#define SPECIES_NINETALES  0x026
+#define SPECIES_JIGGLYPUFF 0x027
+#define SPECIES_WIGGLYTUFF 0x028
+#define SPECIES_ZUBAT      0x029
+#define SPECIES_GOLBAT     0x02a
+#define SPECIES_ODDISH     0x02b
+#define SPECIES_GLOOM      0x02c
+#define SPECIES_VILEPLUME  0x02d
+#define SPECIES_PARAS      0x02e
+#define SPECIES_PARASECT   0x02f
+#define SPECIES_VENONAT    0x030
+#define SPECIES_VENOMOTH   0x031
+#define SPECIES_DIGLETT    0x032
+#define SPECIES_DUGTRIO    0x033
+#define SPECIES_MEOWTH     0x034
+#define SPECIES_PERSIAN    0x035
+#define SPECIES_PSYDUCK    0x036
+#define SPECIES_GOLDUCK    0x037
+#define SPECIES_MANKEY     0x038
+#define SPECIES_PRIMEAPE   0x039
+#define SPECIES_GROWLITHE  0x03a
+#define SPECIES_ARCANINE   0x03b
+#define SPECIES_POLIWAG    0x03c
+#define SPECIES_POLIWHIRL  0x03d
+#define SPECIES_POLIWRATH  0x03e
+#define SPECIES_ABRA       0x03f
+#define SPECIES_KADABRA    0x040
+#define SPECIES_ALAKAZAM   0x041
+#define SPECIES_MACHOP     0x042
+#define SPECIES_MACHOKE    0x043
+#define SPECIES_MACHAMP    0x044
+#define SPECIES_BELLSPROUT 0x045
+#define SPECIES_WEEPINBELL 0x046
+#define SPECIES_VICTREEBEL 0x047
+#define SPECIES_TENTACOOL  0x048
+#define SPECIES_TENTACRUEL 0x049
+#define SPECIES_GEODUDE    0x04a
+#define SPECIES_GRAVELER   0x04b
+#define SPECIES_GOLEM      0x04c
+#define SPECIES_PONYTA     0x04d
+#define SPECIES_RAPIDASH   0x04e
+#define SPECIES_SLOWPOKE   0x04f
+#define SPECIES_SLOWBRO    0x050
+#define SPECIES_MAGNEMITE  0x051
+#define SPECIES_MAGNETON   0x052
+#define SPECIES_FARFETCHD  0x053
+#define SPECIES_DODUO      0x054
+#define SPECIES_DODRIO     0x055
+#define SPECIES_SEEL       0x056
+#define SPECIES_DEWGONG    0x057
+#define SPECIES_GRIMER     0x058
+#define SPECIES_MUK        0x059
+#define SPECIES_SHELLDER   0x05a
+#define SPECIES_CLOYSTER   0x05b
+#define SPECIES_GASTLY     0x05c
+#define SPECIES_HAUNTER    0x05d
+#define SPECIES_GENGAR     0x05e
+#define SPECIES_ONIX       0x05f
+#define SPECIES_DROWZEE    0x060
+#define SPECIES_HYPNO      0x061
+#define SPECIES_KRABBY     0x062
+#define SPECIES_KINGLER    0x063
+#define SPECIES_VOLTORB    0x064
+#define SPECIES_ELECTRODE  0x065
+#define SPECIES_EXEGGCUTE  0x066
+#define SPECIES_EXEGGUTOR  0x067
+#define SPECIES_CUBONE     0x068
+#define SPECIES_MAROWAK    0x069
+#define SPECIES_HITMONLEE  0x06a
+#define SPECIES_HITMONCHAN 0x06b
+#define SPECIES_LICKITUNG  0x06c
+#define SPECIES_KOFFING    0x06d
+#define SPECIES_WEEZING    0x06e
+#define SPECIES_RHYHORN    0x06f
+#define SPECIES_RHYDON     0x070
+#define SPECIES_CHANSEY    0x071
+#define SPECIES_TANGELA    0x072
+#define SPECIES_KANGASKHAN 0x073
+#define SPECIES_HORSEA     0x074
+#define SPECIES_SEADRA     0x075
+#define SPECIES_GOLDEEN    0x076
+#define SPECIES_SEAKING    0x077
+#define SPECIES_STARYU     0x078
+#define SPECIES_STARMIE    0x079
+#define SPECIES_MR_MIME    0x07a
+#define SPECIES_SCYTHER    0x07b
+#define SPECIES_JYNX       0x07c
+#define SPECIES_ELECTABUZZ 0x07d
+#define SPECIES_MAGMAR     0x07e
+#define SPECIES_PINSIR     0x07f
+#define SPECIES_TAUROS     0x080
+#define SPECIES_MAGIKARP   0x081
+#define SPECIES_GYARADOS   0x082
+#define SPECIES_LAPRAS     0x083
+#define SPECIES_DITTO      0x084
+#define SPECIES_EEVEE      0x085
+#define SPECIES_VAPOREON   0x086
+#define SPECIES_JOLTEON    0x087
+#define SPECIES_FLAREON    0x088
+#define SPECIES_PORYGON    0x089
+#define SPECIES_OMANYTE    0x08a
+#define SPECIES_OMASTAR    0x08b
+#define SPECIES_KABUTO     0x08c
+#define SPECIES_KABUTOPS   0x08d
+#define SPECIES_AERODACTYL 0x08e
+#define SPECIES_SNORLAX    0x08f
+#define SPECIES_ARTICUNO   0x090
+#define SPECIES_ZAPDOS     0x091
+#define SPECIES_MOLTRES    0x092
+#define SPECIES_DRATINI    0x093
+#define SPECIES_DRAGONAIR  0x094
+#define SPECIES_DRAGONITE  0x095
+#define SPECIES_MEWTWO     0x096
+#define SPECIES_MEW        0x097
+#define SPECIES_CHIKORITA  0x098
+#define SPECIES_BAYLEEF    0x099
+#define SPECIES_MEGANIUM   0x09a
+#define SPECIES_CYNDAQUIL  0x09b
+#define SPECIES_QUILAVA    0x09c
+#define SPECIES_TYPHLOSION 0x09d
+#define SPECIES_TOTODILE   0x09e
+#define SPECIES_CROCONAW   0x09f
+#define SPECIES_FERALIGATR 0x0a0
+#define SPECIES_SENTRET    0x0a1
+#define SPECIES_FURRET     0x0a2
+#define SPECIES_HOOTHOOT   0x0a3
+#define SPECIES_NOCTOWL    0x0a4
+#define SPECIES_LEDYBA     0x0a5
+#define SPECIES_LEDIAN     0x0a6
+#define SPECIES_SPINARAK   0x0a7
+#define SPECIES_ARIADOS    0x0a8
+#define SPECIES_CROBAT     0x0a9
+#define SPECIES_CHINCHOU   0x0aa
+#define SPECIES_LANTURN    0x0ab
+#define SPECIES_PICHU      0x0ac
+#define SPECIES_CLEFFA     0x0ad
+#define SPECIES_IGGLYBUFF  0x0ae
+#define SPECIES_TOGEPI     0x0af
+#define SPECIES_TOGETIC    0x0b0
+#define SPECIES_NATU       0x0b1
+#define SPECIES_XATU       0x0b2
+#define SPECIES_MAREEP     0x0b3
+#define SPECIES_FLAAFFY    0x0b4
+#define SPECIES_AMPHAROS   0x0b5
+#define SPECIES_BELLOSSOM  0x0b6
+#define SPECIES_MARILL     0x0b7
+#define SPECIES_AZUMARILL  0x0b8
+#define SPECIES_SUDOWOODO  0x0b9
+#define SPECIES_POLITOED   0x0ba
+#define SPECIES_HOPPIP     0x0bb
+#define SPECIES_SKIPLOOM   0x0bc
+#define SPECIES_JUMPLUFF   0x0bd
+#define SPECIES_AIPOM      0x0be
+#define SPECIES_SUNKERN    0x0bf
+#define SPECIES_SUNFLORA   0x0c0
+#define SPECIES_YANMA      0x0c1
+#define SPECIES_WOOPER     0x0c2
+#define SPECIES_QUAGSIRE   0x0c3
+#define SPECIES_ESPEON     0x0c4
+#define SPECIES_UMBREON    0x0c5
+#define SPECIES_MURKROW    0x0c6
+#define SPECIES_SLOWKING   0x0c7
+#define SPECIES_MISDREAVUS 0x0c8
+#define SPECIES_UNOWN      0x0c9
+#define SPECIES_WOBBUFFET  0x0ca
+#define SPECIES_GIRAFARIG  0x0cb
+#define SPECIES_PINECO     0x0cc
+#define SPECIES_FORRETRESS 0x0cd
+#define SPECIES_DUNSPARCE  0x0ce
+#define SPECIES_GLIGAR     0x0cf
+#define SPECIES_STEELIX    0x0d0
+#define SPECIES_SNUBBULL   0x0d1
+#define SPECIES_GRANBULL   0x0d2
+#define SPECIES_QWILFISH   0x0d3
+#define SPECIES_SCIZOR     0x0d4
+#define SPECIES_SHUCKLE    0x0d5
+#define SPECIES_HERACROSS  0x0d6
+#define SPECIES_SNEASEL    0x0d7
+#define SPECIES_TEDDIURSA  0x0d8
+#define SPECIES_URSARING   0x0d9
+#define SPECIES_SLUGMA     0x0da
+#define SPECIES_MAGCARGO   0x0db
+#define SPECIES_SWINUB     0x0dc
+#define SPECIES_PILOSWINE  0x0dd
+#define SPECIES_CORSOLA    0x0de
+#define SPECIES_REMORAID   0x0df
+#define SPECIES_OCTILLERY  0x0e0
+#define SPECIES_DELIBIRD   0x0e1
+#define SPECIES_MANTINE    0x0e2
+#define SPECIES_SKARMORY   0x0e3
+#define SPECIES_HOUNDOUR   0x0e4
+#define SPECIES_HOUNDOOM   0x0e5
+#define SPECIES_KINGDRA    0x0e6
+#define SPECIES_PHANPY     0x0e7
+#define SPECIES_DONPHAN    0x0e8
+#define SPECIES_PORYGON2   0x0e9
+#define SPECIES_STANTLER   0x0ea
+#define SPECIES_SMEARGLE   0x0eb
+#define SPECIES_TYROGUE    0x0ec
+#define SPECIES_HITMONTOP  0x0ed
+#define SPECIES_SMOOCHUM   0x0ee
+#define SPECIES_ELEKID     0x0ef
+#define SPECIES_MAGBY      0x0f0
+#define SPECIES_MILTANK    0x0f1
+#define SPECIES_BLISSEY    0x0f2
+#define SPECIES_RAIKOU     0x0f3
+#define SPECIES_ENTEI      0x0f4
+#define SPECIES_SUICUNE    0x0f5
+#define SPECIES_LARVITAR   0x0f6
+#define SPECIES_PUPITAR    0x0f7
+#define SPECIES_TYRANITAR  0x0f8
+#define SPECIES_LUGIA      0x0f9
+#define SPECIES_HO_OH      0x0fa
+#define SPECIES_CELEBI     0x0fb
+#define SPECIES_TREECKO    0x115
+#define SPECIES_GROVYLE    0x116
+#define SPECIES_SCEPTILE   0x117
+#define SPECIES_TORCHIC    0x118
+#define SPECIES_COMBUSKEN  0x119
+#define SPECIES_BLAZIKEN   0x11a
+#define SPECIES_MUDKIP     0x11b
+#define SPECIES_MARSHTOMP  0x11c
+#define SPECIES_SWAMPERT   0x11d
+#define SPECIES_POOCHYENA  0x11e
+#define SPECIES_MIGHTYENA  0x11f
+#define SPECIES_ZIGZAGOON  0x120
+#define SPECIES_LINOONE    0x121
+#define SPECIES_WURMPLE    0x122
+#define SPECIES_SILCOON    0x123
+#define SPECIES_BEAUTIFLY  0x124
+#define SPECIES_CASCOON    0x125
+#define SPECIES_DUSTOX     0x126
+#define SPECIES_LOTAD      0x127
+#define SPECIES_LOMBRE     0x128
+#define SPECIES_LUDICOLO   0x129
+#define SPECIES_SEEDOT     0x12a
+#define SPECIES_NUZLEAF    0x12b
+#define SPECIES_SHIFTRY    0x12c
+#define SPECIES_NINCADA    0x12d
+#define SPECIES_NINJASK    0x12e
+#define SPECIES_SHEDINJA   0x12f
+#define SPECIES_TAILLOW    0x130
+#define SPECIES_SWELLOW    0x131
+#define SPECIES_SHROOMISH  0x132
+#define SPECIES_BRELOOM    0x133
+#define SPECIES_SPINDA     0x134
+#define SPECIES_WINGULL    0x135
+#define SPECIES_PELIPPER   0x136
+#define SPECIES_SURSKIT    0x137
+#define SPECIES_MASQUERAIN 0x138
+#define SPECIES_WAILMER    0x139
+#define SPECIES_WAILORD    0x13a
+#define SPECIES_SKITTY     0x13b
+#define SPECIES_DELCATTY   0x13c
+#define SPECIES_KECLEON    0x13d
+#define SPECIES_BALTOY     0x13e
+#define SPECIES_CLAYDOL    0x13f
+#define SPECIES_NOSEPASS   0x140
+#define SPECIES_TORKOAL    0x141
+#define SPECIES_SABLEYE    0x142
+#define SPECIES_BARBOACH   0x143
+#define SPECIES_WHISCASH   0x144
+#define SPECIES_LUVDISC    0x145
+#define SPECIES_CORPHISH   0x146
+#define SPECIES_CRAWDAUNT  0x147
+#define SPECIES_FEEBAS     0x148
+#define SPECIES_MILOTIC    0x149
+#define SPECIES_CARVANHA   0x14a
+#define SPECIES_SHARPEDO   0x14b
+#define SPECIES_TRAPINCH   0x14c
+#define SPECIES_VIBRAVA    0x14d
+#define SPECIES_FLYGON     0x14e
+#define SPECIES_MAKUHITA   0x14f
+#define SPECIES_HARIYAMA   0x150
+#define SPECIES_ELECTRIKE  0x151
+#define SPECIES_MANECTRIC  0x152
+#define SPECIES_NUMEL      0x153
+#define SPECIES_CAMERUPT   0x154
+#define SPECIES_SPHEAL     0x155
+#define SPECIES_SEALEO     0x156
+#define SPECIES_WALREIN    0x157
+#define SPECIES_CACNEA     0x158
+#define SPECIES_CACTURNE   0x159
+#define SPECIES_SNORUNT    0x15a
+#define SPECIES_GLALIE     0x15b
+#define SPECIES_LUNATONE   0x15c
+#define SPECIES_SOLROCK    0x15d
+#define SPECIES_AZURILL    0x15e
+#define SPECIES_SPOINK     0x15f
+#define SPECIES_GRUMPIG    0x160
+#define SPECIES_PLUSLE     0x161
+#define SPECIES_MINUN      0x162
+#define SPECIES_MAWILE     0x163
+#define SPECIES_MEDITITE   0x164
+#define SPECIES_MEDICHAM   0x165
+#define SPECIES_SWABLU     0x166
+#define SPECIES_ALTARIA    0x167
+#define SPECIES_WYNAUT     0x168
+#define SPECIES_DUSKULL    0x169
+#define SPECIES_DUSCLOPS   0x16a
+#define SPECIES_ROSELIA    0x16b
+#define SPECIES_SLAKOTH    0x16c
+#define SPECIES_VIGOROTH   0x16d
+#define SPECIES_SLAKING    0x16e
+#define SPECIES_GULPIN     0x16f
+#define SPECIES_SWALOT     0x170
+#define SPECIES_TROPIUS    0x171
+#define SPECIES_WHISMUR    0x172
+#define SPECIES_LOUDRED    0x173
+#define SPECIES_EXPLOUD    0x174
+#define SPECIES_CLAMPERL   0x175
+#define SPECIES_HUNTAIL    0x176
+#define SPECIES_GOREBYSS   0x177
+#define SPECIES_ABSOL      0x178
+#define SPECIES_SHUPPET    0x179
+#define SPECIES_BANETTE    0x17a
+#define SPECIES_SEVIPER    0x17b
+#define SPECIES_ZANGOOSE   0x17c
+#define SPECIES_RELICANTH  0x17d
+#define SPECIES_ARON       0x17e
+#define SPECIES_LAIRON     0x17f
+#define SPECIES_AGGRON     0x180
+#define SPECIES_CASTFORM   0x181
+#define SPECIES_VOLBEAT    0x182
+#define SPECIES_ILLUMISE   0x183
+#define SPECIES_LILEEP     0x184
+#define SPECIES_CRADILY    0x185
+#define SPECIES_ANORITH    0x186
+#define SPECIES_ARMALDO    0x187
+#define SPECIES_RALTS      0x188
+#define SPECIES_KIRLIA     0x189
+#define SPECIES_GARDEVOIR  0x18a
+#define SPECIES_BAGON      0x18b
+#define SPECIES_SHELGON    0x18c
+#define SPECIES_SALAMENCE  0x18d
+#define SPECIES_BELDUM     0x18e
+#define SPECIES_METANG     0x18f
+#define SPECIES_METAGROSS  0x190
+#define SPECIES_REGIROCK   0x191
+#define SPECIES_REGICE     0x192
+#define SPECIES_REGISTEEL  0x193
+#define SPECIES_KYOGRE     0x194
+#define SPECIES_GROUDON    0x195
+#define SPECIES_RAYQUAZA   0x196
+#define SPECIES_LATIAS     0x197
+#define SPECIES_LATIOS     0x198
+#define SPECIES_JIRACHI    0x199
+#define SPECIES_DEOXYS     0x19a
+#define SPECIES_CHIMECHO   0x19b
+
+#endif // GUARD_SPECIES_H
diff --git a/src/main_menu.c b/src/main_menu.c
index 60e9fdc98..559bf5a0a 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -7,6 +7,7 @@
 #include "songs.h"
 #include "palette.h"
 #include "string_util.h"
+#include "species.h"
 
 extern u8 MenuUpdateWindowText(void);
 extern void MenuPrint(u8 *, u8, u8);
@@ -22,7 +23,7 @@ extern u8 sub_80729D8(u8 *, u8, u16, u8);
 extern u8 GetBadgeCount(void);
 extern void Task_Birch1(u8);
 void MenuPrintMessage(const u8 *string, u8 a, u8 b);
-u8 sub_8072CF4(u8 a);
+u8 MenuUpdateWindowText_OverrideLineLength(u8 a);
 void sub_8072DEC(void);
 u8 sub_8075374(void);
 void MenuSetText(u32);
@@ -702,7 +703,7 @@ void sub_800B034(u8 taskId);
 void new_game_prof_birch_speech_part2_start();
 void nullsub_34(struct Sprite *sprite);
 void sub_800B240(struct Sprite *sprite);
-u8 sub_800B25C(u8, u8);
+u8 CreateAzurillSprite(u8, u8);
 void AddBirchSpeechObjects(u8);
 void sub_800B3EC(u8);
 void sub_800B458(u8, u8);
@@ -739,14 +740,14 @@ void Task_Birch1(u8 taskId)
     AddBirchSpeechObjects(taskId);
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
     REG_BG1CNT = 0x00000703;
-    REG_DISPCNT = 0x9A << 5;
+    REG_DISPCNT = DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP;
     gTasks[taskId].data[4] = 0;
     gTasks[taskId].func = task_new_game_prof_birch_speech_2;
     gTasks[taskId].data[2] = 0xFF;
     gTasks[taskId].data[3] = 0xFF;
     gTasks[taskId].data[7] = 0xD8;
 
-    sub_8075474(0xBB << 1);
+    sub_8075474(BGM_DOORO_X4);
 }
 
 void task_new_game_prof_birch_speech_2(u8 taskId)
@@ -782,17 +783,17 @@ void task_new_game_prof_birch_speech_3(u8 taskId)
     if (task->data[5] != 0)
     {
         struct Sprite *sprites = gSprites;
-        struct Sprite *sprite = &sprites[(s16)task->data[8]];
+        struct Sprite *sprite = &sprites[task->data[8]];
 
         sprite->oam.objMode = 0;
-        if ((u16)task->data[7])
+        if (task->data[7])
         {
             task->data[7]--;
         }
         else
         {
             MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
-            MenuPrintMessage(gUnknown_081C6D78, 0x3, 0xE);
+            MenuPrintMessage(gUnknown_081C6D78, 3, 14);
             task->func = task_new_game_prof_birch_speech_4;
         }
     }
@@ -800,18 +801,16 @@ void task_new_game_prof_birch_speech_3(u8 taskId)
 
 void task_new_game_prof_birch_speech_4(u8 taskId)
 {
-    if (!gPaletteFade.active && sub_8072CF4(0x18))
+    if (!gPaletteFade.active && MenuUpdateWindowText_OverrideLineLength(24))
     {
-        struct Task *tasks = gTasks;
-        struct Task *task = &tasks[taskId];
-        task->func = task_new_game_prof_birch_speech_5;
-        MenuPrintMessage(gUnknown_081C6DF8, 0x3, 0xE);
+        gTasks[taskId].func = task_new_game_prof_birch_speech_5;
+        MenuPrintMessage(gUnknown_081C6DF8, 3, 14);
     }
 }
 
 void task_new_game_prof_birch_speech_5(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
         gTasks[taskId].func = task_new_game_prof_birch_speech_6;
 }
 
@@ -819,7 +818,7 @@ void task_new_game_prof_birch_speech_6(u8 taskId)
 {
     struct Task *tasks = gTasks;
     struct Task *task = &tasks[taskId];
-    u8 data = (u8)task->data[9];
+    u8 data = task->data[9];
     struct Sprite *sprites = gSprites;
     struct Sprite *sprite = &sprites[data];
 
@@ -827,7 +826,7 @@ void task_new_game_prof_birch_speech_6(u8 taskId)
     sprite->pos1.y = 0x48;
     sprite->invisible = 0;
     sprite->data0 = 0;
-    AddTextPrinterForMessage(data, sprite->oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF);
+    CreatePokeballSprite(data, sprite->oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF);
     task->func = task_new_game_prof_birch_speech_7;
     task->data[7] = 0;
 }
@@ -840,7 +839,7 @@ void task_new_game_prof_birch_speech_7(u8 taskId)
     if (sub_8075374())
     {
         struct Task *tasks = gTasks;
-        struct Task *task = &tasks[taskId]; //r5
+        struct Task *task = &tasks[taskId];
 
         if (task->data[7] > 0x5F)
         {
@@ -848,41 +847,42 @@ void task_new_game_prof_birch_speech_7(u8 taskId)
             task->func = task_new_game_prof_birch_speech_8;
         }
     }
-    //_0800A4E4
+
     tasks = gTasks;
-    task = &tasks[taskId]; //r2
-    if ((s16)task->data[7] <= 0x00003fff)
+    task = &tasks[taskId];
+
+    if (task->data[7] < 0x4000)
     {
         task->data[7]++;
         if (task->data[7] == 0x20)
         {
-            cry_related(0xAF << 1, 0);
+            cry_related(SPECIES_AZURILL, 0);
         }
     }
 }
 
 void task_new_game_prof_birch_speech_8(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
-        MenuPrintMessage(gUnknown_081C6E1A, 0x3, 0xE);
+        MenuPrintMessage(gUnknown_081C6E1A, 3, 14);
         gTasks[taskId].func = task_new_game_prof_birch_speech_9;
     }
 }
 
 void task_new_game_prof_birch_speech_9(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
         MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
-        MenuPrintMessage(gUnknown_081C6FCB, 0x3, 0xE);
+        MenuPrintMessage(gUnknown_081C6FCB, 3, 14);
         gTasks[taskId].func = task_new_game_prof_birch_speech_10;
     }
 }
 
 void task_new_game_prof_birch_speech_10(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
         struct Sprite *sprites = gSprites;
         struct Task *tasks = gTasks;
@@ -905,7 +905,7 @@ void task_new_game_prof_birch_speech_11(u8 taskId)
     struct Task *tasks = gTasks;
     struct Task *task = &tasks[taskId];
 
-    if ((s16)task->data[4] != -0x3C)
+    if (task->data[4] != -0x3C)
     {
         task->data[4] -= 2;
         REG_BG1HOFS = task->data[4];
@@ -969,7 +969,7 @@ void task_new_game_prof_birch_speech_14(u8 taskId)
 
 void task_new_game_prof_birch_speech_15(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
         CreateGenderMenu(2, 4);
         gTasks[taskId].func = task_new_game_prof_birch_speech_16;
@@ -984,14 +984,14 @@ void task_new_game_prof_birch_speech_16(u8 taskId)
     {
     case MALE:
         sub_8072DEC();
-        audio_play(5);
+        audio_play(SE_SELECT);
         gSaveBlock2.playerGender = MALE;
         MenuZeroFillWindowRect(2, 4, 8, 9);
         gTasks[taskId].func = sub_800A974;
         break;
     case FEMALE:
         sub_8072DEC();
-        audio_play(5);
+        audio_play(SE_SELECT);
         gSaveBlock2.playerGender = FEMALE;
         MenuZeroFillWindowRect(2, 4, 8, 9);
         gTasks[taskId].func = sub_800A974;
@@ -1000,7 +1000,7 @@ void task_new_game_prof_birch_speech_16(u8 taskId)
 
     cursorPos = GetMenuCursorPos();
 
-    if (cursorPos != (s16)gTasks[taskId].data[6])
+    if (cursorPos != gTasks[taskId].data[6])
     {
         gTasks[taskId].data[6] = cursorPos;
         gSprites[gTasks[taskId].data[2]].oam.objMode = 1;
@@ -1067,7 +1067,7 @@ void sub_800A974(u8 taskId)
 
 void Task_800A9B4(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
         CreateNameMenu(2, 1);
         gTasks[taskId].func = sub_800A9EC;
@@ -1085,19 +1085,19 @@ void sub_800A9EC(u8 taskId)
     case 3:
     case 4:
         sub_8072DEC();
-        audio_play(5);
+        audio_play(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 22, 12);
         set_default_player_name(n);
         gTasks[taskId].func = task_new_game_prof_birch_speech_part2_1;
         break;
     case 0:
-        audio_play(5);
+        audio_play(SE_SELECT);
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
         gTasks[taskId].func = sub_800AAAC;
         break;
     case -1:
         sub_8072DEC();
-        audio_play(5);
+        audio_play(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 22, 12);
         gTasks[taskId].func = task_new_game_prof_birch_speech_14;
         break;
@@ -1123,7 +1123,7 @@ void task_new_game_prof_birch_speech_part2_1(u8 taskId)
 
 void sub_800AB38(u8 taskId)
 {
-    if (sub_8072CF4(0x18))
+    if (MenuUpdateWindowText_OverrideLineLength(24))
     {
         DisplayYesNoMenu(2, 1, 1);
         gTasks[taskId].func = task_new_game_prof_birch_speech_part2_4;
@@ -1135,7 +1135,7 @@ void task_new_game_prof_birch_speech_part2_4(u8 taskId)
     switch (ProcessMenuInputNoWrap_())
     {
     case 0:
-        audio_play(5);
+        audio_play(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
         gSprites[gTasks[taskId].data[2]].oam.objMode = ST_OAM_OBJ_BLEND;
         sub_800B458(taskId, 2);
@@ -1144,7 +1144,7 @@ void task_new_game_prof_birch_speech_part2_4(u8 taskId)
         break;
     case -1:
     case 1:
-        audio_play(5);
+        audio_play(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
         gTasks[taskId].func = task_new_game_prof_birch_speech_14;
         break;
@@ -1209,7 +1209,7 @@ void task_new_game_prof_birch_speech_part2_7(u8 taskId)
         spriteId = gTasks[taskId].data[9];
         gSprites[spriteId].oam.objMode = 0;
 
-        if (sub_8072CF4(0x18))
+        if (MenuUpdateWindowText_OverrideLineLength(24))
         {
             spriteId = gTasks[taskId].data[8];
             gSprites[spriteId].oam.objMode = 1;
@@ -1274,7 +1274,7 @@ void task_new_game_prof_birch_speech_part2_9(u8 taskId)
         spriteId = gTasks[taskId].data[2];
         gSprites[spriteId].oam.objMode = 0;
 
-        if (sub_8072CF4(0x18))
+        if (MenuUpdateWindowText_OverrideLineLength(24))
         {
             u8 spriteId;
 
@@ -1416,17 +1416,17 @@ void sub_800B240(struct Sprite *sprite)
     sprite->data0 = y;
 }
 
-u8 sub_800B25C(u8 a1, u8 a2)
+u8 CreateAzurillSprite(u8 a1, u8 a2)
 {
     DecompressPicFromTable_2(
-        &gMonFrontPicTable[350],
-        gMonFrontPicCoords[350].x,
-        gMonFrontPicCoords[350].y,
+        &gMonFrontPicTable[SPECIES_AZURILL],
+        gMonFrontPicCoords[SPECIES_AZURILL].x,
+        gMonFrontPicCoords[SPECIES_AZURILL].y,
         gUnknown_081FAF4C[0],
         gUnknown_081FAF4C[1],
-        350);
-    LoadCompressedObjectPalette(&gMonPaletteTable[350]);
-    gpu_pal_obj_decompress_and_apply(350, 1);
+        SPECIES_AZURILL);
+    LoadCompressedObjectPalette(&gMonPaletteTable[SPECIES_AZURILL]);
+    gpu_pal_obj_decompress_and_apply(SPECIES_AZURILL, 1);
     return CreateSprite(&gUnknown_02024E8C, a1, a2, 0);
 }
 
@@ -1440,7 +1440,7 @@ void AddBirchSpeechObjects(u8 taskId)
     gSprites[spriteId].invisible = 1;
     gTasks[taskId].data[8] = spriteId;
 
-    spriteId = sub_800B25C(0x68, 0x48);
+    spriteId = CreateAzurillSprite(0x68, 0x48);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].oam.priority = 0;
     gSprites[spriteId].invisible = 1;
diff --git a/src/menu.c b/src/menu.c
index 1ced7d517..b101165f2 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -74,7 +74,7 @@ u8 *sub_8072C74(u8 *, u8 *, u8, u8);
 u8 sub_8072CA4(u8 *s);
 u8 sub_8072CBC(void);
 void sub_8072CD4(u8 *, u8 *, u8 *);
-u32 sub_8072CF4(u8);
+u32 MenuUpdateWindowText_OverrideLineLength(u8);
 struct Window * unref_sub_8072D0C(void);
 void sub_8072D18(u8, u8);
 u8 InitMenu(u8, u8, u8, u8, u8, u8);
@@ -938,9 +938,9 @@ void sub_8072CD4(u8 *a1, u8 *a2, u8 *a3)
     sub_8004E28(gMenuWindowPtr, a1, a2, a3);
 }
 
-u32 sub_8072CF4(u8 a1)
+u32 MenuUpdateWindowText_OverrideLineLength(u8 lineLength)
 {
-    return sub_80037C8(gMenuWindowPtr, a1);
+    return sub_80037C8(gMenuWindowPtr, lineLength);
 }
 
 struct Window *unref_sub_8072D0C(void)