Merge branch 'master' into daycare

248 files changed, 13850 insertions, 22069 deletions

diff --git a/README.md b/README.md
index 0782f7a12..a840a9a78 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,24 @@ It builds the following roms:
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
-### irc: [freenode#pret][irc]
+## See also
 
+* Disassembly of [**Pokémon Red/Blue**][pokered]
+* Disassembly of [**Pokémon Yellow**][pokeyellow]
+* Disassembly of [**Pokémon Crystal**][pokecrystal]
+* Disassembly of [**Pokémon Pinball**][pokepinball]
+* Disassembly of [**Pokémon TCG**][poketcg]
+* Disassembly of [**Pokémon Emerald**][pokeemerald]
+* Discord: [**pret**][Discord]
+* irc: **irc.freenode.net** [**#pret**][irc]
+
+[pokered]: https://github.com/pret/pokered
+[pokeyellow]: https://github.com/pret/pokeyellow
+[pokecrystal]: https://github.com/pret/pokecrystal
+[pokepinball]: https://github.com/pret/pokepinball
+[poketcg]: https://github.com/pret/poketcg
+[pokeemerald]: https://github.com/pret/pokeemerald
+[Discord]: https://discord.gg/cJxDDVP
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
 [travis]: https://travis-ci.org/pret/pokeruby
 [travis-badge]: https://travis-ci.org/pret/pokeruby.svg?branch=master
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 617729451..7868f8492 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -3144,7 +3144,7 @@ _08013D4C:
 	ldr r1, _08013D6C @ =gBattleMainFunc
 	ldr r0, _08013D70 @ =sub_8013DA8
 	str r0, [r1]
-	ldr r1, _08013D74 @ =gUnknown_03005E94
+	ldr r1, _08013D74 @ =gCB2_AfterEvolution
 	ldr r0, _08013D78 @ =sub_800F808
 	str r0, [r1]
 	b _08013D96
@@ -3152,7 +3152,7 @@ _08013D4C:
 _08013D68: .4byte gNoOfAllBanks
 _08013D6C: .4byte gBattleMainFunc
 _08013D70: .4byte sub_8013DA8
-_08013D74: .4byte gUnknown_03005E94
+_08013D74: .4byte gCB2_AfterEvolution
 _08013D78: .4byte sub_800F808
 _08013D7C:
 	ldr r0, _08013D9C @ =gBattleExecBuffer
diff --git a/asm/battle_controller_linkopponent1.s b/asm/battle_controller_linkopponent1.s
deleted file mode 100644
index 4fa523c83..000000000
--- a/asm/battle_controller_linkopponent1.s
+++ /dev/null
@@ -1,1421 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-	thumb_func_start nullsub_47
-nullsub_47: @ 803750C
-	bx lr
-	thumb_func_end nullsub_47
-
-	thumb_func_start SetBankFuncToLinkOpponentBufferRunCommand
-SetBankFuncToLinkOpponentBufferRunCommand: @ 8037510
-	ldr r1, _08037520 @ =gBattleBankFunc
-	ldr r0, _08037524 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08037528 @ =sub_803752C
-	str r1, [r0]
-	bx lr
-	.align 2, 0
-_08037520: .4byte gBattleBankFunc
-_08037524: .4byte gActiveBank
-_08037528: .4byte sub_803752C
-	thumb_func_end SetBankFuncToLinkOpponentBufferRunCommand
-
-	thumb_func_start sub_803752C
-sub_803752C: @ 803752C
-	push {lr}
-	ldr r2, _08037560 @ =gBattleExecBuffer
-	ldr r1, _08037564 @ =gBitTable
-	ldr r0, _08037568 @ =gActiveBank
-	ldrb r3, [r0]
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r2]
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _08037578
-	ldr r0, _0803756C @ =gBattleBufferA
-	lsls r1, r3, 9
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x38
-	bhi _08037574
-	ldr r0, _08037570 @ =gLinkOpponentBufferCommands
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-	bl _call_via_r0
-	b _08037578
-	.align 2, 0
-_08037560: .4byte gBattleExecBuffer
-_08037564: .4byte gBitTable
-_08037568: .4byte gActiveBank
-_0803756C: .4byte gBattleBufferA
-_08037570: .4byte gLinkOpponentBufferCommands
-_08037574:
-	bl LinkOpponentBufferExecCompleted
-_08037578:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803752C
-
-	thumb_func_start sub_803757C
-sub_803757C: @ 803757C
-	push {lr}
-	ldr r2, _080375A4 @ =gSprites
-	ldr r1, _080375A8 @ =gObjectBankIDs
-	ldr r0, _080375AC @ =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _080375B0 @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _080375A0
-	bl LinkOpponentBufferExecCompleted
-_080375A0:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080375A4: .4byte gSprites
-_080375A8: .4byte gObjectBankIDs
-_080375AC: .4byte gActiveBank
-_080375B0: .4byte SpriteCallbackDummy
-	thumb_func_end sub_803757C
-
-	thumb_func_start sub_80375B4
-sub_80375B4: @ 80375B4
-	push {r4-r6,lr}
-	ldr r4, _0803762C @ =gSprites
-	ldr r6, _08037630 @ =gObjectBankIDs
-	ldr r5, _08037634 @ =gActiveBank
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r2, r0, 2
-	adds r0, r4, 0
-	adds r0, 0x1C
-	adds r0, r2, r0
-	ldr r1, [r0]
-	ldr r0, _08037638 @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _08037624
-	adds r0, r2, r4
-	ldrh r0, [r0, 0x6]
-	bl sub_8031B74
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrh r0, [r1, 0x38]
-	ldr r2, _0803763C @ =0x000003ff
-	ands r2, r0
-	ldrh r3, [r1, 0x4]
-	ldr r0, _08037640 @ =0xfffffc00
-	ands r0, r3
-	orrs r0, r2
-	strh r0, [r1, 0x4]
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl FreeSpriteOamMatrix
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	bl LinkOpponentBufferExecCompleted
-_08037624:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803762C: .4byte gSprites
-_08037630: .4byte gObjectBankIDs
-_08037634: .4byte gActiveBank
-_08037638: .4byte SpriteCallbackDummy
-_0803763C: .4byte 0x000003ff
-_08037640: .4byte 0xfffffc00
-	thumb_func_end sub_80375B4
-
-	thumb_func_start sub_8037644
-sub_8037644: @ 8037644
-	push {lr}
-	ldr r3, _08037678 @ =gActiveBank
-	ldrb r0, [r3]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	ldr r2, _0803767C @ =0x02017810
-	adds r1, r2
-	ldrb r0, [r1, 0x9]
-	subs r0, 0x1
-	strb r0, [r1, 0x9]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _08037674
-	ldrb r0, [r3]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	movs r0, 0
-	strb r0, [r1, 0x9]
-	bl LinkOpponentBufferExecCompleted
-_08037674:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037678: .4byte gActiveBank
-_0803767C: .4byte 0x02017810
-	thumb_func_end sub_8037644
-
-	thumb_func_start sub_8037680
-sub_8037680: @ 8037680
-	push {r4-r7,lr}
-	movs r6, 0
-	bl IsDoubleBattle
-	lsls r0, 24
-	cmp r0, 0
-	beq _080376A4
-	bl IsDoubleBattle
-	lsls r0, 24
-	cmp r0, 0
-	beq _080376D8
-	ldr r0, _080376C4 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _080376D8
-_080376A4:
-	ldr r2, _080376C8 @ =gSprites
-	ldr r1, _080376CC @ =gHealthboxIDs
-	ldr r0, _080376D0 @ =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _080376D4 @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _0803770E
-	b _0803770C
-	.align 2, 0
-_080376C4: .4byte gBattleTypeFlags
-_080376C8: .4byte gSprites
-_080376CC: .4byte gHealthboxIDs
-_080376D0: .4byte gActiveBank
-_080376D4: .4byte SpriteCallbackDummy
-_080376D8:
-	ldr r2, _080377D8 @ =gSprites
-	ldr r5, _080377DC @ =gHealthboxIDs
-	ldr r0, _080377E0 @ =gActiveBank
-	ldrb r3, [r0]
-	adds r0, r3, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r4, [r0]
-	ldr r0, _080377E4 @ =SpriteCallbackDummy
-	cmp r4, r0
-	bne _0803770E
-	movs r0, 0x2
-	eors r3, r0
-	adds r0, r3, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldr r0, [r0]
-	cmp r0, r4
-	bne _0803770E
-_0803770C:
-	movs r6, 0x1
-_0803770E:
-	bl IsCryPlayingOrClearCrySongs
-	lsls r0, 24
-	cmp r0, 0
-	beq _0803771A
-	movs r6, 0
-_0803771A:
-	cmp r6, 0
-	bne _08037720
-	b _08037822
-_08037720:
-	ldr r7, _080377E0 @ =gActiveBank
-	ldrb r0, [r7]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x1
-	bne _080377B4
-	ldrb r2, [r7]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	ldr r5, _080377E8 @ =0x02017810
-	adds r4, r0, r5
-	ldrb r1, [r4, 0x1]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08037822
-	movs r6, 0x2
-	adds r1, r6, 0
-	eors r1, r2
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0, 0x1]
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08037822
-	ldrb r1, [r4]
-	movs r3, 0x7F
-	adds r0, r3, 0
-	ands r0, r1
-	strb r0, [r4]
-	ldrb r0, [r7]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	ldrb r2, [r1, 0x1]
-	movs r4, 0x2
-	negs r4, r4
-	adds r0, r4, 0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldrb r0, [r7]
-	adds r1, r6, 0
-	eors r1, r0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0]
-	ands r3, r1
-	strb r3, [r0]
-	ldrb r0, [r7]
-	adds r1, r6, 0
-	eors r1, r0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0, 0x1]
-	ands r4, r1
-	strb r4, [r0, 0x1]
-	ldr r4, _080377EC @ =0x000027f9
-	adds r0, r4, 0
-	bl FreeSpriteTilesByTag
-	adds r0, r4, 0
-	bl FreeSpritePaletteByTag
-_080377B4:
-	ldr r0, _080377F0 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _080377F8
-	ldrb r0, [r7]
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08037804
-	ldr r0, _080377F4 @ =gMPlay_BGM
-	bl m4aMPlayContinue
-	b _08037804
-	.align 2, 0
-_080377D8: .4byte gSprites
-_080377DC: .4byte gHealthboxIDs
-_080377E0: .4byte gActiveBank
-_080377E4: .4byte SpriteCallbackDummy
-_080377E8: .4byte 0x02017810
-_080377EC: .4byte 0x000027f9
-_080377F0: .4byte gBattleTypeFlags
-_080377F4: .4byte gMPlay_BGM
-_080377F8:
-	ldr r0, _08037828 @ =gMPlay_BGM
-	ldr r1, _0803782C @ =0x0000ffff
-	movs r2, 0x80
-	lsls r2, 1
-	bl m4aMPlayVolumeControl
-_08037804:
-	ldr r2, _08037830 @ =gActiveBank
-	ldrb r1, [r2]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037834 @ =0x02017810
-	adds r0, r1
-	movs r1, 0x3
-	strb r1, [r0, 0x9]
-	ldr r1, _08037838 @ =gBattleBankFunc
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0803783C @ =sub_8037644
-	str r1, [r0]
-_08037822:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037828: .4byte gMPlay_BGM
-_0803782C: .4byte 0x0000ffff
-_08037830: .4byte gActiveBank
-_08037834: .4byte 0x02017810
-_08037838: .4byte gBattleBankFunc
-_0803783C: .4byte sub_8037644
-	thumb_func_end sub_8037680
-
-	thumb_func_start sub_8037840
-sub_8037840: @ 8037840
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r6, _08037A48 @ =gActiveBank
-	ldrb r2, [r6]
-	lsls r3, r2, 1
-	adds r0, r3, r2
-	lsls r0, 2
-	ldr r5, _08037A4C @ =0x02017810
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r4, 0x88
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _08037878
-	ldr r0, _08037A50 @ =gBattlePartyID
-	adds r0, r3, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _08037A54 @ =gEnemyParty
-	adds r1, r0
-	adds r0, r2, 0
-	bl sub_8141828
-_08037878:
-	ldrb r0, [r6]
-	movs r7, 0x2
-	adds r2, r7, 0
-	eors r2, r0
-	lsls r3, r2, 1
-	adds r0, r3, r2
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0]
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080378A6
-	ldr r0, _08037A50 @ =gBattlePartyID
-	adds r0, r3, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _08037A54 @ =gEnemyParty
-	adds r1, r0
-	adds r0, r2, 0
-	bl sub_8141828
-_080378A6:
-	ldrb r2, [r6]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r3, 0x8
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080378BE
-	b _08037A3A
-_080378BE:
-	adds r1, r2, 0
-	eors r1, r7
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r0]
-	adds r0, r3, 0
-	ands r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _080378DA
-	b _08037A3A
-_080378DA:
-	ldr r0, _08037A58 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0803791A
-	adds r0, r2, 0
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _0803791A
-	ldrb r0, [r6]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	ldrb r0, [r1, 0x9]
-	adds r0, 0x1
-	strb r0, [r1, 0x9]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0803790E
-	b _08037A3A
-_0803790E:
-	ldrb r1, [r6]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strb r4, [r0, 0x9]
-_0803791A:
-	bl IsDoubleBattle
-	lsls r0, 24
-	cmp r0, 0
-	beq _080379B2
-	ldr r0, _08037A58 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _080379B2
-	ldr r1, _08037A5C @ =gUnknown_0300434C
-	ldr r5, _08037A48 @ =gActiveBank
-	ldrb r0, [r5]
-	movs r4, 0x2
-	eors r0, r4
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037A60 @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	ldr r0, _08037A64 @ =gHealthboxIDs
-	mov r8, r0
-	ldrb r0, [r5]
-	adds r1, r4, 0
-	eors r1, r0
-	mov r2, r8
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	ldr r2, _08037A50 @ =gBattlePartyID
-	mov r10, r2
-	lsls r1, 1
-	add r1, r10
-	ldrh r1, [r1]
-	movs r2, 0x64
-	mov r9, r2
-	mov r2, r9
-	muls r2, r1
-	adds r1, r2, 0
-	ldr r6, _08037A54 @ =gEnemyParty
-	adds r1, r6
-	movs r2, 0
-	bl sub_8045A5C
-	ldrb r0, [r5]
-	eors r0, r4
-	bl sub_804777C
-	ldrb r0, [r5]
-	eors r0, r4
-	add r0, r8
-	ldrb r0, [r0]
-	bl sub_8043DFC
-	ldrb r0, [r5]
-	eors r4, r0
-	lsls r0, r4, 1
-	add r0, r10
-	ldrh r0, [r0]
-	mov r1, r9
-	muls r1, r0
-	adds r0, r1, 0
-	adds r0, r6
-	movs r1, 0xB
-	bl GetMonData
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl sub_8032984
-_080379B2:
-	ldr r1, _08037A5C @ =gUnknown_0300434C
-	ldr r4, _08037A48 @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037A60 @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	ldr r5, _08037A64 @ =gHealthboxIDs
-	ldrb r1, [r4]
-	adds r0, r1, r5
-	ldrb r0, [r0]
-	ldr r2, _08037A50 @ =gBattlePartyID
-	mov r9, r2
-	lsls r1, 1
-	add r1, r9
-	ldrh r1, [r1]
-	movs r2, 0x64
-	mov r8, r2
-	mov r2, r8
-	muls r2, r1
-	adds r1, r2, 0
-	ldr r6, _08037A54 @ =gEnemyParty
-	adds r1, r6
-	movs r2, 0
-	bl sub_8045A5C
-	ldrb r0, [r4]
-	bl sub_804777C
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl sub_8043DFC
-	ldrb r5, [r4]
-	lsls r0, r5, 1
-	add r0, r9
-	ldrh r0, [r0]
-	mov r1, r8
-	muls r1, r0
-	adds r0, r1, 0
-	adds r0, r6
-	movs r1, 0xB
-	bl GetMonData
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r5, 0
-	bl sub_8032984
-	ldr r2, _08037A68 @ =0x02017840
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2, 0x9]
-	ldr r1, _08037A6C @ =gBattleBankFunc
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08037A70 @ =sub_8037680
-	str r1, [r0]
-_08037A3A:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037A48: .4byte gActiveBank
-_08037A4C: .4byte 0x02017810
-_08037A50: .4byte gBattlePartyID
-_08037A54: .4byte gEnemyParty
-_08037A58: .4byte gBattleTypeFlags
-_08037A5C: .4byte gUnknown_0300434C
-_08037A60: .4byte gSprites
-_08037A64: .4byte gHealthboxIDs
-_08037A68: .4byte 0x02017840
-_08037A6C: .4byte gBattleBankFunc
-_08037A70: .4byte sub_8037680
-	thumb_func_end sub_8037840
-
-	thumb_func_start sub_8037A74
-sub_8037A74: @ 8037A74
-	push {r4-r7,lr}
-	ldr r2, _08037ACC @ =gSprites
-	ldr r0, _08037AD0 @ =gObjectBankIDs
-	ldr r7, _08037AD4 @ =gActiveBank
-	ldrb r3, [r7]
-	adds r0, r3, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	adds r0, r1, 0
-	adds r0, 0x3F
-	ldrb r0, [r0]
-	lsls r0, 27
-	lsrs r2, r0, 31
-	cmp r2, 0x1
-	bne _08037B18
-	movs r4, 0x24
-	ldrsh r0, [r1, r4]
-	cmp r0, 0
-	bne _08037B18
-	lsls r4, r3, 1
-	adds r0, r4, r3
-	lsls r0, 2
-	ldr r6, _08037AD8 @ =0x02017810
-	adds r1, r0, r6
-	ldrb r5, [r1]
-	movs r0, 0x80
-	ands r0, r5
-	cmp r0, 0
-	bne _08037AE4
-	ldr r0, _08037ADC @ =gBattlePartyID
-	adds r0, r4, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _08037AE0 @ =gEnemyParty
-	adds r1, r0
-	adds r0, r3, 0
-	bl sub_8141828
-	b _08037B18
-	.align 2, 0
-_08037ACC: .4byte gSprites
-_08037AD0: .4byte gObjectBankIDs
-_08037AD4: .4byte gActiveBank
-_08037AD8: .4byte 0x02017810
-_08037ADC: .4byte gBattlePartyID
-_08037AE0: .4byte gEnemyParty
-_08037AE4:
-	ldrb r0, [r1, 0x1]
-	ands r2, r0
-	cmp r2, 0
-	beq _08037B18
-	movs r0, 0x7F
-	ands r0, r5
-	strb r0, [r1]
-	ldrb r0, [r7]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r6
-	ldrb r2, [r1, 0x1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r4, _08037B20 @ =0x000027f9
-	adds r0, r4, 0
-	bl FreeSpriteTilesByTag
-	adds r0, r4, 0
-	bl FreeSpritePaletteByTag
-	bl LinkOpponentBufferExecCompleted
-_08037B18:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037B20: .4byte 0x000027f9
-	thumb_func_end sub_8037A74
-
-	thumb_func_start sub_8037B24
-sub_8037B24: @ 8037B24
-	push {r4-r6,lr}
-	ldr r6, _08037B64 @ =gActiveBank
-	ldrb r0, [r6]
-	ldr r5, _08037B68 @ =gHealthboxIDs
-	adds r1, r0, r5
-	ldrb r1, [r1]
-	movs r2, 0
-	movs r3, 0
-	bl sub_8045C78
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl sub_8043DFC
-	lsls r4, 16
-	asrs r1, r4, 16
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	beq _08037B6C
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r0, [r0]
-	movs r2, 0
-	bl sub_80440EC
-	b _08037B70
-	.align 2, 0
-_08037B64: .4byte gActiveBank
-_08037B68: .4byte gHealthboxIDs
-_08037B6C:
-	bl LinkOpponentBufferExecCompleted
-_08037B70:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8037B24
-
-	thumb_func_start sub_8037B78
-sub_8037B78: @ 8037B78
-	push {lr}
-	ldr r2, _08037BAC @ =gSprites
-	ldr r0, _08037BB0 @ =gObjectBankIDs
-	ldr r1, _08037BB4 @ =gActiveBank
-	ldrb r3, [r1]
-	adds r0, r3, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r0, [r0]
-	lsls r0, 31
-	cmp r0, 0
-	bne _08037BA6
-	ldr r0, _08037BB8 @ =gHealthboxIDs
-	adds r0, r3, r0
-	ldrb r0, [r0]
-	bl sub_8043DB0
-	bl LinkOpponentBufferExecCompleted
-_08037BA6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037BAC: .4byte gSprites
-_08037BB0: .4byte gObjectBankIDs
-_08037BB4: .4byte gActiveBank
-_08037BB8: .4byte gHealthboxIDs
-	thumb_func_end sub_8037B78
-
-	thumb_func_start sub_8037BBC
-sub_8037BBC: @ 8037BBC
-	push {r4-r6,lr}
-	ldr r6, _08037C18 @ =gActiveBank
-	ldrb r2, [r6]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	ldr r1, _08037C1C @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _08037C12
-	ldr r5, _08037C20 @ =gObjectBankIDs
-	adds r0, r2, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _08037C24 @ =gSprites
-	adds r0, r4
-	bl FreeSpriteOamMatrix
-	ldrb r0, [r6]
-	adds r0, r5
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	ldrb r0, [r6]
-	bl sub_8032A08
-	ldr r1, _08037C28 @ =gHealthboxIDs
-	ldrb r0, [r6]
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_8043DB0
-	bl LinkOpponentBufferExecCompleted
-_08037C12:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037C18: .4byte gActiveBank
-_08037C1C: .4byte 0x02017810
-_08037C20: .4byte gObjectBankIDs
-_08037C24: .4byte gSprites
-_08037C28: .4byte gHealthboxIDs
-	thumb_func_end sub_8037BBC
-
-	thumb_func_start sub_8037C2C
-sub_8037C2C: @ 8037C2C
-	push {lr}
-	ldr r0, _08037C40 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	bne _08037C3A
-	bl LinkOpponentBufferExecCompleted
-_08037C3A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037C40: .4byte gUnknown_03004210
-	thumb_func_end sub_8037C2C
-
-	thumb_func_start dp01t_0F_4_move_anim
-dp01t_0F_4_move_anim: @ 8037C44
-	push {r4,lr}
-	ldr r1, _08037C80 @ =gObjectBankIDs
-	ldr r0, _08037C84 @ =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	ldr r2, _08037C88 @ =gSprites
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r4, r0, r2
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x20
-	bne _08037C90
-	movs r3, 0
-	movs r0, 0
-	strh r0, [r4, 0x30]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	subs r0, 0x5
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, _08037C8C @ =gDoingBattleAnim
-	strb r3, [r0]
-	bl LinkOpponentBufferExecCompleted
-	b _08037CBA
-	.align 2, 0
-_08037C80: .4byte gObjectBankIDs
-_08037C84: .4byte gActiveBank
-_08037C88: .4byte gSprites
-_08037C8C: .4byte gDoingBattleAnim
-_08037C90:
-	ldrh r0, [r4, 0x30]
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08037CB4
-	adds r3, r4, 0
-	adds r3, 0x3E
-	ldrb r2, [r3]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-_08037CB4:
-	ldrh r0, [r4, 0x30]
-	adds r0, 0x1
-	strh r0, [r4, 0x30]
-_08037CBA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end dp01t_0F_4_move_anim
-
-	thumb_func_start sub_8037CC0
-sub_8037CC0: @ 8037CC0
-	push {r4,lr}
-	ldr r2, _08037D10 @ =gSprites
-	ldr r0, _08037D14 @ =gHealthboxIDs
-	ldr r4, _08037D18 @ =gActiveBank
-	ldrb r3, [r4]
-	adds r0, r3, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _08037D1C @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _08037D08
-	lsls r0, r3, 2
-	ldr r1, _08037D20 @ =0x02017800
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _08037CFC
-	adds r0, r3, 0
-	adds r1, r3, 0
-	adds r2, r3, 0
-	movs r3, 0x6
-	bl move_anim_start_t4
-_08037CFC:
-	ldr r0, _08037D24 @ =gBattleBankFunc
-	ldrb r1, [r4]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, _08037D28 @ =sub_8037D2C
-	str r0, [r1]
-_08037D08:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037D10: .4byte gSprites
-_08037D14: .4byte gHealthboxIDs
-_08037D18: .4byte gActiveBank
-_08037D1C: .4byte SpriteCallbackDummy
-_08037D20: .4byte 0x02017800
-_08037D24: .4byte gBattleBankFunc
-_08037D28: .4byte sub_8037D2C
-	thumb_func_end sub_8037CC0
-
-	thumb_func_start sub_8037D2C
-sub_8037D2C: @ 8037D2C
-	push {lr}
-	ldr r0, _08037D58 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037D5C @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _08037D52
-	ldr r0, _08037D60 @ =c3_0802FDF4
-	movs r1, 0xA
-	bl CreateTask
-	bl LinkOpponentBufferExecCompleted
-_08037D52:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037D58: .4byte gActiveBank
-_08037D5C: .4byte 0x02017810
-_08037D60: .4byte c3_0802FDF4
-	thumb_func_end sub_8037D2C
-
-	thumb_func_start sub_8037D64
-sub_8037D64: @ 8037D64
-	push {r4,r5,lr}
-	ldr r5, _08037E08 @ =gActiveBank
-	ldrb r1, [r5]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r3, _08037E0C @ =0x02017810
-	adds r2, r0, r3
-	ldrb r1, [r2, 0x1]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08037E00
-	ldrb r1, [r2]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r0, [r5]
-	lsls r1, r0, 1
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r2, [r1, 0x1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	ldr r4, _08037E10 @ =0x000027f9
-	adds r0, r4, 0
-	bl FreeSpriteTilesByTag
-	adds r0, r4, 0
-	bl FreeSpritePaletteByTag
-	ldr r1, _08037E14 @ =gObjectBankIDs
-	ldrb r0, [r5]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037E18 @ =gSprites
-	adds r0, r1
-	movs r1, 0
-	bl StartSpriteAnim
-	ldr r4, _08037E1C @ =gHealthboxIDs
-	ldrb r1, [r5]
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	ldr r2, _08037E20 @ =gBattlePartyID
-	lsls r1, 1
-	adds r1, r2
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _08037E24 @ =gEnemyParty
-	adds r1, r2
-	movs r2, 0
-	bl sub_8045A5C
-	ldrb r0, [r5]
-	bl sub_804777C
-	ldrb r0, [r5]
-	adds r0, r4
-	ldrb r0, [r0]
-	bl sub_8043DFC
-	ldrb r0, [r5]
-	bl sub_8031F88
-	ldr r1, _08037E28 @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08037E2C @ =sub_8037CC0
-	str r1, [r0]
-_08037E00:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037E08: .4byte gActiveBank
-_08037E0C: .4byte 0x02017810
-_08037E10: .4byte 0x000027f9
-_08037E14: .4byte gObjectBankIDs
-_08037E18: .4byte gSprites
-_08037E1C: .4byte gHealthboxIDs
-_08037E20: .4byte gBattlePartyID
-_08037E24: .4byte gEnemyParty
-_08037E28: .4byte gBattleBankFunc
-_08037E2C: .4byte sub_8037CC0
-	thumb_func_end sub_8037D64
-
-	thumb_func_start sub_8037E30
-sub_8037E30: @ 8037E30
-	push {r4-r6,lr}
-	ldr r5, _08037ECC @ =gActiveBank
-	ldrb r2, [r5]
-	lsls r3, r2, 1
-	adds r0, r3, r2
-	lsls r0, 2
-	ldr r6, _08037ED0 @ =0x02017810
-	adds r0, r6
-	ldrb r1, [r0]
-	movs r0, 0x88
-	ands r0, r1
-	cmp r0, 0
-	bne _08037E5E
-	ldr r0, _08037ED4 @ =gBattlePartyID
-	adds r0, r3, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _08037ED8 @ =gEnemyParty
-	adds r1, r0
-	adds r0, r2, 0
-	bl sub_8141828
-_08037E5E:
-	ldr r4, _08037EDC @ =gSprites
-	ldr r0, _08037EE0 @ =gUnknown_0300434C
-	ldrb r2, [r5]
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r3, r0, 2
-	adds r0, r4, 0
-	adds r0, 0x1C
-	adds r0, r3, r0
-	ldr r1, [r0]
-	ldr r0, _08037EE4 @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _08037EC4
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r6
-	ldrb r1, [r0]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	bne _08037EC4
-	adds r0, r3, r4
-	bl DestroySprite
-	ldrb r4, [r5]
-	ldr r1, _08037ED4 @ =gBattlePartyID
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08037ED8 @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl sub_8032984
-	ldr r1, _08037EE8 @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08037EEC @ =sub_8037D64
-	str r1, [r0]
-_08037EC4:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037ECC: .4byte gActiveBank
-_08037ED0: .4byte 0x02017810
-_08037ED4: .4byte gBattlePartyID
-_08037ED8: .4byte gEnemyParty
-_08037EDC: .4byte gSprites
-_08037EE0: .4byte gUnknown_0300434C
-_08037EE4: .4byte SpriteCallbackDummy
-_08037EE8: .4byte gBattleBankFunc
-_08037EEC: .4byte sub_8037D64
-	thumb_func_end sub_8037E30
-
-	thumb_func_start sub_8037EF0
-sub_8037EF0: @ 8037EF0
-	push {lr}
-	ldr r0, _08037F20 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08037F1C
-	movs r0, 0x5A
-	bl m4aSongNumStop
-	ldr r3, _08037F24 @ =gMain
-	ldr r0, _08037F28 @ =0x0000043d
-	adds r2, r3, r0
-	ldrb r1, [r2]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	ldr r0, _08037F2C @ =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r3]
-	ldr r0, _08037F30 @ =c2_8011A1C
-	bl SetMainCallback2
-_08037F1C:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037F20: .4byte gReceivedRemoteLinkPlayers
-_08037F24: .4byte gMain
-_08037F28: .4byte 0x0000043d
-_08037F2C: .4byte gPreBattleCallback1
-_08037F30: .4byte c2_8011A1C
-	thumb_func_end sub_8037EF0
-
-	thumb_func_start sub_8037F34
-sub_8037F34: @ 8037F34
-	push {lr}
-	ldr r0, _08037F64 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08037F9A
-	ldr r0, _08037F68 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08037F78
-	bl sub_800832C
-	ldr r1, _08037F6C @ =gBattleBankFunc
-	ldr r0, _08037F70 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _08037F74 @ =sub_8037EF0
-	str r1, [r0]
-	b _08037F9A
-	.align 2, 0
-_08037F64: .4byte gPaletteFade
-_08037F68: .4byte gBattleTypeFlags
-_08037F6C: .4byte gBattleBankFunc
-_08037F70: .4byte gActiveBank
-_08037F74: .4byte sub_8037EF0
-_08037F78:
-	movs r0, 0x5A
-	bl m4aSongNumStop
-	ldr r2, _08037FA0 @ =gMain
-	ldr r0, _08037FA4 @ =0x0000043d
-	adds r3, r2, r0
-	ldrb r1, [r3]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	ldr r0, _08037FA8 @ =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r2]
-	ldr r0, [r2, 0x8]
-	bl SetMainCallback2
-_08037F9A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037FA0: .4byte gMain
-_08037FA4: .4byte 0x0000043d
-_08037FA8: .4byte gPreBattleCallback1
-	thumb_func_end sub_8037F34
-
-	thumb_func_start sub_8037FAC
-sub_8037FAC: @ 8037FAC
-	push {lr}
-	ldr r0, _08037FD0 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08037FD4 @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _08037FCA
-	bl LinkOpponentBufferExecCompleted
-_08037FCA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037FD0: .4byte gActiveBank
-_08037FD4: .4byte 0x02017810
-	thumb_func_end sub_8037FAC
-
-	thumb_func_start sub_8037FD8
-sub_8037FD8: @ 8037FD8
-	push {lr}
-	ldr r0, _08037FFC @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08038000 @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	bne _08037FF6
-	bl LinkOpponentBufferExecCompleted
-_08037FF6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08037FFC: .4byte gActiveBank
-_08038000: .4byte 0x02017810
-	thumb_func_end sub_8037FD8
-
-	thumb_func_start LinkOpponentBufferExecCompleted
-LinkOpponentBufferExecCompleted: @ 8038004
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r1, _08038044 @ =gBattleBankFunc
-	ldr r4, _08038048 @ =gActiveBank
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0803804C @ =sub_803752C
-	str r1, [r0]
-	ldr r0, _08038050 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08038058
-	bl GetMultiplayerId
-	mov r1, sp
-	strb r0, [r1]
-	movs r0, 0x2
-	movs r1, 0x4
-	mov r2, sp
-	bl PrepareBufferDataTransferLink
-	ldr r1, _08038054 @ =gBattleBufferA
-	ldrb r0, [r4]
-	lsls r0, 9
-	adds r0, r1
-	movs r1, 0x38
-	strb r1, [r0]
-	b _0803806A
-	.align 2, 0
-_08038044: .4byte gBattleBankFunc
-_08038048: .4byte gActiveBank
-_0803804C: .4byte sub_803752C
-_08038050: .4byte gBattleTypeFlags
-_08038054: .4byte gBattleBufferA
-_08038058:
-	ldr r2, _08038074 @ =gBattleExecBuffer
-	ldr r1, _08038078 @ =gBitTable
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	ldr r0, [r2]
-	bics r0, r1
-	str r0, [r2]
-_0803806A:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08038074: .4byte gBattleExecBuffer
-_08038078: .4byte gBitTable
-	thumb_func_end LinkOpponentBufferExecCompleted
-
-   	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
deleted file mode 100644
index e98d4ccd0..000000000
--- a/asm/battle_controller_safari.s
+++ /dev/null
@@ -1,1402 +0,0 @@
-    .include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start unref_sub_812B464
-unref_sub_812B464: @ 812B464
-	bx lr
-	thumb_func_end unref_sub_812B464
-
-	thumb_func_start SetBankFuncToSafariBufferRunCommand
-SetBankFuncToSafariBufferRunCommand: @ 812B468
-	ldr r1, _0812B478 @ =gBattleBankFunc
-	ldr r0, _0812B47C @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812B480 @ =SafariBufferRunCommand
-	str r1, [r0]
-	bx lr
-	.align 2, 0
-_0812B478: .4byte gBattleBankFunc
-_0812B47C: .4byte gActiveBank
-_0812B480: .4byte SafariBufferRunCommand
-	thumb_func_end SetBankFuncToSafariBufferRunCommand
-
-	thumb_func_start SafariBufferRunCommand
-SafariBufferRunCommand: @ 812B484
-	push {lr}
-	ldr r2, _0812B4B8 @ =gBattleExecBuffer
-	ldr r1, _0812B4BC @ =gBitTable
-	ldr r0, _0812B4C0 @ =gActiveBank
-	ldrb r3, [r0]
-	lsls r0, r3, 2
-	adds r0, r1
-	ldr r1, [r2]
-	ldr r0, [r0]
-	ands r1, r0
-	cmp r1, 0
-	beq _0812B4D0
-	ldr r0, _0812B4C4 @ =gBattleBufferA
-	lsls r1, r3, 9
-	adds r1, r0
-	ldrb r0, [r1]
-	cmp r0, 0x38
-	bhi _0812B4CC
-	ldr r0, _0812B4C8 @ =gSafariBufferCommands
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-	bl _call_via_r0
-	b _0812B4D0
-	.align 2, 0
-_0812B4B8: .4byte gBattleExecBuffer
-_0812B4BC: .4byte gBitTable
-_0812B4C0: .4byte gActiveBank
-_0812B4C4: .4byte gBattleBufferA
-_0812B4C8: .4byte gSafariBufferCommands
-_0812B4CC:
-	bl SafariBufferExecCompleted
-_0812B4D0:
-	pop {r0}
-	bx r0
-	thumb_func_end SafariBufferRunCommand
-
-	thumb_func_start bx_battle_menu_t6_2
-bx_battle_menu_t6_2: @ 812B4D4
-	push {r4,r5,lr}
-	ldr r0, _0812B508 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r2, 0x1
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B546
-	movs r0, 0x5
-	bl PlaySE
-	bl DestroyMenuCursor
-	ldr r1, _0812B50C @ =gActionSelectionCursor
-	ldr r0, _0812B510 @ =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0812B524
-	cmp r0, 0x1
-	bgt _0812B514
-	cmp r0, 0
-	beq _0812B51E
-	b _0812B540
-	.align 2, 0
-_0812B508: .4byte gMain
-_0812B50C: .4byte gActionSelectionCursor
-_0812B510: .4byte gActiveBank
-_0812B514:
-	cmp r0, 0x2
-	beq _0812B52A
-	cmp r0, 0x3
-	beq _0812B536
-	b _0812B540
-_0812B51E:
-	movs r0, 0x1
-	movs r1, 0x5
-	b _0812B52E
-_0812B524:
-	movs r0, 0x1
-	movs r1, 0x6
-	b _0812B52E
-_0812B52A:
-	movs r0, 0x1
-	movs r1, 0x7
-_0812B52E:
-	movs r2, 0
-	bl Emitcmd33
-	b _0812B540
-_0812B536:
-	movs r0, 0x1
-	movs r1, 0x8
-	movs r2, 0
-	bl Emitcmd33
-_0812B540:
-	bl SafariBufferExecCompleted
-	b _0812B64E
-_0812B546:
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B584
-	ldr r5, _0812B57C @ =gActionSelectionCursor
-	ldr r4, _0812B580 @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r1, [r0]
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B64E
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl nullsub_8
-	ldrb r1, [r4]
-	adds r1, r5
-	ldrb r0, [r1]
-	movs r2, 0x1
-	b _0812B5F2
-	.align 2, 0
-_0812B57C: .4byte gActionSelectionCursor
-_0812B580: .4byte gActiveBank
-_0812B584:
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B5C0
-	ldr r5, _0812B5B8 @ =gActionSelectionCursor
-	ldr r4, _0812B5BC @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r1, [r0]
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B64E
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl nullsub_8
-	ldrb r1, [r4]
-	adds r1, r5
-	ldrb r0, [r1]
-	movs r2, 0x1
-	b _0812B5F2
-	.align 2, 0
-_0812B5B8: .4byte gActionSelectionCursor
-_0812B5BC: .4byte gActiveBank
-_0812B5C0:
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B60C
-	ldr r5, _0812B604 @ =gActionSelectionCursor
-	ldr r4, _0812B608 @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B64E
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl nullsub_8
-	ldrb r1, [r4]
-	adds r1, r5
-	ldrb r0, [r1]
-	movs r2, 0x2
-_0812B5F2:
-	eors r0, r2
-	strb r0, [r1]
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	movs r1, 0
-	bl sub_802E3E4
-	b _0812B64E
-	.align 2, 0
-_0812B604: .4byte gActionSelectionCursor
-_0812B608: .4byte gActiveBank
-_0812B60C:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B64E
-	ldr r5, _0812B654 @ =gActionSelectionCursor
-	ldr r4, _0812B658 @ =gActiveBank
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B64E
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl nullsub_8
-	ldrb r1, [r4]
-	adds r1, r5
-	ldrb r0, [r1]
-	movs r2, 0x2
-	eors r0, r2
-	strb r0, [r1]
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	movs r1, 0
-	bl sub_802E3E4
-_0812B64E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B654: .4byte gActionSelectionCursor
-_0812B658: .4byte gActiveBank
-	thumb_func_end bx_battle_menu_t6_2
-
-	thumb_func_start sub_812B65C
-sub_812B65C: @ 812B65C
-	push {lr}
-	ldr r2, _0812B684 @ =gSprites
-	ldr r1, _0812B688 @ =gObjectBankIDs
-	ldr r0, _0812B68C @ =gActiveBank
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, [r0]
-	ldr r0, _0812B690 @ =SpriteCallbackDummy
-	cmp r1, r0
-	bne _0812B680
-	bl SafariBufferExecCompleted
-_0812B680:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B684: .4byte gSprites
-_0812B688: .4byte gObjectBankIDs
-_0812B68C: .4byte gActiveBank
-_0812B690: .4byte SpriteCallbackDummy
-	thumb_func_end sub_812B65C
-
-	thumb_func_start sub_812B694
-sub_812B694: @ 812B694
-	push {lr}
-	ldr r0, _0812B6A8 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	bne _0812B6A2
-	bl SafariBufferExecCompleted
-_0812B6A2:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B6A8: .4byte gUnknown_03004210
-	thumb_func_end sub_812B694
-
-	thumb_func_start sub_812B6AC
-sub_812B6AC: @ 812B6AC
-	push {lr}
-	ldr r0, _0812B6DC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B6D6
-	ldr r2, _0812B6E0 @ =gMain
-	ldr r0, _0812B6E4 @ =0x0000043d
-	adds r3, r2, r0
-	ldrb r1, [r3]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r3]
-	ldr r0, _0812B6E8 @ =gPreBattleCallback1
-	ldr r0, [r0]
-	str r0, [r2]
-	ldr r0, [r2, 0x8]
-	bl SetMainCallback2
-_0812B6D6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B6DC: .4byte gPaletteFade
-_0812B6E0: .4byte gMain
-_0812B6E4: .4byte 0x0000043d
-_0812B6E8: .4byte gPreBattleCallback1
-	thumb_func_end sub_812B6AC
-
-	thumb_func_start bx_wait_t6
-bx_wait_t6: @ 812B6EC
-	push {lr}
-	ldr r0, _0812B718 @ =gDoingBattleAnim
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0812B70E
-	ldr r0, _0812B71C @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0812B720 @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B712
-_0812B70E:
-	bl SafariBufferExecCompleted
-_0812B712:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B718: .4byte gDoingBattleAnim
-_0812B71C: .4byte gActiveBank
-_0812B720: .4byte 0x02017810
-	thumb_func_end bx_wait_t6
-
-	thumb_func_start sub_812B724
-sub_812B724: @ 812B724
-	push {lr}
-	ldr r0, _0812B748 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B744
-	ldr r1, _0812B74C @ =gBattleBankFunc
-	ldr r0, _0812B750 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812B754 @ =sub_812B758
-	str r1, [r0]
-	bl sub_810BADC
-_0812B744:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B748: .4byte gPaletteFade
-_0812B74C: .4byte gBattleBankFunc
-_0812B750: .4byte gActiveBank
-_0812B754: .4byte sub_812B758
-	thumb_func_end sub_812B724
-
-	thumb_func_start sub_812B758
-sub_812B758: @ 812B758
-	push {lr}
-	ldr r0, _0812B784 @ =gMain
-	ldr r1, [r0, 0x4]
-	ldr r0, _0812B788 @ =sub_800F808
-	cmp r1, r0
-	bne _0812B77E
-	ldr r0, _0812B78C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B77E
-	ldr r0, _0812B790 @ =gScriptItemId
-	ldrh r1, [r0]
-	movs r0, 0x1
-	bl Emitcmd35
-	bl SafariBufferExecCompleted
-_0812B77E:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B784: .4byte gMain
-_0812B788: .4byte sub_800F808
-_0812B78C: .4byte gPaletteFade
-_0812B790: .4byte gScriptItemId
-	thumb_func_end sub_812B758
-
-	thumb_func_start sub_812B794
-sub_812B794: @ 812B794
-	push {lr}
-	ldr r0, _0812B7B8 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0812B7BC @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B7B2
-	bl SafariBufferExecCompleted
-_0812B7B2:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B7B8: .4byte gActiveBank
-_0812B7BC: .4byte 0x02017810
-	thumb_func_end sub_812B794
-
-	thumb_func_start SafariBufferExecCompleted
-SafariBufferExecCompleted: @ 812B7C0
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r1, _0812B800 @ =gBattleBankFunc
-	ldr r4, _0812B804 @ =gActiveBank
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812B808 @ =SafariBufferRunCommand
-	str r1, [r0]
-	ldr r0, _0812B80C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0812B814
-	bl GetMultiplayerId
-	mov r1, sp
-	strb r0, [r1]
-	movs r0, 0x2
-	movs r1, 0x4
-	mov r2, sp
-	bl PrepareBufferDataTransferLink
-	ldr r1, _0812B810 @ =gBattleBufferA
-	ldrb r0, [r4]
-	lsls r0, 9
-	adds r0, r1
-	movs r1, 0x38
-	strb r1, [r0]
-	b _0812B826
-	.align 2, 0
-_0812B800: .4byte gBattleBankFunc
-_0812B804: .4byte gActiveBank
-_0812B808: .4byte SafariBufferRunCommand
-_0812B80C: .4byte gBattleTypeFlags
-_0812B810: .4byte gBattleBufferA
-_0812B814:
-	ldr r2, _0812B830 @ =gBattleExecBuffer
-	ldr r1, _0812B834 @ =gBitTable
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	ldr r0, [r2]
-	bics r0, r1
-	str r0, [r2]
-_0812B826:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B830: .4byte gBattleExecBuffer
-_0812B834: .4byte gBitTable
-	thumb_func_end SafariBufferExecCompleted
-
-	thumb_func_start unref_sub_812B838
-unref_sub_812B838: @ 812B838
-	push {lr}
-	ldr r0, _0812B85C @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0812B860 @ =0x02017810
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _0812B856
-	bl SafariBufferExecCompleted
-_0812B856:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B85C: .4byte gActiveBank
-_0812B860: .4byte 0x02017810
-	thumb_func_end unref_sub_812B838
-
-	thumb_func_start SafariHandleGetAttributes
-SafariHandleGetAttributes: @ 812B864
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleGetAttributes
-
-	thumb_func_start SafariHandlecmd1
-SafariHandlecmd1: @ 812B870
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd1
-
-	thumb_func_start SafariHandleSetAttributes
-SafariHandleSetAttributes: @ 812B87C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleSetAttributes
-
-	thumb_func_start SafariHandlecmd3
-SafariHandlecmd3: @ 812B888
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd3
-
-	thumb_func_start SafariHandleLoadPokeSprite
-SafariHandleLoadPokeSprite: @ 812B894
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleLoadPokeSprite
-
-	thumb_func_start SafariHandleSendOutPoke
-SafariHandleSendOutPoke: @ 812B8A0
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleSendOutPoke
-
-	thumb_func_start SafariHandleReturnPokeToBall
-SafariHandleReturnPokeToBall: @ 812B8AC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleReturnPokeToBall
-
-	thumb_func_start SafariHandleTrainerThrow
-SafariHandleTrainerThrow: @ 812B8B8
-	push {r4-r6,lr}
-	ldr r4, _0812B96C @ =gSaveBlock2
-	ldrb r0, [r4, 0x8]
-	ldr r5, _0812B970 @ =gActiveBank
-	ldrb r1, [r5]
-	bl LoadPlayerTrainerBankSprite
-	ldrb r6, [r4, 0x8]
-	ldrb r0, [r5]
-	bl GetBankIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r6, 0
-	bl GetMonSpriteTemplate_803C5A0
-	ldr r0, _0812B974 @ =gUnknown_02024E8C
-	ldr r2, _0812B978 @ =gTrainerBackPicCoords
-	ldrb r1, [r4, 0x8]
-	lsls r1, 2
-	adds r1, r2
-	ldrb r1, [r1]
-	movs r2, 0x8
-	subs r2, r1
-	lsls r2, 18
-	movs r1, 0xA0
-	lsls r1, 15
-	adds r2, r1
-	asrs r2, 16
-	movs r1, 0x50
-	movs r3, 0x1E
-	bl CreateSprite
-	ldr r6, _0812B97C @ =gObjectBankIDs
-	ldrb r1, [r5]
-	adds r1, r6
-	strb r0, [r1]
-	ldr r4, _0812B980 @ =gSprites
-	ldrb r3, [r5]
-	adds r0, r3, r6
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	lsls r3, 4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0xF0
-	strh r1, [r0, 0x24]
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldr r1, _0812B984 @ =0x0000fffe
-	strh r1, [r0, 0x2E]
-	ldrb r0, [r5]
-	adds r0, r6
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r4, 0x1C
-	adds r0, r4
-	ldr r1, _0812B988 @ =sub_80313A0
-	str r1, [r0]
-	ldr r1, _0812B98C @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812B990 @ =sub_812B65C
-	str r1, [r0]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812B96C: .4byte gSaveBlock2
-_0812B970: .4byte gActiveBank
-_0812B974: .4byte gUnknown_02024E8C
-_0812B978: .4byte gTrainerBackPicCoords
-_0812B97C: .4byte gObjectBankIDs
-_0812B980: .4byte gSprites
-_0812B984: .4byte 0x0000fffe
-_0812B988: .4byte sub_80313A0
-_0812B98C: .4byte gBattleBankFunc
-_0812B990: .4byte sub_812B65C
-	thumb_func_end SafariHandleTrainerThrow
-
-	thumb_func_start SafariHandleTrainerSlide
-SafariHandleTrainerSlide: @ 812B994
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleTrainerSlide
-
-	thumb_func_start SafariHandleTrainerSlideBack
-SafariHandleTrainerSlideBack: @ 812B9A0
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleTrainerSlideBack
-
-	thumb_func_start SafariHandlecmd10
-SafariHandlecmd10: @ 812B9AC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd10
-
-	thumb_func_start SafariHandlecmd11
-SafariHandlecmd11: @ 812B9B8
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd11
-
-	thumb_func_start SafariHandlecmd12
-SafariHandlecmd12: @ 812B9C4
-	push {r4,r5,lr}
-	ldr r1, _0812BA00 @ =0x02017840
-	movs r0, 0x4
-	strb r0, [r1, 0x8]
-	ldr r1, _0812BA04 @ =gDoingBattleAnim
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r5, _0812BA08 @ =gActiveBank
-	ldrb r4, [r5]
-	movs r0, 0x1
-	bl GetBankByPlayerAI
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r4, 0
-	movs r3, 0x4
-	bl move_anim_start_t4
-	ldr r1, _0812BA0C @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812BA10 @ =bx_wait_t6
-	str r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BA00: .4byte 0x02017840
-_0812BA04: .4byte gDoingBattleAnim
-_0812BA08: .4byte gActiveBank
-_0812BA0C: .4byte gBattleBankFunc
-_0812BA10: .4byte bx_wait_t6
-	thumb_func_end SafariHandlecmd12
-
-	thumb_func_start SafariHandleBallThrow
-SafariHandleBallThrow: @ 812BA14
-	push {r4,r5,lr}
-	ldr r1, _0812BA58 @ =gBattleBufferA
-	ldr r5, _0812BA5C @ =gActiveBank
-	ldrb r0, [r5]
-	lsls r0, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r1, [r0]
-	ldr r0, _0812BA60 @ =0x02017840
-	strb r1, [r0, 0x8]
-	ldr r1, _0812BA64 @ =gDoingBattleAnim
-	movs r0, 0x1
-	strb r0, [r1]
-	ldrb r4, [r5]
-	movs r0, 0x1
-	bl GetBankByPlayerAI
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r4, 0
-	movs r3, 0x4
-	bl move_anim_start_t4
-	ldr r1, _0812BA68 @ =gBattleBankFunc
-	ldrb r0, [r5]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812BA6C @ =bx_wait_t6
-	str r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BA58: .4byte gBattleBufferA
-_0812BA5C: .4byte gActiveBank
-_0812BA60: .4byte 0x02017840
-_0812BA64: .4byte gDoingBattleAnim
-_0812BA68: .4byte gBattleBankFunc
-_0812BA6C: .4byte bx_wait_t6
-	thumb_func_end SafariHandleBallThrow
-
-	thumb_func_start SafariHandlePuase
-SafariHandlePuase: @ 812BA70
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlePuase
-
-	thumb_func_start SafariHandleMoveAnimation
-SafariHandleMoveAnimation: @ 812BA7C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleMoveAnimation
-
-	thumb_func_start SafariHandlePrintString
-SafariHandlePrintString: @ 812BA88
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _0812BACC @ =gUnknown_030042A4
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _0812BAD0 @ =gUnknown_030042A0
-	strh r1, [r0]
-	ldr r4, _0812BAD4 @ =gActiveBank
-	ldrb r0, [r4]
-	lsls r0, 9
-	ldr r1, _0812BAD8 @ =gUnknown_02023A62
-	adds r0, r1
-	ldrh r0, [r0]
-	bl BufferStringBattle
-	ldr r0, _0812BADC @ =gUnknown_03004210
-	ldr r1, _0812BAE0 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _0812BAE4 @ =gBattleBankFunc
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812BAE8 @ =sub_812B694
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BACC: .4byte gUnknown_030042A4
-_0812BAD0: .4byte gUnknown_030042A0
-_0812BAD4: .4byte gActiveBank
-_0812BAD8: .4byte gUnknown_02023A62
-_0812BADC: .4byte gUnknown_03004210
-_0812BAE0: .4byte gDisplayedStringBattle
-_0812BAE4: .4byte gBattleBankFunc
-_0812BAE8: .4byte sub_812B694
-	thumb_func_end SafariHandlePrintString
-
-	thumb_func_start SafariHandlePrintStringPlayerOnly
-SafariHandlePrintStringPlayerOnly: @ 812BAEC
-	push {lr}
-	ldr r0, _0812BB04 @ =gActiveBank
-	ldrb r0, [r0]
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0812BB08
-	bl SafariHandlePrintString
-	b _0812BB0C
-	.align 2, 0
-_0812BB04: .4byte gActiveBank
-_0812BB08:
-	bl SafariBufferExecCompleted
-_0812BB0C:
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlePrintStringPlayerOnly
-
-.section .text_812BBFC
-
-	thumb_func_start SafariHandlecmd19
-SafariHandlecmd19: @ 812BBFC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd19
-
-	thumb_func_start SafariHandlecmd20
-SafariHandlecmd20: @ 812BC08
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd20
-
-	thumb_func_start SafariHandleOpenBag
-SafariHandleOpenBag: @ 812BC14
-	push {lr}
-	sub sp, 0x4
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0812BC44 @ =gBattleBankFunc
-	ldr r2, _0812BC48 @ =gActiveBank
-	ldrb r0, [r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, _0812BC4C @ =sub_812B724
-	str r1, [r0]
-	ldr r1, _0812BC50 @ =gBankInMenu
-	ldrb r0, [r2]
-	strb r0, [r1]
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BC44: .4byte gBattleBankFunc
-_0812BC48: .4byte gActiveBank
-_0812BC4C: .4byte sub_812B724
-_0812BC50: .4byte gBankInMenu
-	thumb_func_end SafariHandleOpenBag
-
-	thumb_func_start SafariHandlecmd22
-SafariHandlecmd22: @ 812BC54
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd22
-
-	thumb_func_start SafariHandlecmd23
-SafariHandlecmd23: @ 812BC60
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd23
-
-	thumb_func_start SafariHandleHealthBarUpdate
-SafariHandleHealthBarUpdate: @ 812BC6C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleHealthBarUpdate
-
-	thumb_func_start SafariHandleExpBarUpdate
-SafariHandleExpBarUpdate: @ 812BC78
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleExpBarUpdate
-
-	thumb_func_start SafariHandleStatusIconUpdate
-SafariHandleStatusIconUpdate: @ 812BC84
-	push {lr}
-	ldr r0, _0812BCB0 @ =gHealthboxIDs
-	ldr r1, _0812BCB4 @ =gActiveBank
-	ldrb r1, [r1]
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	ldr r2, _0812BCB8 @ =gBattlePartyID
-	lsls r1, 1
-	adds r1, r2
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0812BCBC @ =gPlayerParty
-	adds r1, r2
-	movs r2, 0xB
-	bl sub_8045A5C
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BCB0: .4byte gHealthboxIDs
-_0812BCB4: .4byte gActiveBank
-_0812BCB8: .4byte gBattlePartyID
-_0812BCBC: .4byte gPlayerParty
-	thumb_func_end SafariHandleStatusIconUpdate
-
-	thumb_func_start SafariHandleStatusAnimation
-SafariHandleStatusAnimation: @ 812BCC0
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleStatusAnimation
-
-	thumb_func_start SafariHandleStatusXor
-SafariHandleStatusXor: @ 812BCCC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleStatusXor
-
-	thumb_func_start SafariHandlecmd29
-SafariHandlecmd29: @ 812BCD8
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd29
-
-	thumb_func_start SafariHandleDMATransfer
-SafariHandleDMATransfer: @ 812BCE4
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleDMATransfer
-
-	thumb_func_start SafariHandlecmd31
-SafariHandlecmd31: @ 812BCF0
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd31
-
-	thumb_func_start SafariHandlecmd32
-SafariHandlecmd32: @ 812BCFC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd32
-
-	thumb_func_start SafariHandlecmd33
-SafariHandlecmd33: @ 812BD08
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd33
-
-	thumb_func_start SafariHandlecmd34
-SafariHandlecmd34: @ 812BD14
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd34
-
-	thumb_func_start SafariHandlecmd35
-SafariHandlecmd35: @ 812BD20
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd35
-
-	thumb_func_start SafariHandlecmd36
-SafariHandlecmd36: @ 812BD2C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd36
-
-	thumb_func_start SafariHandlecmd37
-SafariHandlecmd37: @ 812BD38
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd37
-
-	thumb_func_start SafariHandlecmd38
-SafariHandlecmd38: @ 812BD44
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd38
-
-	thumb_func_start SafariHandlecmd39
-SafariHandlecmd39: @ 812BD50
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd39
-
-	thumb_func_start SafariHandlecmd40
-SafariHandlecmd40: @ 812BD5C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd40
-
-	thumb_func_start SafariHandleHitAnimation
-SafariHandleHitAnimation: @ 812BD68
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleHitAnimation
-
-	thumb_func_start SafariHandlecmd42
-SafariHandlecmd42: @ 812BD74
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd42
-
-	thumb_func_start SafariHandleEffectivenessSound
-SafariHandleEffectivenessSound: @ 812BD80
-	push {r4,lr}
-	ldr r4, _0812BDBC @ =gActiveBank
-	ldrb r0, [r4]
-	bl GetBankSide
-	lsls r0, 24
-	movs r3, 0x3F
-	cmp r0, 0
-	bne _0812BD94
-	movs r3, 0xC0
-_0812BD94:
-	ldr r2, _0812BDC0 @ =gBattleBufferA
-	ldrb r1, [r4]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r1, 8
-	orrs r0, r1
-	lsls r1, r3, 24
-	asrs r1, 24
-	bl PlaySE12WithPanning
-	bl SafariBufferExecCompleted
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BDBC: .4byte gActiveBank
-_0812BDC0: .4byte gBattleBufferA
-	thumb_func_end SafariHandleEffectivenessSound
-
-	thumb_func_start SafariHandlecmd44
-SafariHandlecmd44: @ 812BDC4
-	push {lr}
-	ldr r2, _0812BDEC @ =gBattleBufferA
-	ldr r0, _0812BDF0 @ =gActiveBank
-	ldrb r1, [r0]
-	lsls r1, 9
-	adds r0, r2, 0x1
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	adds r2, 0x2
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r1, 8
-	orrs r0, r1
-	bl PlayFanfare
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BDEC: .4byte gBattleBufferA
-_0812BDF0: .4byte gActiveBank
-	thumb_func_end SafariHandlecmd44
-
-	thumb_func_start SafariHandleFaintingCry
-SafariHandleFaintingCry: @ 812BDF4
-	push {lr}
-	ldr r1, _0812BE24 @ =gBattlePartyID
-	ldr r0, _0812BE28 @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0812BE2C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x19
-	bl PlayCry1
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BE24: .4byte gBattlePartyID
-_0812BE28: .4byte gActiveBank
-_0812BE2C: .4byte gPlayerParty
-	thumb_func_end SafariHandleFaintingCry
-
-	thumb_func_start SafariHandleIntroSlide
-SafariHandleIntroSlide: @ 812BE30
-	push {lr}
-	ldr r1, _0812BE58 @ =gBattleBufferA
-	ldr r0, _0812BE5C @ =gActiveBank
-	ldrb r0, [r0]
-	lsls r0, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_80E43C0
-	ldr r2, _0812BE60 @ =gUnknown_02024DE8
-	ldrh r0, [r2]
-	movs r1, 0x1
-	orrs r0, r1
-	strh r0, [r2]
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BE58: .4byte gBattleBufferA
-_0812BE5C: .4byte gActiveBank
-_0812BE60: .4byte gUnknown_02024DE8
-	thumb_func_end SafariHandleIntroSlide
-
-	thumb_func_start SafariHandleTrainerBallThrow
-SafariHandleTrainerBallThrow: @ 812BE64
-	push {r4,r5,lr}
-	ldr r5, _0812BEA0 @ =gHealthboxIDs
-	ldr r4, _0812BEA4 @ =gActiveBank
-	ldrb r1, [r4]
-	adds r0, r1, r5
-	ldrb r0, [r0]
-	ldr r2, _0812BEA8 @ =gBattlePartyID
-	lsls r1, 1
-	adds r1, r2
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0812BEAC @ =gPlayerParty
-	adds r1, r2
-	movs r2, 0xA
-	bl sub_8045A5C
-	ldrb r0, [r4]
-	bl sub_804777C
-	ldrb r0, [r4]
-	adds r0, r5
-	ldrb r0, [r0]
-	bl sub_8043DFC
-	bl SafariBufferExecCompleted
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BEA0: .4byte gHealthboxIDs
-_0812BEA4: .4byte gActiveBank
-_0812BEA8: .4byte gBattlePartyID
-_0812BEAC: .4byte gPlayerParty
-	thumb_func_end SafariHandleTrainerBallThrow
-
-	thumb_func_start SafariHandlecmd48
-SafariHandlecmd48: @ 812BEB0
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd48
-
-	thumb_func_start SafariHandlecmd49
-SafariHandlecmd49: @ 812BEBC
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd49
-
-	thumb_func_start SafariHandlecmd50
-SafariHandlecmd50: @ 812BEC8
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandlecmd50
-
-	thumb_func_start SafariHandleSpriteInvisibility
-SafariHandleSpriteInvisibility: @ 812BED4
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleSpriteInvisibility
-
-	thumb_func_start SafariHandleBattleAnimation
-SafariHandleBattleAnimation: @ 812BEE0
-	push {r4-r6,lr}
-	sub sp, 0x4
-	ldr r5, _0812BF18 @ =gBattleBufferA
-	ldr r6, _0812BF1C @ =gActiveBank
-	ldrb r2, [r6]
-	lsls r1, r2, 9
-	adds r0, r5, 0x1
-	adds r0, r1, r0
-	ldrb r3, [r0]
-	adds r0, r5, 0x2
-	adds r0, r1, r0
-	ldrb r4, [r0]
-	adds r5, 0x3
-	adds r1, r5
-	ldrb r0, [r1]
-	lsls r0, 8
-	orrs r4, r0
-	str r4, [sp]
-	adds r0, r2, 0
-	adds r1, r2, 0
-	bl move_anim_start_t3
-	lsls r0, 24
-	cmp r0, 0
-	beq _0812BF20
-	bl SafariBufferExecCompleted
-	b _0812BF2C
-	.align 2, 0
-_0812BF18: .4byte gBattleBufferA
-_0812BF1C: .4byte gActiveBank
-_0812BF20:
-	ldr r0, _0812BF34 @ =gBattleBankFunc
-	ldrb r1, [r6]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, _0812BF38 @ =sub_812B794
-	str r0, [r1]
-_0812BF2C:
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BF34: .4byte gBattleBankFunc
-_0812BF38: .4byte sub_812B794
-	thumb_func_end SafariHandleBattleAnimation
-
-	thumb_func_start SafariHandleLinkStandbyMsg
-SafariHandleLinkStandbyMsg: @ 812BF3C
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleLinkStandbyMsg
-
-	thumb_func_start SafariHandleResetActionMoveSelection
-SafariHandleResetActionMoveSelection: @ 812BF48
-	push {lr}
-	bl SafariBufferExecCompleted
-	pop {r0}
-	bx r0
-	thumb_func_end SafariHandleResetActionMoveSelection
-
-	thumb_func_start SafariHandlecmd55
-SafariHandlecmd55: @ 812BF54
-	push {r4,lr}
-	ldr r2, _0812BF98 @ =gBattleOutcome
-	ldr r1, _0812BF9C @ =gBattleBufferA
-	ldr r4, _0812BFA0 @ =gActiveBank
-	ldrb r0, [r4]
-	lsls r0, 9
-	adds r1, 0x1
-	adds r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2]
-	movs r0, 0x5
-	bl FadeOutMapMusic
-	movs r0, 0x3
-	bl BeginFastPaletteFade
-	bl SafariBufferExecCompleted
-	ldr r0, _0812BFA4 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x6
-	ands r0, r1
-	cmp r0, 0x2
-	bne _0812BF90
-	ldr r0, _0812BFA8 @ =gBattleBankFunc
-	ldrb r1, [r4]
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, _0812BFAC @ =sub_812B6AC
-	str r0, [r1]
-_0812BF90:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BF98: .4byte gBattleOutcome
-_0812BF9C: .4byte gBattleBufferA
-_0812BFA0: .4byte gActiveBank
-_0812BFA4: .4byte gBattleTypeFlags
-_0812BFA8: .4byte gBattleBankFunc
-_0812BFAC: .4byte sub_812B6AC
-	thumb_func_end SafariHandlecmd55
-
-	thumb_func_start SafariHandlecmd56
-SafariHandlecmd56: @ 812BFB0
-	bx lr
-	thumb_func_end SafariHandlecmd56
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 3f019e1ea..65fbd0c05 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2163,10 +2163,10 @@ _081355D6:
 	bl CreateTask
 	movs r0, 0
 	bl current_map_music_set__default_for_battle
-	bl GetBattleTowerBattleTransition
+	bl BattleSetup_GetBattleTowerBattleTransition
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_811AABC
+	bl BattleTransition_StartOnField
 	b _08135648
 	.align 2, 0
 _081355F4: .4byte gPlayerParty
@@ -2200,10 +2200,10 @@ _08135606:
 	bl CreateTask
 	movs r0, 0
 	bl current_map_music_set__default_for_battle
-	bl GetBattleTowerBattleTransition
+	bl BattleSetup_GetBattleTowerBattleTransition
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_811AABC
+	bl BattleTransition_StartOnField
 _08135648:
 	add sp, 0x4
 	pop {r4,r5}
diff --git a/asm/cable_club.s b/asm/cable_club.s
deleted file mode 100644
index 68804ca21..000000000
--- a/asm/cable_club.s
+++ /dev/null
@@ -1,1671 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8082CD4
-sub_8082CD4: @ 8082CD4
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	ldr r4, _08082D10 @ =sub_8082F20
-	adds r0, r4, 0
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	bne _08082D08
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08082D14 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r6, [r1, 0xA]
-	strh r5, [r1, 0xC]
-_08082D08:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08082D10: .4byte sub_8082F20
-_08082D14: .4byte gTasks
-	thumb_func_end sub_8082CD4
-
-	thumb_func_start sub_8082D18
-sub_8082D18: @ 8082D18
-	push {lr}
-	adds r1, r0, 0
-	ldr r0, _08082D44 @ =gStringVar1
-	movs r2, 0
-	movs r3, 0x1
-	bl ConvertIntToDecimalStringN
-	movs r0, 0x12
-	movs r1, 0xA
-	movs r2, 0x1C
-	movs r3, 0xD
-	bl MenuDrawTextWindow
-	ldr r0, _08082D48 @ =gOtherText_PLink
-	movs r1, 0x13
-	movs r2, 0xB
-	movs r3, 0x48
-	bl sub_8072BD8
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08082D44: .4byte gStringVar1
-_08082D48: .4byte gOtherText_PLink
-	thumb_func_end sub_8082D18
-
-	thumb_func_start sub_8082D4C
-sub_8082D4C: @ 8082D4C
-	push {lr}
-	movs r0, 0x12
-	movs r1, 0xA
-	movs r2, 0x1C
-	movs r3, 0xD
-	bl MenuZeroFillWindowRect
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8082D4C
-
-	thumb_func_start sub_8082D60
-sub_8082D60: @ 8082D60
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08082D88 @ =gTasks + 0x8
-	adds r1, r0
-	adds r5, r1, 0x6
-	movs r2, 0x6
-	ldrsh r0, [r1, r2]
-	cmp r4, r0
-	beq _08082D94
-	cmp r4, 0x1
-	bhi _08082D8C
-	bl sub_8082D4C
-	b _08082D92
-	.align 2, 0
-_08082D88: .4byte gTasks + 0x8
-_08082D8C:
-	adds r0, r4, 0
-	bl sub_8082D18
-_08082D92:
-	strh r4, [r5]
-_08082D94:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8082D60
-
-	thumb_func_start sub_8082D9C
-sub_8082D9C: @ 8082D9C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl GetLinkPlayerDataExchangeStatusTimed
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	beq _08082DEC
-	cmp r0, 0x2
-	bgt _08082DBC
-	cmp r0, 0x1
-	beq _08082DC2
-	b _08082DEC
-_08082DBC:
-	cmp r0, 0x3
-	beq _08082DE8
-	b _08082DEC
-_08082DC2:
-	bl GetLinkPlayerCount_2
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r4, r1
-	bgt _08082DD6
-	cmp r1, r5
-	bgt _08082DD6
-	movs r0, 0x1
-	b _08082DEE
-_08082DD6:
-	ldr r0, _08082DE4 @ =gStringVar1
-	movs r2, 0
-	movs r3, 0x1
-	bl ConvertIntToDecimalStringN
-	movs r0, 0x4
-	b _08082DEE
-	.align 2, 0
-_08082DE4: .4byte gStringVar1
-_08082DE8:
-	movs r0, 0x3
-	b _08082DEE
-_08082DEC:
-	movs r0, 0
-_08082DEE:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8082D9C
-
-	thumb_func_start sub_8082DF4
-sub_8082DF4: @ 8082DF4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl HasLinkErrorOccurred
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08082E0A
-	movs r0, 0
-	b _08082E1A
-_08082E0A:
-	ldr r0, _08082E20 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _08082E24 @ =sub_8083418
-	str r0, [r1]
-	movs r0, 0x1
-_08082E1A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08082E20: .4byte gTasks
-_08082E24: .4byte sub_8083418
-	thumb_func_end sub_8082DF4
-
-	thumb_func_start sub_8082E28
-sub_8082E28: @ 8082E28
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08082E58 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08082E64
-	bl IsLinkConnectionEstablished
-	lsls r0, 24
-	cmp r0, 0
-	bne _08082E64
-	ldr r0, _08082E5C @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _08082E60 @ =sub_80833EC
-	str r0, [r1]
-	movs r0, 0x1
-	b _08082E66
-	.align 2, 0
-_08082E58: .4byte gMain
-_08082E5C: .4byte gTasks
-_08082E60: .4byte sub_80833EC
-_08082E64:
-	movs r0, 0
-_08082E66:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8082E28
-
-	thumb_func_start sub_8082E6C
-sub_8082E6C: @ 8082E6C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl IsLinkConnectionEstablished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08082E82
-	movs r0, 0x1
-	bl SetSuppressLinkErrorMessage
-_08082E82:
-	ldr r0, _08082E94 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08082E98
-	movs r0, 0
-	b _08082EA8
-	.align 2, 0
-_08082E94: .4byte gMain
-_08082E98:
-	ldr r0, _08082EB0 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _08082EB4 @ =sub_80833EC
-	str r0, [r1]
-	movs r0, 0x1
-_08082EA8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08082EB0: .4byte gTasks
-_08082EB4: .4byte sub_80833EC
-	thumb_func_end sub_8082E6C
-
-	thumb_func_start sub_8082EB8
-sub_8082EB8: @ 8082EB8
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl GetSioMultiSI
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08082ECE
-	movs r0, 0
-	b _08082EDE
-_08082ECE:
-	ldr r0, _08082EE4 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _08082EE8 @ =sub_8083418
-	str r0, [r1]
-	movs r0, 0x1
-_08082EDE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08082EE4: .4byte gTasks
-_08082EE8: .4byte sub_8083418
-	thumb_func_end sub_8082EB8
-
-	thumb_func_start unref_sub_8082EEC
-unref_sub_8082EEC: @ 8082EEC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08082F1C @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	bne _08082F16
-	movs r0, 0x2
-	bl sub_8007E9C
-	adds r0, r4, 0
-	bl DestroyTask
-_08082F16:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08082F1C: .4byte gTasks
-	thumb_func_end unref_sub_8082EEC
-
-	thumb_func_start sub_8082F20
-sub_8082F20: @ 8082F20
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08082F48 @ =gTasks + 0x8
-	adds r4, r1, r0
-	movs r3, 0
-	ldrsh r2, [r4, r3]
-	cmp r2, 0
-	bne _08082F4C
-	bl OpenLinkTimed
-	bl sub_80082EC
-	bl ResetLinkPlayers
-	b _08082F58
-	.align 2, 0
-_08082F48: .4byte gTasks + 0x8
-_08082F4C:
-	cmp r2, 0x9
-	ble _08082F58
-	subs r0, 0x8
-	adds r0, r1, r0
-	ldr r1, _08082F64 @ =sub_8082F68
-	str r1, [r0]
-_08082F58:
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08082F64: .4byte sub_8082F68
-	thumb_func_end sub_8082F20
-
-	thumb_func_start sub_8082F68
-sub_8082F68: @ 8082F68
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl GetLinkPlayerCount_2
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r4, 0
-	bl sub_8082E28
-	cmp r0, 0x1
-	beq _08082FDC
-	adds r0, r4, 0
-	bl sub_8082E6C
-	cmp r0, 0x1
-	beq _08082FDC
-	cmp r5, 0x1
-	bls _08082FDC
-	movs r0, 0x1
-	bl SetSuppressLinkErrorMessage
-	ldr r1, _08082FC0 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r0, 0
-	strh r0, [r4, 0xE]
-	bl IsLinkMaster
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08082FCC
-	movs r0, 0x15
-	bl PlaySE
-	ldr r0, _08082FC4 @ =gUnknown_081A4932
-	bl ShowFieldAutoScrollMessage
-	ldr r0, _08082FC8 @ =sub_8082FEC
-	b _08082FDA
-	.align 2, 0
-_08082FC0: .4byte gTasks
-_08082FC4: .4byte gUnknown_081A4932
-_08082FC8: .4byte sub_8082FEC
-_08082FCC:
-	movs r0, 0x16
-	bl PlaySE
-	ldr r0, _08082FE4 @ =gUnknown_081A49B6
-	bl ShowFieldAutoScrollMessage
-	ldr r0, _08082FE8 @ =sub_80831F8
-_08082FDA:
-	str r0, [r4]
-_08082FDC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08082FE4: .4byte gUnknown_081A49B6
-_08082FE8: .4byte sub_80831F8
-	thumb_func_end sub_8082F68
-
-	thumb_func_start sub_8082FEC
-sub_8082FEC: @ 8082FEC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl sub_8082E28
-	cmp r0, 0x1
-	beq _0808302C
-	adds r0, r4, 0
-	bl sub_8082EB8
-	cmp r0, 0x1
-	beq _0808302C
-	adds r0, r4, 0
-	bl sub_8082DF4
-	cmp r0, 0x1
-	beq _0808302C
-	bl GetFieldMessageBoxMode
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	bne _0808302C
-	ldr r0, _08083034 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	strh r2, [r1, 0xE]
-	ldr r0, _08083038 @ =sub_808303C
-	str r0, [r1]
-_0808302C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083034: .4byte gTasks
-_08083038: .4byte sub_808303C
-	thumb_func_end sub_8082FEC
-
-.section .text_80830E4
-
-
-
-
-
-
-
-
-
-	thumb_func_start sub_80833C4
-sub_80833C4: @ 80833C4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080833E8 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080833E0
-	bl sub_8082D4C
-	bl EnableBothScriptContexts
-	adds r0, r4, 0
-	bl DestroyTask
-_080833E0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080833E8: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_80833C4
-
-	thumb_func_start sub_80833EC
-sub_80833EC: @ 80833EC
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _08083414 @ =gScriptResult
-	movs r0, 0x5
-	strh r0, [r1]
-	bl sub_8082D4C
-	bl HideFieldMessageBox
-	bl EnableBothScriptContexts
-	adds r0, r4, 0
-	bl DestroyTask
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083414: .4byte gScriptResult
-	thumb_func_end sub_80833EC
-
-	thumb_func_start sub_8083418
-sub_8083418: @ 8083418
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _08083440 @ =gScriptResult
-	movs r0, 0x6
-	strh r0, [r1]
-	bl sub_8082D4C
-	bl HideFieldMessageBox
-	bl EnableBothScriptContexts
-	adds r0, r4, 0
-	bl DestroyTask
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083440: .4byte gScriptResult
-	thumb_func_end sub_8083418
-
-	thumb_func_start sub_8083444
-sub_8083444: @ 8083444
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08083468 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r2, r1, r2
-	ldrh r0, [r2, 0x10]
-	adds r0, 0x1
-	strh r0, [r2, 0x10]
-	lsls r0, 16
-	movs r1, 0x96
-	lsls r1, 18
-	cmp r0, r1
-	bgt _0808346C
-	movs r0, 0
-	b _08083472
-	.align 2, 0
-_08083468: .4byte gTasks
-_0808346C:
-	ldr r0, _08083478 @ =sub_8083418
-	str r0, [r2]
-	movs r0, 0x1
-_08083472:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08083478: .4byte sub_8083418
-	thumb_func_end sub_8083444
-
-	thumb_func_start sub_808347C
-sub_808347C: @ 808347C
-	push {r4,lr}
-	movs r3, 0x2
-	movs r2, 0x2
-	ldr r0, _08083494 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0x2
-	beq _080834B0
-	cmp r0, 0x2
-	bgt _08083498
-	cmp r0, 0x1
-	beq _0808349E
-	b _080834CC
-	.align 2, 0
-_08083494: .4byte gSpecialVar_0x8004
-_08083498:
-	cmp r0, 0x5
-	beq _080834C0
-	b _080834CC
-_0808349E:
-	movs r3, 0x2
-	ldr r1, _080834A8 @ =gLinkType
-	ldr r4, _080834AC @ =0x00002233
-	b _080834C8
-	.align 2, 0
-_080834A8: .4byte gLinkType
-_080834AC: .4byte 0x00002233
-_080834B0:
-	movs r3, 0x2
-	ldr r1, _080834B8 @ =gLinkType
-	ldr r4, _080834BC @ =0x00002244
-	b _080834C8
-	.align 2, 0
-_080834B8: .4byte gLinkType
-_080834BC: .4byte 0x00002244
-_080834C0:
-	movs r3, 0x4
-	movs r2, 0x4
-	ldr r1, _080834DC @ =gLinkType
-	ldr r4, _080834E0 @ =0x00002255
-_080834C8:
-	adds r0, r4, 0
-	strh r0, [r1]
-_080834CC:
-	adds r0, r3, 0
-	adds r1, r2, 0
-	bl sub_8082CD4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080834DC: .4byte gLinkType
-_080834E0: .4byte 0x00002255
-	thumb_func_end sub_808347C
-
-	thumb_func_start sub_80834E4
-sub_80834E4: @ 80834E4
-	push {lr}
-	ldr r1, _08083500 @ =gLinkType
-	ldr r2, _08083504 @ =0x00001133
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _08083508 @ =gBattleTypeFlags
-	movs r0, 0
-	strh r0, [r1]
-	movs r0, 0x2
-	movs r1, 0x2
-	bl sub_8082CD4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083500: .4byte gLinkType
-_08083504: .4byte 0x00001133
-_08083508: .4byte gBattleTypeFlags
-	thumb_func_end sub_80834E4
-
-	thumb_func_start sub_808350C
-sub_808350C: @ 808350C
-	push {lr}
-	ldr r0, _0808352C @ =gScriptResult
-	movs r2, 0
-	strh r2, [r0]
-	ldr r1, _08083530 @ =gLinkType
-	ldr r3, _08083534 @ =0x00003311
-	adds r0, r3, 0
-	strh r0, [r1]
-	ldr r0, _08083538 @ =gBattleTypeFlags
-	strh r2, [r0]
-	movs r0, 0x2
-	movs r1, 0x4
-	bl sub_8082CD4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808352C: .4byte gScriptResult
-_08083530: .4byte gLinkType
-_08083534: .4byte 0x00003311
-_08083538: .4byte gBattleTypeFlags
-	thumb_func_end sub_808350C
-
-	thumb_func_start sub_808353C
-sub_808353C: @ 808353C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _0808355C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _08083560
-	cmp r0, 0x1
-	beq _080835BC
-	b _080835CE
-	.align 2, 0
-_0808355C: .4byte gTasks
-_08083560:
-	ldr r0, _08083594 @ =gScriptResult
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	bne _08083586
-	bl GetLinkPlayerCount
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0
-	cmp r1, r0
-	bge _08083586
-	ldr r2, _08083598 @ =gLinkPlayers
-_08083578:
-	ldrh r4, [r2, 0x1A]
-	cmp r4, 0x1
-	beq _0808359C
-	adds r2, 0x1C
-	adds r1, 0x1
-	cmp r1, r0
-	blt _08083578
-_08083586:
-	bl EnableBothScriptContexts
-	adds r0, r5, 0
-	bl DestroyTask
-	b _080835CE
-	.align 2, 0
-_08083594: .4byte gScriptResult
-_08083598: .4byte gLinkPlayers
-_0808359C:
-	ldr r1, _080835B4 @ =gScriptResult
-	movs r0, 0x7
-	strh r0, [r1]
-	bl sub_8008480
-	ldr r1, _080835B8 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	strh r4, [r0, 0x8]
-	b _080835CE
-	.align 2, 0
-_080835B4: .4byte gScriptResult
-_080835B8: .4byte gTasks
-_080835BC:
-	ldr r0, _080835D4 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080835CE
-	bl EnableBothScriptContexts
-	adds r0, r5, 0
-	bl DestroyTask
-_080835CE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080835D4: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_808353C
-
-	thumb_func_start sub_80835D8
-sub_80835D8: @ 80835D8
-	push {r4,lr}
-	ldr r4, _0808360C @ =sub_808353C
-	adds r0, r4, 0
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xFF
-	bne _08083604
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r1, _08083610 @ =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0x8]
-_08083604:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808360C: .4byte sub_808353C
-_08083610: .4byte gTasks
-	thumb_func_end sub_80835D8
-
-	thumb_func_start sub_8083614
-sub_8083614: @ 8083614
-	push {lr}
-	ldr r1, _08083630 @ =gLinkType
-	ldr r2, _08083634 @ =0x00004411
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _08083638 @ =gBattleTypeFlags
-	movs r0, 0
-	strh r0, [r1]
-	movs r0, 0x2
-	movs r1, 0x4
-	bl sub_8082CD4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083630: .4byte gLinkType
-_08083634: .4byte 0x00004411
-_08083638: .4byte gBattleTypeFlags
-	thumb_func_end sub_8083614
-
-	thumb_func_start sub_808363C
-sub_808363C: @ 808363C
-	push {lr}
-	ldr r1, _08083658 @ =gLinkType
-	ldr r2, _0808365C @ =0x00006601
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _08083660 @ =gBattleTypeFlags
-	movs r0, 0
-	strh r0, [r1]
-	movs r0, 0x4
-	movs r1, 0x4
-	bl sub_8082CD4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083658: .4byte gLinkType
-_0808365C: .4byte 0x00006601
-_08083660: .4byte gBattleTypeFlags
-	thumb_func_end sub_808363C
-
-	thumb_func_start sub_8083664
-sub_8083664: @ 8083664
-	push {lr}
-	ldr r0, _08083678 @ =sub_8083710
-	bl FuncIsActiveTask
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808367C
-	movs r0, 0xFF
-	b _08083700
-	.align 2, 0
-_08083678: .4byte sub_8083710
-_0808367C:
-	ldr r0, _08083690 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	subs r0, 0x1
-	cmp r0, 0x4
-	bhi _080836F4
-	lsls r0, 2
-	ldr r1, _08083694 @ =_08083698
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08083690: .4byte gSpecialVar_0x8004
-_08083694: .4byte _08083698
-	.align 2, 0
-_08083698:
-	.4byte _080836AC
-	.4byte _080836BC
-	.4byte _080836DC
-	.4byte _080836EC
-	.4byte _080836CC
-_080836AC:
-	ldr r1, _080836B4 @ =gLinkType
-	ldr r2, _080836B8 @ =0x00002233
-	b _080836F0
-	.align 2, 0
-_080836B4: .4byte gLinkType
-_080836B8: .4byte 0x00002233
-_080836BC:
-	ldr r1, _080836C4 @ =gLinkType
-	ldr r2, _080836C8 @ =0x00002244
-	b _080836F0
-	.align 2, 0
-_080836C4: .4byte gLinkType
-_080836C8: .4byte 0x00002244
-_080836CC:
-	ldr r1, _080836D4 @ =gLinkType
-	ldr r2, _080836D8 @ =0x00002255
-	b _080836F0
-	.align 2, 0
-_080836D4: .4byte gLinkType
-_080836D8: .4byte 0x00002255
-_080836DC:
-	ldr r1, _080836E4 @ =gLinkType
-	ldr r2, _080836E8 @ =0x00001111
-	b _080836F0
-	.align 2, 0
-_080836E4: .4byte gLinkType
-_080836E8: .4byte 0x00001111
-_080836EC:
-	ldr r1, _08083704 @ =gLinkType
-	ldr r2, _08083708 @ =0x00003322
-_080836F0:
-	adds r0, r2, 0
-	strh r0, [r1]
-_080836F4:
-	ldr r0, _0808370C @ =sub_8083710
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-_08083700:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08083704: .4byte gLinkType
-_08083708: .4byte 0x00003322
-_0808370C: .4byte sub_8083710
-	thumb_func_end sub_8083664
-
-	thumb_func_start sub_8083710
-sub_8083710: @ 8083710
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _0808373C @ =gTasks + 0x8
-	adds r4, r1, r0
-	movs r3, 0
-	ldrsh r2, [r4, r3]
-	cmp r2, 0
-	bne _08083744
-	bl OpenLink
-	bl ResetLinkPlayers
-	ldr r0, _08083740 @ =sub_8083C50
-	movs r1, 0x50
-	bl CreateTask
-	b _08083750
-	.align 2, 0
-_0808373C: .4byte gTasks + 0x8
-_08083740: .4byte sub_8083C50
-_08083744:
-	cmp r2, 0x9
-	ble _08083750
-	subs r0, 0x8
-	adds r0, r1, r0
-	ldr r1, _0808375C @ =sub_8083760
-	str r1, [r0]
-_08083750:
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808375C: .4byte sub_8083760
-	thumb_func_end sub_8083710
-
-	thumb_func_start sub_8083760
-sub_8083760: @ 8083760
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	bl GetLinkPlayerCount_2
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _080837A6
-	bl IsLinkMaster
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08083798
-	ldr r0, _08083790 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _08083794 @ =sub_80837B4
-	b _080837A4
-	.align 2, 0
-_08083790: .4byte gTasks
-_08083794: .4byte sub_80837B4
-_08083798:
-	ldr r0, _080837AC @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080837B0 @ =sub_80837EC
-_080837A4:
-	str r0, [r1]
-_080837A6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080837AC: .4byte gTasks
-_080837B0: .4byte sub_80837EC
-	thumb_func_end sub_8083760
-
-	thumb_func_start sub_80837B4
-sub_80837B4: @ 80837B4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	bl sub_800820C
-	adds r4, r0, 0
-	bl GetLinkPlayerCount_2
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bne _080837DE
-	bl sub_8007F4C
-	ldr r0, _080837E4 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080837E8 @ =sub_80837EC
-	str r0, [r1]
-_080837DE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080837E4: .4byte gTasks
-_080837E8: .4byte sub_80837EC
-	thumb_func_end sub_80837B4
-
-	thumb_func_start sub_80837EC
-sub_80837EC: @ 80837EC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808381C @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08083814
-	bl IsLinkPlayerDataExchangeComplete
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08083814
-	bl sub_800826C
-	bl sub_8007B14
-	adds r0, r4, 0
-	bl DestroyTask
-_08083814:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808381C: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_80837EC
-
-	thumb_func_start sub_8083820
-sub_8083820: @ 8083820
-	push {lr}
-	bl InitSaveDialog
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8083820
-
-	thumb_func_start sub_808382C
-sub_808382C: @ 808382C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08083850 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x5
-	bls _08083846
-	b _08083940
-_08083846:
-	lsls r0, 2
-	ldr r1, _08083854 @ =_08083858
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08083850: .4byte gTasks
-_08083854: .4byte _08083858
-	.align 2, 0
-_08083858:
-	.4byte _08083870
-	.4byte _08083890
-	.4byte _080838A0
-	.4byte _080838B0
-	.4byte _080838B6
-	.4byte _080838CC
-_08083870:
-	movs r0, 0x1
-	movs r1, 0
-	bl fade_screen
-	ldr r1, _08083888 @ =gLinkType
-	ldr r2, _0808388C @ =0x00002211
-	adds r0, r2, 0
-	strh r0, [r1]
-	bl ClearLinkCallback_2
-	b _080838BE
-	.align 2, 0
-_08083888: .4byte gLinkType
-_0808388C: .4byte 0x00002211
-_08083890:
-	ldr r0, _0808389C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	b _080838BA
-	.align 2, 0
-_0808389C: .4byte gPaletteFade
-_080838A0:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	ble _08083940
-	b _080838BE
-_080838B0:
-	bl sub_800832C
-	b _080838BE
-_080838B6:
-	ldr r0, _080838C8 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-_080838BA:
-	cmp r0, 0
-	bne _08083940
-_080838BE:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _08083940
-	.align 2, 0
-_080838C8: .4byte gReceivedRemoteLinkPlayers
-_080838CC:
-	ldr r0, _080838E4 @ =gLinkPlayers
-	ldr r0, [r0, 0x4]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080838E8
-	movs r0, 0xE6
-	lsls r0, 1
-	bl current_map_music_set__default_for_battle
-	b _080838EE
-	.align 2, 0
-_080838E4: .4byte gLinkPlayers
-_080838E8:
-	ldr r0, _08083900 @ =0x000001cb
-	bl current_map_music_set__default_for_battle
-_080838EE:
-	ldr r0, _08083904 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0x2
-	beq _08083918
-	cmp r0, 0x2
-	bgt _08083908
-	cmp r0, 0x1
-	beq _0808390E
-	b _0808392E
-	.align 2, 0
-_08083900: .4byte 0x000001cb
-_08083904: .4byte gSpecialVar_0x8004
-_08083908:
-	cmp r0, 0x5
-	beq _08083924
-	b _0808392E
-_0808390E:
-	ldr r1, _08083914 @ =gBattleTypeFlags
-	movs r0, 0xA
-	b _0808392C
-	.align 2, 0
-_08083914: .4byte gBattleTypeFlags
-_08083918:
-	ldr r1, _08083920 @ =gBattleTypeFlags
-	movs r0, 0xB
-	b _0808392C
-	.align 2, 0
-_08083920: .4byte gBattleTypeFlags
-_08083924:
-	bl ReducePlayerPartyToThree
-	ldr r1, _08083948 @ =gBattleTypeFlags
-	movs r0, 0x4B
-_0808392C:
-	strh r0, [r1]
-_0808392E:
-	ldr r0, _0808394C @ =sub_800E7C4
-	bl SetMainCallback2
-	ldr r1, _08083950 @ =gMain
-	ldr r0, _08083954 @ =sub_8083958
-	str r0, [r1, 0x8]
-	adds r0, r5, 0
-	bl DestroyTask
-_08083940:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083948: .4byte gBattleTypeFlags
-_0808394C: .4byte sub_800E7C4
-_08083950: .4byte gMain
-_08083954: .4byte sub_8083958
-	thumb_func_end sub_808382C
-
-	thumb_func_start sub_8083958
-sub_8083958: @ 8083958
-	push {lr}
-	bl call_map_music_set_to_zero
-	bl LoadPlayerParty
-	bl SavePlayerBag
-	bl sub_810FEFC
-	ldr r0, _08083990 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	cmp r0, 0x5
-	beq _0808397E
-	ldr r0, _08083994 @ =gUnknown_03004860
-	ldrb r1, [r0]
-	movs r0, 0x1
-	eors r0, r1
-	bl UpdateLinkBattleRecords
-_0808397E:
-	ldr r0, _08083998 @ =gMain
-	ldr r1, _0808399C @ =sub_805465C
-	str r1, [r0, 0x8]
-	ldr r0, _080839A0 @ =sub_8071B28
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083990: .4byte gSpecialVar_0x8004
-_08083994: .4byte gUnknown_03004860
-_08083998: .4byte gMain
-_0808399C: .4byte sub_805465C
-_080839A0: .4byte sub_8071B28
-	thumb_func_end sub_8083958
-
-	thumb_func_start sub_80839A4
-sub_80839A4: @ 80839A4
-	push {lr}
-	ldr r0, _080839CC @ =gSpecialVar_0x8004
-	ldrh r1, [r0]
-	subs r0, r1, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bls _080839B8
-	cmp r1, 0x5
-	bne _080839C0
-_080839B8:
-	bl LoadPlayerParty
-	bl SavePlayerBag
-_080839C0:
-	movs r0, 0x7F
-	bl copy_saved_warp2_bank_and_enter_x_to_warp1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080839CC: .4byte gSpecialVar_0x8004
-	thumb_func_end sub_80839A4
-
-	thumb_func_start sub_80839D0
-sub_80839D0: @ 80839D0
-	push {lr}
-	bl sub_805559C
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80839D0
-
-	thumb_func_start sub_80839DC
-sub_80839DC: @ 80839DC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _08083A00 @ =gTasks
-	adds r5, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _08083A20
-	cmp r0, 0x1
-	bgt _08083A04
-	cmp r0, 0
-	beq _08083A0E
-	b _08083A7E
-	.align 2, 0
-_08083A00: .4byte gTasks
-_08083A04:
-	cmp r0, 0x2
-	beq _08083A40
-	cmp r0, 0x3
-	beq _08083A68
-	b _08083A7E
-_08083A0E:
-	ldr r0, _08083A1C @ =gUnknown_081A490C
-	bl ShowFieldMessage
-	movs r0, 0x1
-	strh r0, [r5, 0x8]
-	b _08083A7E
-	.align 2, 0
-_08083A1C: .4byte gUnknown_081A490C
-_08083A20:
-	bl IsFieldMessageBoxHidden
-	lsls r0, 24
-	cmp r0, 0
-	beq _08083A7E
-	bl sub_8055574
-	ldr r0, _08083A3C @ =gSpecialVar_0x8005
-	ldrb r0, [r0]
-	bl sub_8007270
-	movs r0, 0x2
-	strh r0, [r5, 0x8]
-	b _08083A7E
-	.align 2, 0
-_08083A3C: .4byte gSpecialVar_0x8005
-_08083A40:
-	bl sub_80554F8
-	cmp r0, 0x1
-	beq _08083A52
-	cmp r0, 0x1
-	ble _08083A7E
-	cmp r0, 0x2
-	beq _08083A62
-	b _08083A7E
-_08083A52:
-	bl HideFieldMessageBox
-	movs r0, 0
-	strh r0, [r5, 0x8]
-	adds r0, r4, 0
-	bl SwitchTaskToFollowupFunc
-	b _08083A7E
-_08083A62:
-	movs r0, 0x3
-	strh r0, [r5, 0x8]
-	b _08083A7E
-_08083A68:
-	bl sub_8055588
-	bl HideFieldMessageBox
-	bl MenuZeroFillScreen
-	adds r0, r4, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-_08083A7E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80839DC
-
-	thumb_func_start sub_8083A84
-sub_8083A84: @ 8083A84
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _08083AA8 @ =sub_80839DC
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl SetTaskFuncWithFollowupFunc
-	bl ScriptContext1_Stop
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083AA8: .4byte sub_80839DC
-	thumb_func_end sub_8083A84
-
-	thumb_func_start sub_8083AAC
-sub_8083AAC: @ 8083AAC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08083AD0 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _08083AF0
-	cmp r0, 0x1
-	bgt _08083AD4
-	cmp r0, 0
-	beq _08083ADE
-	b _08083B34
-	.align 2, 0
-_08083AD0: .4byte gTasks
-_08083AD4:
-	cmp r0, 0x2
-	beq _08083B04
-	cmp r0, 0x3
-	beq _08083B20
-	b _08083B34
-_08083ADE:
-	bl ScriptContext2_Enable
-	movs r0, 0x1
-	movs r1, 0
-	bl fade_screen
-	bl ClearLinkCallback_2
-	b _08083B14
-_08083AF0:
-	ldr r0, _08083B00 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08083B34
-	b _08083B14
-	.align 2, 0
-_08083B00: .4byte gPaletteFade
-_08083B04:
-	ldr r1, _08083B1C @ =gUnknown_020297D8
-	movs r0, 0
-	strb r0, [r1]
-	strb r0, [r1, 0x1]
-	bl m4aMPlayAllStop
-	bl sub_800832C
-_08083B14:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _08083B34
-	.align 2, 0
-_08083B1C: .4byte gUnknown_020297D8
-_08083B20:
-	ldr r0, _08083B3C @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08083B34
-	ldr r0, _08083B40 @ =sub_8047CD8
-	bl SetMainCallback2
-	adds r0, r5, 0
-	bl DestroyTask
-_08083B34:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083B3C: .4byte gReceivedRemoteLinkPlayers
-_08083B40: .4byte sub_8047CD8
-	thumb_func_end sub_8083AAC
-
-	thumb_func_start sub_8083B44
-sub_8083B44: @ 8083B44
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_8083B6C
-	adds r0, r4, 0
-	bl DestroyTask
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8083B44
-
-	thumb_func_start sub_8083B5C
-sub_8083B5C: @ 8083B5C
-	push {lr}
-	ldr r0, _08083B68 @ =sub_8083B44
-	bl sub_8083A84
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083B68: .4byte sub_8083B44
-	thumb_func_end sub_8083B5C
-
-	thumb_func_start sub_8083B6C
-sub_8083B6C: @ 8083B6C
-	push {lr}
-	ldr r0, _08083B7C @ =sub_8083AAC
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083B7C: .4byte sub_8083AAC
-	thumb_func_end sub_8083B6C
-
-	thumb_func_start sub_8083B80
-sub_8083B80: @ 8083B80
-	push {lr}
-	bl sub_8083B6C
-	bl ScriptContext1_Stop
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8083B80
-
-	thumb_func_start sub_8083B90
-sub_8083B90: @ 8083B90
-	push {lr}
-	ldr r0, _08083BA4 @ =gLinkType
-	ldr r2, _08083BA8 @ =0x00002211
-	adds r1, r2, 0
-	strh r1, [r0]
-	ldr r0, _08083BAC @ =sub_808382C
-	bl sub_8083A84
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083BA4: .4byte gLinkType
-_08083BA8: .4byte 0x00002211
-_08083BAC: .4byte sub_808382C
-	thumb_func_end sub_8083B90
-
-	thumb_func_start unref_sub_8083BB0
-unref_sub_8083BB0: @ 8083BB0
-	push {r4,lr}
-	ldr r4, _08083BD4 @ =sub_80839DC
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08083BD8 @ =Task_RecordMixing_Main
-	adds r1, r4, 0
-	bl SetTaskFuncWithFollowupFunc
-	bl ScriptContext1_Stop
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083BD4: .4byte sub_80839DC
-_08083BD8: .4byte Task_RecordMixing_Main
-	thumb_func_end unref_sub_8083BB0
-
-	thumb_func_start sub_8083BDC
-sub_8083BDC: @ 8083BDC
-	push {lr}
-	ldr r0, _08083BEC @ =gSpecialVar_0x8006
-	ldrb r0, [r0]
-	ldr r1, _08083BF0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
-	bl sub_8093130
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083BEC: .4byte gSpecialVar_0x8006
-_08083BF0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
-	thumb_func_end sub_8083BDC
-
-	thumb_func_start sub_8083BF4
-sub_8083BF4: @ 8083BF4
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _08083C34 @ =gSpecialVar_0x8006
-	strh r4, [r0]
-	ldr r0, _08083C38 @ =gStringVar1
-	lsls r1, r4, 3
-	subs r1, r4
-	lsls r1, 2
-	ldr r2, _08083C3C @ =gLinkPlayers + 0x8
-	adds r1, r2
-	bl StringCopy
-	adds r0, r4, 0
-	bl sub_80934C4
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _08083C48
-	ldr r0, _08083C40 @ =gStringVar2
-	ldr r2, _08083C44 @ =gTrainerCardColorNames
-	subs r1, 0x1
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringCopy
-	movs r0, 0x1
-	b _08083C4A
-	.align 2, 0
-_08083C34: .4byte gSpecialVar_0x8006
-_08083C38: .4byte gStringVar1
-_08083C3C: .4byte gLinkPlayers + 0x8
-_08083C40: .4byte gStringVar2
-_08083C44: .4byte gTrainerCardColorNames
-_08083C48:
-	movs r0, 0
-_08083C4A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8083BF4
-
-	thumb_func_start sub_8083C50
-sub_8083C50: @ 8083C50
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _08083C98 @ =gTasks
-	adds r0, r1
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	lsls r1, 16
-	movs r0, 0x96
-	lsls r0, 17
-	cmp r1, r0
-	ble _08083C82
-	bl CloseLink
-	ldr r0, _08083C9C @ =CB2_LinkError
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_08083C82:
-	ldr r0, _08083CA0 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08083C90
-	adds r0, r5, 0
-	bl DestroyTask
-_08083C90:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083C98: .4byte gTasks
-_08083C9C: .4byte CB2_LinkError
-_08083CA0: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_8083C50
-
-	thumb_func_start sub_8083CA4
-sub_8083CA4: @ 8083CA4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08083CC4 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08083CBC
-	bl EnableBothScriptContexts
-	adds r0, r4, 0
-	bl DestroyTask
-_08083CBC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083CC4: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_8083CA4
-
-	thumb_func_start unref_sub_8083CC8
-unref_sub_8083CC8: @ 8083CC8
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_800832C
-	ldr r1, _08083CE8 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _08083CEC @ =sub_8083CA4
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08083CE8: .4byte gTasks
-_08083CEC: .4byte sub_8083CA4
-	thumb_func_end unref_sub_8083CC8
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
deleted file mode 100644
index 54011fb4e..000000000
--- a/asm/evolution_scene.s
+++ /dev/null
@@ -1,6717 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CB2_BeginEvolutionScene
-CB2_BeginEvolutionScene: @ 8111894
-	push {lr}
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	thumb_func_end CB2_BeginEvolutionScene
-
-	thumb_func_start Task_BeginEvolutionScene
-Task_BeginEvolutionScene: @ 81118A4
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r2, r0, 24
-	movs r7, 0
-	ldr r1, _081118C8 @ =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _081118CC
-	cmp r0, 0x1
-	beq _081118E4
-	b _08111918
-	.align 2, 0
-_081118C8: .4byte gTasks
-_081118CC:
-	movs r0, 0x1
-	negs r0, r0
-	str r7, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _08111918
-_081118E4:
-	ldr r0, _08111920 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08111918
-	movs r0, 0xA
-	ldrsh r7, [r4, r0]
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	lsls r0, 16
-	orrs r7, r0
-	ldrh r5, [r4, 0x10]
-	ldrb r6, [r4, 0x12]
-	ldrh r4, [r4, 0x20]
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r2, 0
-	bl DestroyTask
-	adds r0, r7, 0
-	adds r1, r5, 0
-	adds r2, r6, 0
-	adds r3, r4, 0
-	bl EvolutionScene
-_08111918:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111920: .4byte gPaletteFade
-	thumb_func_end Task_BeginEvolutionScene
-
-	thumb_func_start BeginEvolutionScene
-BeginEvolutionScene: @ 8111924
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	mov r8, r0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	adds r6, r3, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	ldr r0, _08111978 @ =Task_BeginEvolutionScene
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0811197C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0x8]
-	mov r0, r8
-	strh r0, [r1, 0xA]
-	mov r0, r8
-	lsrs r0, 16
-	strh r0, [r1, 0xC]
-	strh r4, [r1, 0x10]
-	strh r5, [r1, 0x12]
-	strh r6, [r1, 0x20]
-	ldr r0, _08111980 @ =CB2_BeginEvolutionScene
-	bl SetMainCallback2
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111978: .4byte Task_BeginEvolutionScene
-_0811197C: .4byte gTasks
-_08111980: .4byte CB2_BeginEvolutionScene
-	thumb_func_end BeginEvolutionScene
-
-	thumb_func_start EvolutionScene
-EvolutionScene: @ 8111984
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x38
-	str r0, [sp, 0x20]
-	mov r10, r1
-	mov r0, r10
-	lsls r0, 16
-	lsrs r0, 16
-	mov r10, r0
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp, 0x24]
-	lsls r3, 24
-	lsrs r3, 24
-	str r3, [sp, 0x28]
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r5, 0
-	str r5, [sp, 0x1C]
-	add r0, sp, 0x1C
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, _08111C10 @ =0x05006000
-	bl CpuSet
-	ldr r0, _08111C14 @ =REG_MOSAIC
-	strh r5, [r0]
-	subs r0, 0xC
-	strh r5, [r0]
-	adds r0, 0x4
-	strh r5, [r0]
-	subs r0, 0x2
-	strh r5, [r0]
-	adds r0, 0x4
-	strh r5, [r0]
-	adds r0, 0x2
-	strh r5, [r0]
-	adds r0, 0x2
-	strh r5, [r0]
-	ldr r4, _08111C18 @ =gWindowConfig_81E6C58
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	bl ResetPaletteFade
-	ldr r0, _08111C1C @ =gUnknown_030042A4
-	strh r5, [r0]
-	ldr r0, _08111C20 @ =gUnknown_030042A0
-	strh r5, [r0]
-	ldr r0, _08111C24 @ =gUnknown_030042C0
-	strh r5, [r0]
-	ldr r0, _08111C28 @ =gUnknown_030041B4
-	strh r5, [r0]
-	ldr r0, _08111C2C @ =gUnknown_03004288
-	strh r5, [r0]
-	ldr r0, _08111C30 @ =gUnknown_03004280
-	strh r5, [r0]
-	ldr r1, _08111C34 @ =gUnknown_030041B0
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08111C38 @ =gUnknown_030041B8
-	strh r5, [r0]
-	ldr r0, _08111C3C @ =gUnknown_03004210
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	ldr r1, _08111C40 @ =gBattleTerrain
-	movs r0, 0x9
-	strb r0, [r1]
-	bl sub_800D6D4
-	bl sub_800DAB8
-	bl ResetSpriteData
-	bl remove_some_task
-	bl ResetTasks
-	bl FreeAllSpritePalettes
-	ldr r0, _08111C44 @ =gReservedSpritePaletteCount
-	movs r3, 0x4
-	strb r3, [r0]
-	ldr r0, [sp, 0x20]
-	movs r1, 0x2
-	add r2, sp, 0x8
-	bl GetMonData
-	ldr r0, _08111C48 @ =gStringVar1
-	add r1, sp, 0x8
-	bl StringCopy10
-	ldr r0, _08111C4C @ =gStringVar2
-	movs r1, 0xB
-	mov r4, r10
-	muls r4, r1
-	adds r1, r4, 0
-	ldr r2, _08111C50 @ =gSpeciesNames
-	adds r1, r2
-	bl StringCopy
-	ldr r0, [sp, 0x20]
-	movs r1, 0xB
-	bl GetMonData
-	adds r6, r0, 0
-	lsls r6, 16
-	lsrs r6, 16
-	ldr r0, [sp, 0x20]
-	movs r1, 0x1
-	bl GetMonData
-	str r0, [sp, 0x2C]
-	ldr r0, [sp, 0x20]
-	movs r1, 0
-	bl GetMonData
-	str r0, [sp, 0x30]
-	lsls r0, r6, 3
-	ldr r1, _08111C54 @ =gMonFrontPicTable
-	adds r0, r1
-	lsls r2, r6, 2
-	ldr r3, _08111C58 @ =gMonFrontPicCoords
-	adds r2, r3
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	ldr r4, _08111C5C @ =gUnknown_081FAF4C
-	ldr r3, [r4, 0x4]
-	str r3, [sp]
-	str r6, [sp, 0x4]
-	movs r3, 0x80
-	lsls r3, 18
-	bl DecompressPicFromTable_2
-	adds r0, r6, 0
-	ldr r1, [sp, 0x2C]
-	ldr r2, [sp, 0x30]
-	bl sub_80409C8
-	ldr r0, [r0]
-	movs r1, 0x88
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _08111C60 @ =gUnknown_02024E8C
-	mov r9, r0
-	ldr r1, _08111C64 @ =gDummySpriteAffineAnimTable
-	str r1, [r0, 0x10]
-	movs r1, 0x78
-	movs r2, 0x40
-	movs r3, 0x1E
-	bl CreateSprite
-	lsls r1, r0, 24
-	lsrs r2, r1, 24
-	ldr r3, _08111C68 @ =0x02014800
-	strb r0, [r3]
-	ldr r7, _08111C6C @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	movs r4, 0x1C
-	adds r4, r7
-	mov r8, r4
-	adds r0, r1, r4
-	ldr r2, _08111C70 @ =nullsub_37
-	str r2, [r0]
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	movs r4, 0xF
-	adds r0, r4, 0
-	ands r0, r2
-	movs r2, 0x10
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r3, 0x4
-	orrs r0, r3
-	strb r0, [r1]
-	mov r1, r10
-	lsls r0, r1, 3
-	ldr r2, _08111C54 @ =gMonFrontPicTable
-	adds r0, r2
-	lsls r2, r1, 2
-	ldr r3, _08111C58 @ =gMonFrontPicCoords
-	adds r2, r3
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	str r2, [sp, 0x34]
-	ldr r2, _08111C5C @ =gUnknown_081FAF4C
-	ldr r2, [r2, 0xC]
-	str r2, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	ldr r2, [sp, 0x34]
-	movs r3, 0x80
-	lsls r3, 18
-	bl DecompressPicFromTable_2
-	mov r0, r10
-	ldr r1, [sp, 0x2C]
-	ldr r2, [sp, 0x30]
-	bl sub_80409C8
-	ldr r0, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	mov r0, r10
-	movs r1, 0x3
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _08111C64 @ =gDummySpriteAffineAnimTable
-	mov r1, r9
-	str r0, [r1, 0x10]
-	mov r0, r9
-	movs r1, 0x78
-	movs r2, 0x40
-	movs r3, 0x1E
-	bl CreateSprite
-	lsls r1, r0, 24
-	lsrs r2, r1, 24
-	ldr r3, _08111C68 @ =0x02014800
-	strb r0, [r3, 0x1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	add r8, r1
-	ldr r0, _08111C70 @ =nullsub_37
-	mov r2, r8
-	str r0, [r2]
-	adds r1, r7
-	ldrb r0, [r1, 0x5]
-	ands r4, r0
-	movs r0, 0x20
-	orrs r4, r0
-	strb r4, [r1, 0x5]
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r3, 0x4
-	orrs r0, r3
-	strb r0, [r1]
-	bl LoadEvoSparkleSpriteAndPal
-	ldr r0, _08111C74 @ =Task_EvolutionScene
-	movs r1, 0
-	bl CreateTask
-	lsls r1, r0, 24
-	lsrs r2, r1, 24
-	ldr r4, _08111C68 @ =0x02014800
-	strb r0, [r4, 0x2]
-	ldr r1, _08111C78 @ =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	strh r5, [r0, 0x8]
-	strh r6, [r0, 0xE]
-	mov r1, r10
-	strh r1, [r0, 0x10]
-	mov r2, sp
-	ldrh r2, [r2, 0x20]
-	strh r2, [r0, 0xA]
-	ldr r3, [sp, 0x20]
-	lsrs r1, r3, 16
-	strh r1, [r0, 0xC]
-	mov r4, sp
-	ldrh r4, [r4, 0x24]
-	strh r4, [r0, 0x12]
-	movs r1, 0x1
-	strh r1, [r0, 0x14]
-	strh r5, [r0, 0x1E]
-	mov r1, sp
-	ldrh r1, [r1, 0x28]
-	strh r1, [r0, 0x20]
-	ldr r0, _08111C7C @ =0x02009000
-	ldr r1, _08111C80 @ =gPlttBufferUnfaded + 0x40
-	movs r2, 0x60
-	bl memcpy
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xFA
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08111C84 @ =HBlankCB_EvolutionScene
-	bl SetHBlankCallback
-	ldr r0, _08111C88 @ =VBlankCB_EvolutionScene
-	bl SetVBlankCallback
-	bl m4aMPlayAllStop
-	ldr r0, _08111C8C @ =CB2_EvolutionSceneUpdate_0
-	bl SetMainCallback2
-	add sp, 0x38
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111C10: .4byte 0x05006000
-_08111C14: .4byte REG_MOSAIC
-_08111C18: .4byte gWindowConfig_81E6C58
-_08111C1C: .4byte gUnknown_030042A4
-_08111C20: .4byte gUnknown_030042A0
-_08111C24: .4byte gUnknown_030042C0
-_08111C28: .4byte gUnknown_030041B4
-_08111C2C: .4byte gUnknown_03004288
-_08111C30: .4byte gUnknown_03004280
-_08111C34: .4byte gUnknown_030041B0
-_08111C38: .4byte gUnknown_030041B8
-_08111C3C: .4byte gUnknown_03004210
-_08111C40: .4byte gBattleTerrain
-_08111C44: .4byte gReservedSpritePaletteCount
-_08111C48: .4byte gStringVar1
-_08111C4C: .4byte gStringVar2
-_08111C50: .4byte gSpeciesNames
-_08111C54: .4byte gMonFrontPicTable
-_08111C58: .4byte gMonFrontPicCoords
-_08111C5C: .4byte gUnknown_081FAF4C
-_08111C60: .4byte gUnknown_02024E8C
-_08111C64: .4byte gDummySpriteAffineAnimTable
-_08111C68: .4byte 0x02014800
-_08111C6C: .4byte gSprites
-_08111C70: .4byte nullsub_37
-_08111C74: .4byte Task_EvolutionScene
-_08111C78: .4byte gTasks
-_08111C7C: .4byte 0x02009000
-_08111C80: .4byte gPlttBufferUnfaded + 0x40
-_08111C84: .4byte HBlankCB_EvolutionScene
-_08111C88: .4byte VBlankCB_EvolutionScene
-_08111C8C: .4byte CB2_EvolutionSceneUpdate_0
-	thumb_func_end EvolutionScene
-
-	thumb_func_start CB2_EvolutionSceneLoadGraphics
-CB2_EvolutionSceneLoadGraphics: @ 8111C90
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	sub sp, 0xC
-	ldr r2, _08111E14 @ =gTasks
-	ldr r0, _08111E18 @ =0x02014800
-	mov r9, r0
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x20
-	ldrsh r2, [r0, r1]
-	movs r1, 0x64
-	adds r4, r2, 0
-	muls r4, r1
-	ldr r1, _08111E1C @ =gPlayerParty
-	adds r4, r1
-	ldrh r6, [r0, 0x10]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetMonData
-	mov r10, r0
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	mov r8, r0
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r5, 0
-	str r5, [sp, 0x8]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, _08111E20 @ =0x05006000
-	add r0, sp, 0x8
-	bl CpuSet
-	ldr r0, _08111E24 @ =REG_MOSAIC
-	strh r5, [r0]
-	subs r0, 0xC
-	strh r5, [r0]
-	adds r0, 0x4
-	strh r5, [r0]
-	subs r0, 0x2
-	strh r5, [r0]
-	adds r0, 0x4
-	strh r5, [r0]
-	adds r0, 0x2
-	strh r5, [r0]
-	adds r0, 0x2
-	strh r5, [r0]
-	ldr r4, _08111E28 @ =gWindowConfig_81E6C58
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	bl ResetPaletteFade
-	ldr r0, _08111E2C @ =gUnknown_030042A4
-	strh r5, [r0]
-	ldr r0, _08111E30 @ =gUnknown_030042A0
-	strh r5, [r0]
-	ldr r0, _08111E34 @ =gUnknown_030042C0
-	strh r5, [r0]
-	ldr r0, _08111E38 @ =gUnknown_030041B4
-	strh r5, [r0]
-	ldr r0, _08111E3C @ =gUnknown_03004288
-	strh r5, [r0]
-	ldr r0, _08111E40 @ =gUnknown_03004280
-	strh r5, [r0]
-	ldr r1, _08111E44 @ =gUnknown_030041B0
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08111E48 @ =gUnknown_030041B8
-	strh r5, [r0]
-	ldr r0, _08111E4C @ =gUnknown_03004210
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	ldr r1, _08111E50 @ =gBattleTerrain
-	movs r0, 0x9
-	strb r0, [r1]
-	bl sub_800D6D4
-	bl sub_800DAB8
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	ldr r1, _08111E54 @ =gReservedSpritePaletteCount
-	movs r0, 0x4
-	strb r0, [r1]
-	lsls r0, r6, 3
-	ldr r1, _08111E58 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _08111E5C @ =gMonFrontPicCoords
-	lsls r2, r6, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r4, _08111E60 @ =gUnknown_081FAF4C
-	ldr r4, [r4, 0xC]
-	str r4, [sp]
-	str r6, [sp, 0x4]
-	bl DecompressPicFromTable_2
-	adds r0, r6, 0
-	mov r1, r10
-	mov r2, r8
-	bl sub_80409C8
-	ldr r0, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	adds r0, r6, 0
-	movs r1, 0x3
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _08111E64 @ =gUnknown_02024E8C
-	ldr r1, _08111E68 @ =gDummySpriteAffineAnimTable
-	str r1, [r0, 0x10]
-	movs r1, 0x78
-	movs r2, 0x40
-	movs r3, 0x1E
-	bl CreateSprite
-	lsls r2, r0, 24
-	lsrs r2, 24
-	mov r1, r9
-	strb r0, [r1, 0x1]
-	ldr r3, _08111E6C @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r0, r3, 0
-	adds r0, 0x1C
-	adds r0, r1, r0
-	ldr r2, _08111E70 @ =nullsub_37
-	str r2, [r0]
-	adds r1, r3
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	movs r2, 0x20
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xFA
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08111E74 @ =HBlankCB_EvolutionScene
-	bl SetHBlankCallback
-	ldr r0, _08111E78 @ =VBlankCB_EvolutionScene
-	bl SetVBlankCallback
-	ldr r0, _08111E7C @ =CB2_EvolutionSceneUpdate_0
-	bl SetMainCallback2
-	movs r0, 0x1
-	negs r0, r0
-	str r5, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08111E14: .4byte gTasks
-_08111E18: .4byte 0x02014800
-_08111E1C: .4byte gPlayerParty
-_08111E20: .4byte 0x05006000
-_08111E24: .4byte REG_MOSAIC
-_08111E28: .4byte gWindowConfig_81E6C58
-_08111E2C: .4byte gUnknown_030042A4
-_08111E30: .4byte gUnknown_030042A0
-_08111E34: .4byte gUnknown_030042C0
-_08111E38: .4byte gUnknown_030041B4
-_08111E3C: .4byte gUnknown_03004288
-_08111E40: .4byte gUnknown_03004280
-_08111E44: .4byte gUnknown_030041B0
-_08111E48: .4byte gUnknown_030041B8
-_08111E4C: .4byte gUnknown_03004210
-_08111E50: .4byte gBattleTerrain
-_08111E54: .4byte gReservedSpritePaletteCount
-_08111E58: .4byte gMonFrontPicTable
-_08111E5C: .4byte gMonFrontPicCoords
-_08111E60: .4byte gUnknown_081FAF4C
-_08111E64: .4byte gUnknown_02024E8C
-_08111E68: .4byte gDummySpriteAffineAnimTable
-_08111E6C: .4byte gSprites
-_08111E70: .4byte nullsub_37
-_08111E74: .4byte HBlankCB_EvolutionScene
-_08111E78: .4byte VBlankCB_EvolutionScene
-_08111E7C: .4byte CB2_EvolutionSceneUpdate_0
-	thumb_func_end CB2_EvolutionSceneLoadGraphics
-
-	thumb_func_start CB2_TradeEvolutionSceneLoadGraphics
-CB2_TradeEvolutionSceneLoadGraphics: @ 8111E80
-	push {r4-r7,lr}
-	sub sp, 0x8
-	ldr r2, _08111EB8 @ =gTasks
-	ldr r0, _08111EBC @ =0x02014800
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x20
-	ldrsh r2, [r0, r1]
-	movs r1, 0x64
-	muls r2, r1
-	ldr r1, _08111EC0 @ =gPlayerParty
-	adds r4, r2, r1
-	ldrh r7, [r0, 0x10]
-	ldr r0, _08111EC4 @ =gMain
-	ldr r2, _08111EC8 @ =0x0000043c
-	adds r0, r2
-	ldrb r0, [r0]
-	cmp r0, 0x6
-	bls _08111EAE
-	b _081120D6
-_08111EAE:
-	lsls r0, 2
-	ldr r1, _08111ECC @ =_08111ED0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08111EB8: .4byte gTasks
-_08111EBC: .4byte 0x02014800
-_08111EC0: .4byte gPlayerParty
-_08111EC4: .4byte gMain
-_08111EC8: .4byte 0x0000043c
-_08111ECC: .4byte _08111ED0
-	.align 2, 0
-_08111ED0:
-	.4byte _08111EEC
-	.4byte _08111F68
-	.4byte _08111F88
-	.4byte _08111FDC
-	.4byte _08111FE2
-	.4byte _08112048
-	.4byte _081120B4
-_08111EEC:
-	movs r0, 0x80
-	lsls r0, 19
-	movs r4, 0
-	strh r4, [r0]
-	movs r0, 0
-	bl SetHBlankCallback
-	movs r0, 0
-	bl SetVBlankCallback
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	ldr r1, _08111F3C @ =gReservedSpritePaletteCount
-	movs r0, 0x4
-	strb r0, [r1]
-	ldr r0, _08111F40 @ =gUnknown_030042A4
-	strh r4, [r0]
-	ldr r0, _08111F44 @ =gUnknown_030042A0
-	strh r4, [r0]
-	ldr r0, _08111F48 @ =gUnknown_030042C0
-	strh r4, [r0]
-	ldr r0, _08111F4C @ =gUnknown_030041B4
-	strh r4, [r0]
-	ldr r0, _08111F50 @ =gUnknown_03004288
-	strh r4, [r0]
-	ldr r0, _08111F54 @ =gUnknown_03004280
-	strh r4, [r0]
-	ldr r1, _08111F58 @ =gUnknown_030041B0
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r0, _08111F5C @ =gUnknown_030041B8
-	strh r4, [r0]
-	ldr r1, _08111F60 @ =gMain
-	ldr r0, _08111F64 @ =0x0000043c
-	adds r1, r0
-	b _0811208E
-	.align 2, 0
-_08111F3C: .4byte gReservedSpritePaletteCount
-_08111F40: .4byte gUnknown_030042A4
-_08111F44: .4byte gUnknown_030042A0
-_08111F48: .4byte gUnknown_030042C0
-_08111F4C: .4byte gUnknown_030041B4
-_08111F50: .4byte gUnknown_03004288
-_08111F54: .4byte gUnknown_03004280
-_08111F58: .4byte gUnknown_030041B0
-_08111F5C: .4byte gUnknown_030041B8
-_08111F60: .4byte gMain
-_08111F64: .4byte 0x0000043c
-_08111F68:
-	ldr r4, _08111F80 @ =gWindowConfig_81E6F84
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	ldr r0, _08111F84 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0x4
-	adds r1, r4, 0
-	bl InitWindowFromConfig
-	b _08112088
-	.align 2, 0
-_08111F80: .4byte gWindowConfig_81E6F84
-_08111F84: .4byte gUnknown_03004828
-_08111F88:
-	ldr r4, _08111FC8 @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	movs r0, 0x2
-	bl SetTextWindowBaseTileNum
-	ldr r1, [r4]
-	adds r1, 0x34
-	strb r0, [r1]
-	ldr r0, [r4]
-	adds r0, 0x4
-	bl LoadTextWindowGraphics
-	bl MenuZeroFillScreen
-	bl ResetPaletteFade
-	ldr r1, _08111FCC @ =gMain
-	ldr r0, _08111FD0 @ =0x0000043c
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r0, _08111FD4 @ =HBlankCB_EvolutionScene
-	bl SetHBlankCallback
-	ldr r0, _08111FD8 @ =VBlankCB_TradeEvolutionScene
-	bl SetVBlankCallback
-	b _081120D6
-	.align 2, 0
-_08111FC8: .4byte gUnknown_03004828
-_08111FCC: .4byte gMain
-_08111FD0: .4byte 0x0000043c
-_08111FD4: .4byte HBlankCB_EvolutionScene
-_08111FD8: .4byte VBlankCB_TradeEvolutionScene
-_08111FDC:
-	bl sub_804E22C
-	b _08112088
-_08111FE2:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetMonData
-	adds r6, r0, 0
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	adds r5, r0, 0
-	lsls r0, r7, 3
-	ldr r1, _08112034 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _08112038 @ =gMonFrontPicCoords
-	lsls r2, r7, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r4, _0811203C @ =gUnknown_081FAF4C
-	ldr r4, [r4, 0xC]
-	str r4, [sp]
-	str r7, [sp, 0x4]
-	bl DecompressPicFromTable_2
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r5, 0
-	bl sub_80409C8
-	ldr r0, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	ldr r1, _08112040 @ =gMain
-	ldr r0, _08112044 @ =0x0000043c
-	adds r1, r0
-	b _0811208E
-	.align 2, 0
-_08112034: .4byte gMonFrontPicTable
-_08112038: .4byte gMonFrontPicCoords
-_0811203C: .4byte gUnknown_081FAF4C
-_08112040: .4byte gMain
-_08112044: .4byte 0x0000043c
-_08112048:
-	adds r0, r7, 0
-	movs r1, 0x3
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _08112098 @ =gUnknown_02024E8C
-	ldr r1, _0811209C @ =gDummySpriteAffineAnimTable
-	str r1, [r0, 0x10]
-	movs r1, 0x78
-	movs r2, 0x40
-	movs r3, 0x1E
-	bl CreateSprite
-	ldr r1, _081120A0 @ =0x02014800
-	lsls r2, r0, 24
-	lsrs r2, 24
-	strb r0, [r1, 0x1]
-	ldr r3, _081120A4 @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r0, r3, 0
-	adds r0, 0x1C
-	adds r0, r1, r0
-	ldr r2, _081120A8 @ =nullsub_37
-	str r2, [r0]
-	adds r1, r3
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	movs r2, 0x20
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-_08112088:
-	ldr r1, _081120AC @ =gMain
-	ldr r2, _081120B0 @ =0x0000043c
-	adds r1, r2
-_0811208E:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _081120D6
-	.align 2, 0
-_08112098: .4byte gUnknown_02024E8C
-_0811209C: .4byte gDummySpriteAffineAnimTable
-_081120A0: .4byte 0x02014800
-_081120A4: .4byte gSprites
-_081120A8: .4byte nullsub_37
-_081120AC: .4byte gMain
-_081120B0: .4byte 0x0000043c
-_081120B4:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, _081120E0 @ =CB2_EvolutionSceneUpdate_1
-	bl SetMainCallback2
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0x9A
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-_081120D6:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081120E0: .4byte CB2_EvolutionSceneUpdate_1
-	thumb_func_end CB2_TradeEvolutionSceneLoadGraphics
-
-	thumb_func_start TradeEvolutionScene
-TradeEvolutionScene: @ 81120E4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x24
-	str r0, [sp, 0x1C]
-	adds r5, r1, 0
-	adds r4, r2, 0
-	mov r10, r3
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r10
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	ldr r0, [sp, 0x1C]
-	movs r1, 0x2
-	add r2, sp, 0x8
-	bl GetMonData
-	ldr r0, _08112234 @ =gStringVar1
-	add r1, sp, 0x8
-	bl StringCopy10
-	ldr r0, _08112238 @ =gStringVar2
-	movs r1, 0xB
-	muls r1, r5
-	ldr r2, _0811223C @ =gSpeciesNames
-	adds r1, r2
-	bl StringCopy
-	ldr r1, _08112240 @ =gAffineAnimsDisabled
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, [sp, 0x1C]
-	movs r1, 0xB
-	bl GetMonData
-	mov r8, r0
-	mov r1, r8
-	lsls r1, 16
-	lsrs r1, 16
-	mov r8, r1
-	ldr r0, [sp, 0x1C]
-	movs r1, 0
-	bl GetMonData
-	adds r6, r0, 0
-	ldr r0, [sp, 0x1C]
-	movs r1, 0x1
-	bl GetMonData
-	adds r7, r0, 0
-	ldr r2, _08112244 @ =0x02014800
-	mov r9, r2
-	strb r4, [r2]
-	lsls r0, r5, 3
-	ldr r1, _08112248 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _0811224C @ =gMonFrontPicCoords
-	lsls r2, r5, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	movs r3, 0x80
-	lsls r3, 18
-	ldr r4, _08112250 @ =gUnknown_081FAF4C
-	ldr r4, [r4, 0x4]
-	str r4, [sp]
-	str r5, [sp, 0x4]
-	bl DecompressPicFromTable_2
-	adds r0, r5, 0
-	adds r1, r7, 0
-	adds r2, r6, 0
-	bl sub_80409C8
-	ldr r0, [r0]
-	movs r1, 0x90
-	lsls r1, 1
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl GetMonSpriteTemplate_803C56C
-	ldr r0, _08112254 @ =gUnknown_02024E8C
-	ldr r1, _08112258 @ =gDummySpriteAffineAnimTable
-	str r1, [r0, 0x10]
-	movs r1, 0x78
-	movs r2, 0x40
-	movs r3, 0x1E
-	bl CreateSprite
-	lsls r1, r0, 24
-	lsrs r2, r1, 24
-	mov r1, r9
-	strb r0, [r1, 0x1]
-	ldr r3, _0811225C @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r0, r3, 0
-	adds r0, 0x1C
-	adds r0, r1, r0
-	ldr r2, _08112260 @ =nullsub_37
-	str r2, [r0]
-	adds r1, r3
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	movs r2, 0x20
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl LoadEvoSparkleSpriteAndPal
-	ldr r0, _08112264 @ =Task_TradeEvolutionScene
-	movs r1, 0
-	bl CreateTask
-	lsls r1, r0, 24
-	lsrs r2, r1, 24
-	mov r1, r9
-	strb r0, [r1, 0x2]
-	ldr r1, _08112268 @ =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0
-	strh r2, [r0, 0x8]
-	mov r1, r8
-	strh r1, [r0, 0xE]
-	strh r5, [r0, 0x10]
-	mov r2, sp
-	ldrh r2, [r2, 0x1C]
-	strh r2, [r0, 0xA]
-	ldr r1, [sp, 0x1C]
-	lsrs r1, 16
-	str r1, [sp, 0x20]
-	strh r1, [r0, 0xC]
-	movs r1, 0x1
-	strh r1, [r0, 0x14]
-	movs r1, 0
-	strh r1, [r0, 0x1E]
-	mov r2, r10
-	strh r2, [r0, 0x20]
-	ldr r0, _0811226C @ =CB2_EvolutionSceneUpdate_1
-	bl SetMainCallback2
-	add sp, 0x24
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08112234: .4byte gStringVar1
-_08112238: .4byte gStringVar2
-_0811223C: .4byte gSpeciesNames
-_08112240: .4byte gAffineAnimsDisabled
-_08112244: .4byte 0x02014800
-_08112248: .4byte gMonFrontPicTable
-_0811224C: .4byte gMonFrontPicCoords
-_08112250: .4byte gUnknown_081FAF4C
-_08112254: .4byte gUnknown_02024E8C
-_08112258: .4byte gDummySpriteAffineAnimTable
-_0811225C: .4byte gSprites
-_08112260: .4byte nullsub_37
-_08112264: .4byte Task_TradeEvolutionScene
-_08112268: .4byte gTasks
-_0811226C: .4byte CB2_EvolutionSceneUpdate_1
-	thumb_func_end TradeEvolutionScene
-
-	thumb_func_start CB2_EvolutionSceneUpdate_0
-CB2_EvolutionSceneUpdate_0: @ 8112270
-	push {lr}
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r0, _0811228C @ =gUnknown_03004210
-	bl sub_800374C
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811228C: .4byte gUnknown_03004210
-	thumb_func_end CB2_EvolutionSceneUpdate_0
-
-	thumb_func_start CB2_EvolutionSceneUpdate_1
-CB2_EvolutionSceneUpdate_1: @ 8112290
-	push {lr}
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r0, _081122B0 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0x4
-	bl sub_80035AC
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081122B0: .4byte gUnknown_03004828
-	thumb_func_end CB2_EvolutionSceneUpdate_1
-
-	thumb_func_start CreateShedinja
-CreateShedinja: @ 81122B4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r10, r1
-	lsls r0, 16
-	lsrs r7, r0, 16
-	movs r0, 0
-	str r0, [sp]
-	ldr r0, _081123F4 @ =gEvolutionTable
-	mov r8, r0
-	lsls r1, r7, 2
-	mov r9, r1
-	adds r0, r1, r7
-	lsls r4, r0, 3
-	mov r0, r8
-	adds r6, r4, r0
-	ldrh r0, [r6]
-	cmp r0, 0xD
-	beq _081122E2
-	b _081123E2
-_081122E2:
-	ldr r1, _081123F8 @ =gPlayerPartyCount
-	ldrb r0, [r1]
-	cmp r0, 0x5
-	bhi _081123E2
-	adds r1, r0, 0
-	movs r0, 0x64
-	muls r1, r0
-	ldr r0, _081123FC @ =gPlayerParty
-	adds r5, r1, r0
-	adds r0, r5, 0
-	mov r1, r10
-	movs r2, 0x64
-	bl CopyMon
-	mov r1, r8
-	adds r2, r1, r4
-	adds r2, 0xC
-	adds r0, r5, 0
-	movs r1, 0xB
-	bl SetMonData
-	ldrh r1, [r6, 0xC]
-	movs r0, 0xB
-	adds r2, r1, 0
-	muls r2, r0
-	ldr r0, _08112400 @ =gSpeciesNames
-	adds r2, r0
-	adds r0, r5, 0
-	movs r1, 0x2
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0x8
-	mov r2, sp
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xA
-	mov r2, sp
-	bl SetMonData
-	movs r4, 0x32
-	mov r6, r9
-_08112342:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	mov r2, sp
-	bl SetMonData
-	adds r4, 0x1
-	cmp r4, 0x36
-	ble _08112342
-	movs r4, 0x43
-_08112354:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	mov r2, sp
-	bl SetMonData
-	adds r4, 0x1
-	cmp r4, 0x4F
-	ble _08112354
-	adds r0, r5, 0
-	movs r1, 0x37
-	mov r2, sp
-	bl SetMonData
-	movs r0, 0xFF
-	str r0, [sp]
-	adds r0, r5, 0
-	movs r1, 0x40
-	mov r2, sp
-	bl SetMonData
-	adds r0, r5, 0
-	bl CalculateMonStats
-	bl CalculatePlayerPartyCount
-	ldr r0, _081123F4 @ =gEvolutionTable
-	adds r4, r6, r7
-	lsls r4, 3
-	adds r4, r0
-	ldrh r0, [r4, 0xC]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x2
-	bl GetNationalPokedexFlag
-	ldrh r0, [r4, 0xC]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl GetNationalPokedexFlag
-	adds r0, r5, 0
-	movs r1, 0xB
-	bl GetMonData
-	ldr r1, _08112404 @ =0x0000012f
-	cmp r0, r1
-	bne _081123E2
-	adds r0, r5, 0
-	movs r1, 0x3
-	bl GetMonData
-	cmp r0, 0x1
-	bne _081123E2
-	mov r0, r10
-	movs r1, 0xB
-	bl GetMonData
-	movs r1, 0x97
-	lsls r1, 1
-	cmp r0, r1
-	bne _081123E2
-	ldr r2, _08112408 @ =gUnknown_083F868C
-	adds r0, r5, 0
-	movs r1, 0x2
-	bl SetMonData
-_081123E2:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081123F4: .4byte gEvolutionTable
-_081123F8: .4byte gPlayerPartyCount
-_081123FC: .4byte gPlayerParty
-_08112400: .4byte gSpeciesNames
-_08112404: .4byte 0x0000012f
-_08112408: .4byte gUnknown_083F868C
-	thumb_func_end CreateShedinja
-
-	thumb_func_start Task_EvolutionScene
-Task_EvolutionScene: @ 811240C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x18
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r2, _08112490 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r3, r0, r2
-	movs r1, 0xA
-	ldrsh r0, [r3, r1]
-	mov r9, r0
-	movs r1, 0xC
-	ldrsh r0, [r3, r1]
-	lsls r0, 16
-	mov r1, r9
-	orrs r1, r0
-	mov r9, r1
-	ldr r0, _08112494 @ =gMain
-	ldrh r1, [r0, 0x2C]
-	adds r6, r2, 0
-	adds r4, r0, 0
-	cmp r1, 0x2
-	bne _0811246E
-	movs r2, 0x8
-	ldrsh r0, [r3, r2]
-	cmp r0, 0x8
-	bne _0811246E
-	ldrh r1, [r3, 0x12]
-	movs r2, 0x1
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0811246E
-	movs r0, 0x10
-	strh r0, [r3, 0x8]
-	ldr r0, _08112498 @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r1, r0, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _0811246E
-	strh r2, [r1, 0x18]
-_0811246E:
-	lsls r1, r7, 2
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r0, r6
-	movs r3, 0x8
-	ldrsh r0, [r0, r3]
-	mov r8, r1
-	cmp r0, 0x15
-	bls _08112484
-	bl _08112FD0
-_08112484:
-	lsls r0, 2
-	ldr r1, _0811249C @ =_081124A0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08112490: .4byte gTasks
-_08112494: .4byte gMain
-_08112498: .4byte gBattleCommunication
-_0811249C: .4byte _081124A0
-	.align 2, 0
-_081124A0:
-	.4byte _081124F8
-	.4byte _0811253C
-	.4byte _08112588
-	.4byte _08112594
-	.4byte _081125BC
-	.4byte _081125FC
-	.4byte _08112630
-	.4byte _0811266C
-	.4byte _081126A0
-	.4byte _081126E0
-	.4byte _081126FC
-	.4byte _08112728
-	.4byte _08112754
-	.4byte _081127A0
-	.4byte _0811284C
-	.4byte _081128E4
-	.4byte _08112934
-	.4byte _08112974
-	.4byte _081129A0
-	.4byte _081129E8
-	.4byte _08112A4C
-	.4byte _08112A88
-_081124F8:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r2, _08112530 @ =gSprites
-	ldr r0, _08112534 @ =0x02014800
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldr r0, _08112538 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_08112530: .4byte gSprites
-_08112534: .4byte 0x02014800
-_08112538: .4byte gTasks
-_0811253C:
-	ldr r0, _08112574 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0811254C
-	bl _08112FD0
-_0811254C:
-	ldr r4, _08112578 @ =gStringVar4
-	ldr r1, _0811257C @ =gUnknown_08400C4A
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, _08112580 @ =gUnknown_03004210
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112584 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_08112574: .4byte gPaletteFade
-_08112578: .4byte gStringVar4
-_0811257C: .4byte gUnknown_08400C4A
-_08112580: .4byte gUnknown_03004210
-_08112584: .4byte gTasks
-_08112588:
-	ldr r0, _08112590 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	b _0811297C
-	.align 2, 0
-_08112590: .4byte gUnknown_03004210
-_08112594:
-	bl IsCryFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _081125A2
-	bl _08112FD0
-_081125A2:
-	movs r0, 0xBC
-	lsls r0, 1
-	bl PlaySE
-	ldr r0, _081125B8 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_081125B8: .4byte gTasks
-_081125BC:
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	beq _081125CC
-	bl _08112FD0
-_081125CC:
-	ldr r0, _081125F4 @ =0x00000179
-	bl PlayNewMapMusic
-	ldr r0, _081125F8 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	str r4, [sp]
-	movs r0, 0x1C
-	movs r1, 0x4
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	bl _08112FD0
-	.align 2, 0
-_081125F4: .4byte 0x00000179
-_081125F8: .4byte gTasks
-_081125FC:
-	ldr r0, _08112624 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0811260C
-	bl _08112FD0
-_0811260C:
-	movs r0, 0x11
-	bl LaunchTask_PreEvoSparklesSet1
-	ldr r1, _08112628 @ =gBattleCommunication
-	strb r0, [r1, 0x2]
-	ldr r0, _0811262C @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_08112624: .4byte gPaletteFade
-_08112628: .4byte gBattleCommunication
-_0811262C: .4byte gTasks
-_08112630:
-	ldr r4, _08112664 @ =gBattleCommunication
-	ldrb r0, [r4, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _08112646
-	bl _08112FD0
-_08112646:
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r6
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	ldr r1, _08112668 @ =0x02014800
-	movs r0, 0x1
-	strb r0, [r1, 0x3]
-	bl LaunchTask_PreEvoSparklesSet2
-	strb r0, [r4, 0x2]
-	bl _08112FD0
-	.align 2, 0
-_08112664: .4byte gBattleCommunication
-_08112668: .4byte 0x02014800
-_0811266C:
-	ldr r4, _08112698 @ =gBattleCommunication
-	ldrb r0, [r4, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _08112682
-	bl _08112FD0
-_08112682:
-	ldr r1, _0811269C @ =0x02014800
-	ldrb r0, [r1]
-	ldrb r1, [r1, 0x1]
-	bl sub_8149E7C
-	strb r0, [r4, 0x2]
-	mov r0, r8
-	adds r1, r0, r7
-	lsls r1, 3
-	adds r1, r6
-	b _08112A2E
-	.align 2, 0
-_08112698: .4byte gBattleCommunication
-_0811269C: .4byte 0x02014800
-_081126A0:
-	ldr r1, _081126D8 @ =0x02014800
-	ldrb r0, [r1, 0x3]
-	subs r0, 0x1
-	strb r0, [r1, 0x3]
-	lsls r0, 24
-	cmp r0, 0
-	beq _081126B2
-	bl _08112FD0
-_081126B2:
-	movs r0, 0x3
-	strb r0, [r1, 0x3]
-	ldr r0, _081126DC @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	beq _081126CC
-	bl _08112FD0
-_081126CC:
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r6
-	b _08112A2E
-	.align 2, 0
-_081126D8: .4byte 0x02014800
-_081126DC: .4byte gBattleCommunication
-_081126E0:
-	bl LaunchTask_PostEvoSparklesSet1
-	ldr r1, _081126F4 @ =gBattleCommunication
-	strb r0, [r1, 0x2]
-	ldr r0, _081126F8 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_081126F4: .4byte gBattleCommunication
-_081126F8: .4byte gTasks
-_081126FC:
-	ldr r5, _08112724 @ =gBattleCommunication
-	ldrb r0, [r5, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _08112712
-	bl _08112FD0
-_08112712:
-	mov r0, r8
-	adds r4, r0, r7
-	lsls r4, 3
-	adds r4, r6
-	ldrh r0, [r4, 0x10]
-	bl LaunchTask_PostEvoSparklesSet2AndFlash
-	strb r0, [r5, 0x2]
-	b _08112992
-	.align 2, 0
-_08112724: .4byte gBattleCommunication
-_08112728:
-	ldr r0, _08112750 @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	beq _0811273E
-	bl _08112FD0
-_0811273E:
-	movs r0, 0x21
-	bl PlaySE
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r6
-	b _08112A2E
-	.align 2, 0
-_08112750: .4byte gBattleCommunication
-_08112754:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08112762
-	bl _08112FD0
-_08112762:
-	bl m4aMPlayAllStop
-	ldr r0, _08112794 @ =gTasks
-	mov r3, r8
-	adds r4, r3, r7
-	lsls r4, 3
-	adds r4, r0
-	ldrh r0, [r4, 0x10]
-	movs r1, 0
-	bl PlayCry1
-	ldr r0, _08112798 @ =gPlttBufferUnfaded + 0x40
-	ldr r1, _0811279C @ =0x02009000
-	movs r2, 0x60
-	bl memcpy
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x1C
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _08112992
-	.align 2, 0
-_08112794: .4byte gTasks
-_08112798: .4byte gPlttBufferUnfaded + 0x40
-_0811279C: .4byte 0x02009000
-_081127A0:
-	bl IsCryFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _081127AE
-	bl _08112FD0
-_081127AE:
-	ldr r0, _08112834 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _081127BE
-	bl _08112FD0
-_081127BE:
-	ldr r4, _08112838 @ =gStringVar4
-	ldr r1, _0811283C @ =gUnknown_08400C60
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, _08112840 @ =gUnknown_03004210
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112844 @ =0x00000173
-	bl PlayBGM
-	ldr r2, _08112848 @ =gTasks
-	mov r0, r8
-	adds r1, r0, r7
-	lsls r1, 3
-	adds r4, r1, r2
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	adds r2, r1
-	adds r2, 0x10
-	mov r0, r9
-	movs r1, 0xB
-	bl SetMonData
-	mov r0, r9
-	bl CalculateMonStats
-	ldrh r1, [r4, 0xE]
-	ldrh r2, [r4, 0x10]
-	mov r0, r9
-	bl EvolutionRenameMon
-	ldrh r0, [r4, 0x10]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x2
-	bl GetNationalPokedexFlag
-	ldrh r0, [r4, 0x10]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl GetNationalPokedexFlag
-	movs r0, 0xE
-	bl IncrementGameStat
-	b _08112FD0
-	.align 2, 0
-_08112834: .4byte gPaletteFade
-_08112838: .4byte gStringVar4
-_0811283C: .4byte gUnknown_08400C60
-_08112840: .4byte gUnknown_03004210
-_08112844: .4byte 0x00000173
-_08112848: .4byte gTasks
-_0811284C:
-	ldr r0, _081128A4 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	beq _08112856
-	b _08112FD0
-_08112856:
-	mov r1, r8
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r5, r0, r6
-	ldrb r1, [r5, 0x14]
-	mov r0, r9
-	bl sub_803B7C8
-	lsls r0, 16
-	lsrs r6, r0, 16
-	cmp r6, 0
-	beq _081128C4
-	movs r2, 0x1E
-	ldrsh r4, [r5, r2]
-	cmp r4, 0
-	bne _081128C4
-	bl sub_8053E90
-	ldrh r1, [r5, 0x12]
-	movs r0, 0x80
-	orrs r0, r1
-	strh r0, [r5, 0x12]
-	strh r4, [r5, 0x14]
-	strh r4, [r5, 0x18]
-	mov r0, r9
-	movs r1, 0x2
-	add r2, sp, 0x4
-	bl GetMonData
-	ldr r0, _081128A8 @ =gBattleTextBuff1
-	add r1, sp, 0x4
-	bl StringCopy10
-	ldr r0, _081128AC @ =0x0000ffff
-	cmp r6, r0
-	bne _081128B0
-	movs r0, 0x15
-	strh r0, [r5, 0x8]
-	b _08112FD0
-	.align 2, 0
-_081128A4: .4byte gUnknown_03004210
-_081128A8: .4byte gBattleTextBuff1
-_081128AC: .4byte 0x0000ffff
-_081128B0:
-	ldr r0, _081128C0 @ =0x0000fffe
-	cmp r6, r0
-	bne _081128B8
-	b _08112FD0
-_081128B8:
-	movs r0, 0x13
-	strh r0, [r5, 0x8]
-	b _08112FD0
-	.align 2, 0
-_081128C0: .4byte 0x0000fffe
-_081128C4:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, _081128E0 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	b _08112A2E
-	.align 2, 0
-_081128E0: .4byte gTasks
-_081128E4:
-	ldr r0, _0811292C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r2, 0x80
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _081128F4
-	b _08112FD0
-_081128F4:
-	mov r1, r8
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r4, r0, r6
-	ldrh r1, [r4, 0x12]
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _0811290A
-	bl sub_8053E90
-_0811290A:
-	movs r2, 0x1E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _0811291A
-	ldrh r0, [r4, 0xE]
-	mov r1, r9
-	bl CreateShedinja
-_0811291A:
-	adds r0, r7, 0
-	bl DestroyTask
-	ldr r0, _08112930 @ =gUnknown_03005E94
-	ldr r0, [r0]
-	bl SetMainCallback2
-	b _08112FD0
-	.align 2, 0
-_0811292C: .4byte gPaletteFade
-_08112930: .4byte gUnknown_03005E94
-_08112934:
-	ldr r0, _08112968 @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	beq _08112948
-	b _08112FD0
-_08112948:
-	bl m4aMPlayAllStop
-	ldr r0, _0811296C @ =0x0006001c
-	ldr r1, _08112970 @ =0x00007fff
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r6
-	b _08112A2E
-	.align 2, 0
-_08112968: .4byte gBattleCommunication
-_0811296C: .4byte 0x0006001c
-_08112970: .4byte 0x00007fff
-_08112974:
-	ldr r0, _0811299C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-_0811297C:
-	cmp r0, 0
-	beq _08112982
-	b _08112FD0
-_08112982:
-	mov r0, r8
-	adds r4, r0, r7
-	lsls r4, 3
-	adds r4, r6
-	ldrh r0, [r4, 0xE]
-	movs r1, 0
-	bl PlayCry1
-_08112992:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _08112FD0
-	.align 2, 0
-_0811299C: .4byte gPaletteFade
-_081129A0:
-	bl IsCryFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _081129AC
-	b _08112FD0
-_081129AC:
-	ldr r4, _081129D8 @ =gStringVar4
-	ldr r1, _081129DC @ =gUnknown_08400C8D
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, _081129E0 @ =gUnknown_03004210
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _081129E4 @ =gTasks
-	mov r2, r8
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1
-	strh r1, [r0, 0x1E]
-	b _08112F9A
-	.align 2, 0
-_081129D8: .4byte gStringVar4
-_081129DC: .4byte gUnknown_08400C8D
-_081129E0: .4byte gUnknown_03004210
-_081129E4: .4byte gTasks
-_081129E8:
-	ldr r4, _08112A38 @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	beq _081129F2
-	b _08112FD0
-_081129F2:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _081129FE
-	b _08112FD0
-_081129FE:
-	bl sub_8024CEC
-	ldr r0, _08112A3C @ =0x0000016f
-	bl PlayFanfare
-	ldr r0, _08112A40 @ =gBattleStringsTable
-	ldr r0, [r0, 0xC]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112A44 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112A48 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x40
-	strh r0, [r1, 0x14]
-_08112A2E:
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	b _08112FD0
-	.align 2, 0
-_08112A38: .4byte gUnknown_03004210
-_08112A3C: .4byte 0x0000016f
-_08112A40: .4byte gBattleStringsTable
-_08112A44: .4byte gDisplayedStringBattle
-_08112A48: .4byte gTasks
-_08112A4C:
-	ldr r0, _08112A80 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	beq _08112A56
-	b _08112FD0
-_08112A56:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08112A62
-	b _08112FD0
-_08112A62:
-	ldr r0, _08112A84 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x14]
-	subs r0, 0x1
-	strh r0, [r1, 0x14]
-	lsls r0, 16
-	cmp r0, 0
-	beq _08112A7A
-	b _08112FD0
-_08112A7A:
-	movs r0, 0xE
-	strh r0, [r1, 0x8]
-	b _08112FD0
-	.align 2, 0
-_08112A80: .4byte gUnknown_03004210
-_08112A84: .4byte gTasks
-_08112A88:
-	mov r3, r8
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r0, r6
-	movs r1, 0x18
-	ldrsh r0, [r0, r1]
-	cmp r0, 0xB
-	bls _08112A9A
-	b _08112FD0
-_08112A9A:
-	lsls r0, 2
-	ldr r1, _08112AA4 @ =_08112AA8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08112AA4: .4byte _08112AA8
-	.align 2, 0
-_08112AA8:
-	.4byte _08112AD8
-	.4byte _08112B2C
-	.4byte _08112B7C
-	.4byte _08112BC0
-	.4byte _08112C0C
-	.4byte _08112D3C
-	.4byte _08112D8C
-	.4byte _08112E98
-	.4byte _08112EE8
-	.4byte _08112F38
-	.4byte _08112F78
-	.4byte _08112FB0
-_08112AD8:
-	ldr r4, _08112B1C @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	beq _08112AE2
-	b _08112FD0
-_08112AE2:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08112AEE
-	b _08112FD0
-_08112AEE:
-	bl sub_8024CEC
-	ldr r0, _08112B20 @ =gBattleStringsTable
-	ldr r0, [r0, 0x10]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112B24 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112B28 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08112FCE
-	.align 2, 0
-_08112B1C: .4byte gUnknown_03004210
-_08112B20: .4byte gBattleStringsTable
-_08112B24: .4byte gDisplayedStringBattle
-_08112B28: .4byte gTasks
-_08112B2C:
-	ldr r4, _08112B6C @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	beq _08112B36
-	b _08112FD0
-_08112B36:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08112B42
-	b _08112FD0
-_08112B42:
-	ldr r0, _08112B70 @ =gBattleStringsTable
-	ldr r0, [r0, 0x14]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112B74 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112B78 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08112FCE
-	.align 2, 0
-_08112B6C: .4byte gUnknown_03004210
-_08112B70: .4byte gBattleStringsTable
-_08112B74: .4byte gDisplayedStringBattle
-_08112B78: .4byte gTasks
-_08112B7C:
-	ldr r4, _08112BF8 @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	beq _08112B86
-	b _08112FD0
-_08112B86:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08112BC0
-	ldr r0, _08112BFC @ =gBattleStringsTable
-	ldr r0, [r0, 0x18]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112C00 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112C04 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x5
-	strh r0, [r1, 0x1A]
-	movs r0, 0x9
-	strh r0, [r1, 0x1C]
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	strh r0, [r1, 0x18]
-_08112BC0:
-	ldr r0, _08112BF8 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	beq _08112BCA
-	b _08112FD0
-_08112BCA:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08112BD6
-	b _08112FD0
-_08112BD6:
-	bl sub_8023A80
-	ldr r0, _08112C04 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	movs r2, 0
-	strh r0, [r1, 0x18]
-	ldr r0, _08112C08 @ =gBattleCommunication
-	strb r2, [r0, 0x1]
-	bl sub_802BC6C
-	b _08112FD0
-	.align 2, 0
-_08112BF8: .4byte gUnknown_03004210
-_08112BFC: .4byte gBattleStringsTable
-_08112C00: .4byte gDisplayedStringBattle
-_08112C04: .4byte gTasks
-_08112C08: .4byte gBattleCommunication
-_08112C0C:
-	ldr r0, _08112CA4 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08112C32
-	ldr r4, _08112CA8 @ =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _08112C32
-	movs r0, 0x5
-	bl PlaySE
-	bl nullsub_6
-	movs r0, 0
-	strb r0, [r4, 0x1]
-	bl sub_802BC6C
-_08112C32:
-	ldr r0, _08112CA4 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08112C58
-	ldr r4, _08112CA8 @ =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _08112C58
-	movs r0, 0x5
-	bl PlaySE
-	bl nullsub_6
-	movs r0, 0x1
-	strb r0, [r4, 0x1]
-	bl sub_802BC6C
-_08112C58:
-	ldr r0, _08112CA4 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08112CE2
-	bl sub_8023AD8
-	ldr r0, _08112CAC @ =gBattleStringsTable
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112CB0 @ =gUnknown_03004210
-	ldr r1, _08112CB4 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _08112CA8 @ =gBattleCommunication
-	ldrb r2, [r0, 0x1]
-	cmp r2, 0
-	beq _08112CBC
-	ldr r0, _08112CB8 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x1C]
-	strh r0, [r1, 0x18]
-	b _08112CE2
-	.align 2, 0
-_08112CA4: .4byte gMain
-_08112CA8: .4byte gBattleCommunication
-_08112CAC: .4byte gBattleStringsTable
-_08112CB0: .4byte gUnknown_03004210
-_08112CB4: .4byte gDisplayedStringBattle
-_08112CB8: .4byte gTasks
-_08112CBC:
-	ldr r0, _08112D28 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x1A]
-	strh r0, [r1, 0x18]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x5
-	bne _08112CE2
-	movs r0, 0x1
-	negs r0, r0
-	str r2, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-_08112CE2:
-	ldr r0, _08112D2C @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08112CF0
-	b _08112FD0
-_08112CF0:
-	bl sub_8023AD8
-	ldr r0, _08112D30 @ =gBattleStringsTable
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112D34 @ =gUnknown_03004210
-	ldr r1, _08112D38 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _08112D28 @ =gTasks
-	mov r2, r8
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x1C]
-	strh r1, [r0, 0x18]
-	b _08112FD0
-	.align 2, 0
-_08112D28: .4byte gTasks
-_08112D2C: .4byte gMain
-_08112D30: .4byte gBattleStringsTable
-_08112D34: .4byte gUnknown_03004210
-_08112D38: .4byte gDisplayedStringBattle
-_08112D3C:
-	ldr r0, _08112D78 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08112D4A
-	b _08112FD0
-_08112D4A:
-	ldr r0, _08112D7C @ =gPlayerParty
-	mov r3, r8
-	adds r5, r3, r7
-	lsls r5, 3
-	adds r5, r6
-	ldrh r1, [r5, 0x20]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _08112D80 @ =gPlayerPartyCount
-	ldrb r2, [r2]
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r3, _08112D84 @ =CB2_EvolutionSceneLoadGraphics
-	ldr r4, _08112D88 @ =word_2024E82
-	ldrh r4, [r4]
-	str r4, [sp]
-	bl sub_809D9F0
-	ldrh r0, [r5, 0x18]
-	adds r0, 0x1
-	strh r0, [r5, 0x18]
-	b _08112FD0
-	.align 2, 0
-_08112D78: .4byte gPaletteFade
-_08112D7C: .4byte gPlayerParty
-_08112D80: .4byte gPlayerPartyCount
-_08112D84: .4byte CB2_EvolutionSceneLoadGraphics
-_08112D88: .4byte word_2024E82
-_08112D8C:
-	ldr r0, _08112DC0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08112D9A
-	b _08112FD0
-_08112D9A:
-	ldr r1, [r4, 0x4]
-	ldr r0, _08112DC4 @ =CB2_EvolutionSceneUpdate_0
-	cmp r1, r0
-	beq _08112DA4
-	b _08112FD0
-_08112DA4:
-	bl sub_809FA30
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x4
-	bne _08112DCC
-	ldr r0, _08112DC8 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x9
-	b _08112FCE
-	.align 2, 0
-_08112DC0: .4byte gPaletteFade
-_08112DC4: .4byte CB2_EvolutionSceneUpdate_0
-_08112DC8: .4byte gTasks
-_08112DCC:
-	adds r1, r6, 0
-	adds r1, 0xD
-	mov r0, r9
-	bl GetMonData
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl IsHMMove2
-	cmp r0, 0
-	beq _08112E24
-	ldr r0, _08112E10 @ =gBattleStringsTable
-	ldr r3, _08112E14 @ =0x000004cc
-	adds r0, r3
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112E18 @ =gUnknown_03004210
-	ldr r1, _08112E1C @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08112E20 @ =gTasks
-	mov r2, r8
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0xB
-	strh r1, [r0, 0x18]
-	b _08112FD0
-	.align 2, 0
-_08112E10: .4byte gBattleStringsTable
-_08112E14: .4byte 0x000004cc
-_08112E18: .4byte gUnknown_03004210
-_08112E1C: .4byte gDisplayedStringBattle
-_08112E20: .4byte gTasks
-_08112E24:
-	ldr r1, _08112E80 @ =gBattleTextBuff2
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x2
-	strb r0, [r1, 0x1]
-	strb r4, [r1, 0x2]
-	lsrs r0, r4, 8
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	lsls r4, r6, 24
-	lsrs r4, 24
-	mov r0, r9
-	adds r1, r4, 0
-	bl RemoveMonPPBonus
-	ldr r0, _08112E84 @ =word_2024E82
-	ldrh r1, [r0]
-	mov r0, r9
-	adds r2, r4, 0
-	bl SetMonMoveSlot
-	ldr r0, _08112E88 @ =gBattleStringsTable
-	movs r3, 0xCF
-	lsls r3, 2
-	adds r0, r3
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112E8C @ =gUnknown_03004210
-	ldr r1, _08112E90 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112E94 @ =gTasks
-	mov r2, r8
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08112FCE
-	.align 2, 0
-_08112E80: .4byte gBattleTextBuff2
-_08112E84: .4byte word_2024E82
-_08112E88: .4byte gBattleStringsTable
-_08112E8C: .4byte gUnknown_03004210
-_08112E90: .4byte gDisplayedStringBattle
-_08112E94: .4byte gTasks
-_08112E98:
-	ldr r4, _08112ED8 @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	beq _08112EA2
-	b _08112FD0
-_08112EA2:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08112EAE
-	b _08112FD0
-_08112EAE:
-	ldr r0, _08112EDC @ =gBattleStringsTable
-	ldr r0, [r0, 0x1C]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112EE0 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08112EE4 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08112FCE
-	.align 2, 0
-_08112ED8: .4byte gUnknown_03004210
-_08112EDC: .4byte gBattleStringsTable
-_08112EE0: .4byte gDisplayedStringBattle
-_08112EE4: .4byte gTasks
-_08112EE8:
-	ldr r4, _08112F28 @ =gUnknown_03004210
-	ldrh r0, [r4, 0x16]
-	cmp r0, 0
-	bne _08112FD0
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08112FD0
-	ldr r0, _08112F2C @ =gBattleStringsTable
-	movs r1, 0xD0
-	lsls r1, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r1, _08112F30 @ =gDisplayedStringBattle
-	movs r0, 0xF
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08112F34 @ =gTasks
-	mov r2, r8
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x13
-	strh r1, [r0, 0x8]
-	b _08112FD0
-	.align 2, 0
-_08112F28: .4byte gUnknown_03004210
-_08112F2C: .4byte gBattleStringsTable
-_08112F30: .4byte gDisplayedStringBattle
-_08112F34: .4byte gTasks
-_08112F38:
-	ldr r0, _08112F68 @ =gBattleStringsTable
-	ldr r0, [r0, 0x20]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112F6C @ =gUnknown_03004210
-	ldr r1, _08112F70 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08112F74 @ =gTasks
-	mov r3, r8
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0xA
-	strh r1, [r0, 0x1A]
-	strh r2, [r0, 0x1C]
-	movs r1, 0x3
-	strh r1, [r0, 0x18]
-	b _08112FD0
-	.align 2, 0
-_08112F68: .4byte gBattleStringsTable
-_08112F6C: .4byte gUnknown_03004210
-_08112F70: .4byte gDisplayedStringBattle
-_08112F74: .4byte gTasks
-_08112F78:
-	ldr r0, _08112FA0 @ =gBattleStringsTable
-	ldr r0, [r0, 0x24]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08112FA4 @ =gUnknown_03004210
-	ldr r1, _08112FA8 @ =gDisplayedStringBattle
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x90
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08112FAC @ =gTasks
-	mov r2, r8
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-_08112F9A:
-	movs r1, 0xE
-	strh r1, [r0, 0x8]
-	b _08112FD0
-	.align 2, 0
-_08112FA0: .4byte gBattleStringsTable
-_08112FA4: .4byte gUnknown_03004210
-_08112FA8: .4byte gDisplayedStringBattle
-_08112FAC: .4byte gTasks
-_08112FB0:
-	ldr r0, _08112FE0 @ =gUnknown_03004210
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0
-	bne _08112FD0
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08112FD0
-	ldr r0, _08112FE4 @ =gTasks
-	mov r3, r8
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x5
-_08112FCE:
-	strh r0, [r1, 0x18]
-_08112FD0:
-	add sp, 0x18
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08112FE0: .4byte gUnknown_03004210
-_08112FE4: .4byte gTasks
-	thumb_func_end Task_EvolutionScene
-
-	thumb_func_start Task_TradeEvolutionScene
-Task_TradeEvolutionScene: @ 8112FE8
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x18
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r2, _0811302C @ =gTasks
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r1, 3
-	adds r1, r2
-	movs r3, 0xA
-	ldrsh r0, [r1, r3]
-	mov r8, r0
-	movs r3, 0xC
-	ldrsh r0, [r1, r3]
-	lsls r0, 16
-	mov r3, r8
-	orrs r3, r0
-	mov r8, r3
-	movs r3, 0x8
-	ldrsh r0, [r1, r3]
-	adds r6, r2, 0
-	cmp r0, 0x11
-	bls _08113020
-	bl _08113B3A
-_08113020:
-	lsls r0, 2
-	ldr r1, _08113030 @ =_08113034
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0811302C: .4byte gTasks
-_08113030: .4byte _08113034
-	.align 2, 0
-_08113034:
-	.4byte _0811307C
-	.4byte _081130B8
-	.4byte _081130DC
-	.4byte _0811310C
-	.4byte _0811314C
-	.4byte _0811318C
-	.4byte _081131C8
-	.4byte _081131F4
-	.4byte _0811322C
-	.4byte _08113248
-	.4byte _08113274
-	.4byte _081132A8
-	.4byte _081132F8
-	.4byte _081133A8
-	.4byte _0811346C
-	.4byte _08113490
-	.4byte _081134F8
-	.4byte _08113538
-_0811307C:
-	ldr r4, _081130A8 @ =gStringVar4
-	ldr r1, _081130AC @ =gUnknown_08400C4A
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, _081130B0 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _081130B4 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	b _08113298
-	.align 2, 0
-_081130A8: .4byte gStringVar4
-_081130AC: .4byte gUnknown_08400C4A
-_081130B0: .4byte gUnknown_03004828
-_081130B4: .4byte gTasks
-_081130B8:
-	ldr r0, _081130D8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _081130C6
-	bl _08113B3A
-_081130C6:
-	lsls r4, r7, 2
-	adds r4, r7
-	lsls r4, 3
-	adds r4, r6
-	ldrh r0, [r4, 0xE]
-	movs r1, 0
-	bl PlayCry1
-	b _081132E2
-	.align 2, 0
-_081130D8: .4byte gUnknown_03004828
-_081130DC:
-	bl IsCryFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _081130EA
-	bl _08113B3A
-_081130EA:
-	ldr r0, _08113104 @ =0x00000179
-	bl m4aSongNumStop
-	movs r0, 0xBC
-	lsls r0, 1
-	bl PlaySE
-	ldr r1, _08113108 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	b _08113298
-	.align 2, 0
-_08113104: .4byte 0x00000179
-_08113108: .4byte gTasks
-_0811310C:
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	beq _0811311C
-	bl _08113B3A
-_0811311C:
-	ldr r0, _08113144 @ =0x00000179
-	bl PlayBGM
-	ldr r1, _08113148 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	str r5, [sp]
-	movs r0, 0x1C
-	movs r1, 0x4
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	bl _08113B3A
-	.align 2, 0
-_08113144: .4byte 0x00000179
-_08113148: .4byte gTasks
-_0811314C:
-	ldr r0, _08113180 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0811315C
-	bl _08113B3A
-_0811315C:
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0x9A
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	movs r0, 0x11
-	bl LaunchTask_PreEvoSparklesSet1
-	ldr r1, _08113184 @ =gBattleCommunication
-	strb r0, [r1, 0x2]
-	ldr r1, _08113188 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	b _08113298
-	.align 2, 0
-_08113180: .4byte gPaletteFade
-_08113184: .4byte gBattleCommunication
-_08113188: .4byte gTasks
-_0811318C:
-	ldr r4, _081131C0 @ =gBattleCommunication
-	ldrb r0, [r4, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _081131A2
-	bl _08113B3A
-_081131A2:
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r6
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	ldr r1, _081131C4 @ =0x02014800
-	movs r0, 0x1
-	strb r0, [r1, 0x3]
-	bl LaunchTask_PreEvoSparklesSet2
-	strb r0, [r4, 0x2]
-	bl _08113B3A
-	.align 2, 0
-_081131C0: .4byte gBattleCommunication
-_081131C4: .4byte 0x02014800
-_081131C8:
-	ldr r4, _081131EC @ =gBattleCommunication
-	ldrb r0, [r4, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _081131DE
-	bl _08113B3A
-_081131DE:
-	ldr r1, _081131F0 @ =0x02014800
-	ldrb r0, [r1]
-	ldrb r1, [r1, 0x1]
-	bl sub_8149E7C
-	strb r0, [r4, 0x2]
-	b _08113290
-	.align 2, 0
-_081131EC: .4byte gBattleCommunication
-_081131F0: .4byte 0x02014800
-_081131F4:
-	ldr r1, _08113224 @ =0x02014800
-	ldrb r0, [r1, 0x3]
-	subs r0, 0x1
-	strb r0, [r1, 0x3]
-	lsls r0, 24
-	cmp r0, 0
-	beq _08113206
-	bl _08113B3A
-_08113206:
-	movs r0, 0x3
-	strb r0, [r1, 0x3]
-	ldr r0, _08113228 @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	beq _08113220
-	bl _08113B3A
-_08113220:
-	b _08113290
-	.align 2, 0
-_08113224: .4byte 0x02014800
-_08113228: .4byte gBattleCommunication
-_0811322C:
-	bl LaunchTask_PostEvoSparklesSet1
-	ldr r1, _08113240 @ =gBattleCommunication
-	strb r0, [r1, 0x2]
-	ldr r1, _08113244 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	b _08113298
-	.align 2, 0
-_08113240: .4byte gBattleCommunication
-_08113244: .4byte gTasks
-_08113248:
-	ldr r5, _08113270 @ =gBattleCommunication
-	ldrb r0, [r5, 0x2]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r6
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _0811325E
-	bl _08113B3A
-_0811325E:
-	lsls r4, r7, 2
-	adds r4, r7
-	lsls r4, 3
-	adds r4, r6
-	ldrh r0, [r4, 0x10]
-	bl LaunchTask_PostEvoSparklesSet2AndFlash_Trade
-	strb r0, [r5, 0x2]
-	b _081132E2
-	.align 2, 0
-_08113270: .4byte gBattleCommunication
-_08113274:
-	ldr r0, _081132A4 @ =gBattleCommunication
-	ldrb r1, [r0, 0x2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	beq _0811328A
-	bl _08113B3A
-_0811328A:
-	movs r0, 0x21
-	bl PlaySE
-_08113290:
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r6
-_08113298:
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	bl _08113B3A
-	.align 2, 0
-_081132A4: .4byte gBattleCommunication
-_081132A8:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _081132B6
-	bl _08113B3A
-_081132B6:
-	ldr r0, _081132EC @ =gTasks
-	lsls r4, r7, 2
-	adds r4, r7
-	lsls r4, 3
-	adds r4, r0
-	ldrh r0, [r4, 0x10]
-	movs r1, 0
-	bl PlayCry1
-	ldr r0, _081132F0 @ =gPlttBufferUnfaded + 0x40
-	ldr r1, _081132F4 @ =0x02009000
-	movs r2, 0x60
-	bl memcpy
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-_081132E2:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	bl _08113B3A
-	.align 2, 0
-_081132EC: .4byte gTasks
-_081132F0: .4byte gPlttBufferUnfaded + 0x40
-_081132F4: .4byte 0x02009000
-_081132F8:
-	bl IsCryFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _08113306
-	bl _08113B3A
-_08113306:
-	ldr r0, _08113390 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08113316
-	bl _08113B3A
-_08113316:
-	ldr r4, _08113394 @ =gStringVar4
-	ldr r1, _08113398 @ =gUnknown_08400C60
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, _0811339C @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _081133A0 @ =0x00000173
-	bl PlayFanfare
-	ldr r2, _081133A4 @ =gTasks
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r1, 3
-	adds r4, r1, r2
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	adds r2, r1
-	adds r2, 0x10
-	mov r0, r8
-	movs r1, 0xB
-	bl SetMonData
-	mov r0, r8
-	bl CalculateMonStats
-	ldrh r1, [r4, 0xE]
-	ldrh r2, [r4, 0x10]
-	mov r0, r8
-	bl EvolutionRenameMon
-	ldrh r0, [r4, 0x10]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x2
-	bl GetNationalPokedexFlag
-	ldrh r0, [r4, 0x10]
-	bl SpeciesToNationalPokedexNum
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x3
-	bl GetNationalPokedexFlag
-	movs r0, 0xE
-	bl IncrementGameStat
-	b _08113B3A
-	.align 2, 0
-_08113390: .4byte gPaletteFade
-_08113394: .4byte gStringVar4
-_08113398: .4byte gUnknown_08400C60
-_0811339C: .4byte gUnknown_03004828
-_081133A0: .4byte 0x00000173
-_081133A4: .4byte gTasks
-_081133A8:
-	ldr r0, _08113410 @ =gUnknown_03004828
-	ldr r0, [r0]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _081133B4
-	b _08113B3A
-_081133B4:
-	bl IsFanfareTaskInactive
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _081133C2
-	b _08113B3A
-_081133C2:
-	ldr r1, _08113414 @ =gTasks
-	lsls r4, r7, 2
-	adds r0, r4, r7
-	lsls r0, 3
-	adds r5, r0, r1
-	ldrb r1, [r5, 0x14]
-	mov r0, r8
-	bl sub_803B7C8
-	lsls r0, 16
-	lsrs r6, r0, 16
-	mov r9, r4
-	cmp r6, 0
-	beq _08113434
-	movs r3, 0x1E
-	ldrsh r2, [r5, r3]
-	cmp r2, 0
-	bne _08113434
-	ldrh r1, [r5, 0x12]
-	movs r0, 0x80
-	orrs r0, r1
-	strh r0, [r5, 0x12]
-	strh r2, [r5, 0x14]
-	strh r2, [r5, 0x18]
-	mov r0, r8
-	movs r1, 0x2
-	add r2, sp, 0x4
-	bl GetMonData
-	ldr r0, _08113418 @ =gBattleTextBuff1
-	add r1, sp, 0x4
-	bl StringCopy10
-	ldr r0, _0811341C @ =0x0000ffff
-	cmp r6, r0
-	bne _08113420
-	movs r0, 0x11
-	strh r0, [r5, 0x8]
-	b _08113B3A
-	.align 2, 0
-_08113410: .4byte gUnknown_03004828
-_08113414: .4byte gTasks
-_08113418: .4byte gBattleTextBuff1
-_0811341C: .4byte 0x0000ffff
-_08113420:
-	ldr r0, _08113430 @ =0x0000fffe
-	cmp r6, r0
-	bne _08113428
-	b _08113B3A
-_08113428:
-	movs r0, 0xF
-	strh r0, [r5, 0x8]
-	b _08113B3A
-	.align 2, 0
-_08113430: .4byte 0x0000fffe
-_08113434:
-	ldr r0, _0811345C @ =0x00000179
-	bl PlayBGM
-	ldr r0, _08113460 @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _08113464 @ =gOtherText_LinkStandby2
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08113468 @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	b _081134DC
-	.align 2, 0
-_0811345C: .4byte 0x00000179
-_08113460: .4byte gUnknown_03004828
-_08113464: .4byte gOtherText_LinkStandby2
-_08113468: .4byte gTasks
-_0811346C:
-	ldr r0, _08113488 @ =gUnknown_03004828
-	ldr r0, [r0]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _08113478
-	b _08113B3A
-_08113478:
-	adds r0, r7, 0
-	bl DestroyTask
-	ldr r0, _0811348C @ =gUnknown_03005E94
-	ldr r0, [r0]
-	bl SetMainCallback2
-	b _08113B3A
-	.align 2, 0
-_08113488: .4byte gUnknown_03004828
-_0811348C: .4byte gUnknown_03005E94
-_08113490:
-	ldr r4, _081134E4 @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _0811349C
-	b _08113B3A
-_0811349C:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _081134A8
-	b _08113B3A
-_081134A8:
-	bl sub_8024CEC
-	ldr r0, _081134E8 @ =0x0000016f
-	bl PlayFanfare
-	ldr r0, _081134EC @ =gBattleStringsTable
-	ldr r0, [r0, 0xC]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _081134F0 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _081134F4 @ =gTasks
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x40
-	strh r0, [r1, 0x14]
-_081134DC:
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	b _08113B3A
-	.align 2, 0
-_081134E4: .4byte gUnknown_03004828
-_081134E8: .4byte 0x0000016f
-_081134EC: .4byte gBattleStringsTable
-_081134F0: .4byte gDisplayedStringBattle
-_081134F4: .4byte gTasks
-_081134F8:
-	ldr r0, _08113530 @ =gUnknown_03004828
-	ldr r0, [r0]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _08113504
-	b _08113B3A
-_08113504:
-	bl IsFanfareTaskInactive
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08113512
-	b _08113B3A
-_08113512:
-	ldr r0, _08113534 @ =gTasks
-	lsls r1, r7, 2
-	adds r1, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x14]
-	subs r0, 0x1
-	strh r0, [r1, 0x14]
-	lsls r0, 16
-	cmp r0, 0
-	beq _0811352A
-	b _08113B3A
-_0811352A:
-	movs r0, 0xD
-	strh r0, [r1, 0x8]
-	b _08113B3A
-	.align 2, 0
-_08113530: .4byte gUnknown_03004828
-_08113534: .4byte gTasks
-_08113538:
-	lsls r1, r7, 2
-	adds r0, r1, r7
-	lsls r0, 3
-	adds r0, r6
-	movs r3, 0x18
-	ldrsh r0, [r0, r3]
-	mov r9, r1
-	cmp r0, 0xB
-	bls _0811354C
-	b _08113B3A
-_0811354C:
-	lsls r0, 2
-	ldr r1, _08113558 @ =_0811355C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08113558: .4byte _0811355C
-	.align 2, 0
-_0811355C:
-	.4byte _0811358C
-	.4byte _081135E4
-	.4byte _08113638
-	.4byte _08113682
-	.4byte _0811371C
-	.4byte _0811387C
-	.4byte _081138CC
-	.4byte _081139E8
-	.4byte _08113A3C
-	.4byte _08113A90
-	.4byte _08113AD8
-	.4byte _08113B18
-_0811358C:
-	ldr r4, _081135D4 @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _08113598
-	b _08113B3A
-_08113598:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _081135A4
-	b _08113B3A
-_081135A4:
-	bl sub_8024CEC
-	ldr r0, _081135D8 @ =gBattleStringsTable
-	ldr r0, [r0, 0x10]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _081135DC @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _081135E0 @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08113B38
-	.align 2, 0
-_081135D4: .4byte gUnknown_03004828
-_081135D8: .4byte gBattleStringsTable
-_081135DC: .4byte gDisplayedStringBattle
-_081135E0: .4byte gTasks
-_081135E4:
-	ldr r4, _08113628 @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _081135F0
-	b _08113B3A
-_081135F0:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _081135FC
-	b _08113B3A
-_081135FC:
-	ldr r0, _0811362C @ =gBattleStringsTable
-	ldr r0, [r0, 0x14]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _08113630 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08113634 @ =gTasks
-	mov r3, r9
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08113B38
-	.align 2, 0
-_08113628: .4byte gUnknown_03004828
-_0811362C: .4byte gBattleStringsTable
-_08113630: .4byte gDisplayedStringBattle
-_08113634: .4byte gTasks
-_08113638:
-	ldr r4, _081136FC @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _08113644
-	b _08113B3A
-_08113644:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08113682
-	ldr r0, _08113700 @ =gBattleStringsTable
-	ldr r0, [r0, 0x18]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _08113704 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08113708 @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x5
-	strh r0, [r1, 0x1A]
-	movs r0, 0x9
-	strh r0, [r1, 0x1C]
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	strh r0, [r1, 0x18]
-_08113682:
-	ldr r5, _081136FC @ =gUnknown_03004828
-	ldr r0, [r5]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _0811368E
-	b _08113B3A
-_0811368E:
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0
-	beq _0811369C
-	b _08113B3A
-_0811369C:
-	ldr r0, [r5]
-	adds r0, 0x4
-	movs r1, 0xD
-	str r1, [sp]
-	movs r1, 0x18
-	movs r2, 0x8
-	movs r3, 0x1D
-	bl DrawTextWindow
-	ldr r4, _0811370C @ =gBattleCommunication
-	strb r6, [r4, 0x1]
-	ldr r2, [r5]
-	adds r0, r2, 0x4
-	ldr r1, _08113710 @ =gOtherText_YesNoAndPlayer
-	adds r2, 0x34
-	ldrb r2, [r2]
-	adds r2, 0x80
-	movs r3, 0x9
-	str r3, [sp]
-	movs r3, 0x19
-	bl InitWindow
-	ldr r0, [r5]
-	adds r0, 0x4
-	bl sub_8002F44
-	ldr r1, _08113714 @ =0x0000ffff
-	ldr r3, _08113718 @ =0x00002d9f
-	movs r0, 0x20
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0xC
-	bl sub_814A5C0
-	bl sub_81150D8
-	ldr r0, _08113708 @ =gTasks
-	mov r3, r9
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	movs r2, 0
-	strh r0, [r1, 0x18]
-	strb r2, [r4, 0x1]
-	b _08113B3A
-	.align 2, 0
-_081136FC: .4byte gUnknown_03004828
-_08113700: .4byte gBattleStringsTable
-_08113704: .4byte gDisplayedStringBattle
-_08113708: .4byte gTasks
-_0811370C: .4byte gBattleCommunication
-_08113710: .4byte gOtherText_YesNoAndPlayer
-_08113714: .4byte 0x0000ffff
-_08113718: .4byte 0x00002d9f
-_0811371C:
-	ldr r0, _081137CC @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08113742
-	ldr r4, _081137D0 @ =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _08113742
-	movs r0, 0x5
-	bl PlaySE
-	bl HBlankCB_TradeEvolutionScene
-	movs r0, 0
-	strb r0, [r4, 0x1]
-	bl sub_81150D8
-_08113742:
-	ldr r0, _081137CC @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08113768
-	ldr r4, _081137D0 @ =gBattleCommunication
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _08113768
-	movs r0, 0x5
-	bl PlaySE
-	bl HBlankCB_TradeEvolutionScene
-	movs r0, 0x1
-	strb r0, [r4, 0x1]
-	bl sub_81150D8
-_08113768:
-	ldr r0, _081137CC @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0811380A
-	ldr r4, _081137D4 @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x4
-	movs r1, 0xD
-	str r1, [sp]
-	movs r1, 0x18
-	movs r2, 0x8
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	bl DestroyMenuCursor
-	ldr r0, _081137D8 @ =gBattleStringsTable
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _081137DC @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _081137D0 @ =gBattleCommunication
-	ldrb r2, [r0, 0x1]
-	cmp r2, 0
-	beq _081137E4
-	ldr r0, _081137E0 @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x1C]
-	strh r0, [r1, 0x18]
-	b _0811380A
-	.align 2, 0
-_081137CC: .4byte gMain
-_081137D0: .4byte gBattleCommunication
-_081137D4: .4byte gUnknown_03004828
-_081137D8: .4byte gBattleStringsTable
-_081137DC: .4byte gDisplayedStringBattle
-_081137E0: .4byte gTasks
-_081137E4:
-	ldr r0, _08113868 @ =gTasks
-	mov r3, r9
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x1A]
-	strh r0, [r1, 0x18]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x5
-	bne _0811380A
-	movs r0, 0x1
-	negs r0, r0
-	str r2, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-_0811380A:
-	ldr r0, _0811386C @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08113818
-	b _08113B3A
-_08113818:
-	ldr r4, _08113870 @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x4
-	movs r1, 0xD
-	str r1, [sp]
-	movs r1, 0x18
-	movs r2, 0x8
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	bl DestroyMenuCursor
-	ldr r0, _08113874 @ =gBattleStringsTable
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _08113878 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _08113868 @ =gTasks
-	mov r2, r9
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x1C]
-	strh r1, [r0, 0x18]
-	b _08113B3A
-	.align 2, 0
-_08113868: .4byte gTasks
-_0811386C: .4byte gMain
-_08113870: .4byte gUnknown_03004828
-_08113874: .4byte gBattleStringsTable
-_08113878: .4byte gDisplayedStringBattle
-_0811387C:
-	ldr r0, _081138B8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0811388A
-	b _08113B3A
-_0811388A:
-	ldr r0, _081138BC @ =gPlayerParty
-	mov r3, r9
-	adds r5, r3, r7
-	lsls r5, 3
-	adds r5, r6
-	ldrh r1, [r5, 0x20]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _081138C0 @ =gPlayerPartyCount
-	ldrb r2, [r2]
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r3, _081138C4 @ =CB2_TradeEvolutionSceneLoadGraphics
-	ldr r4, _081138C8 @ =word_2024E82
-	ldrh r4, [r4]
-	str r4, [sp]
-	bl sub_809D9F0
-	ldrh r0, [r5, 0x18]
-	adds r0, 0x1
-	strh r0, [r5, 0x18]
-	b _08113B3A
-	.align 2, 0
-_081138B8: .4byte gPaletteFade
-_081138BC: .4byte gPlayerParty
-_081138C0: .4byte gPlayerPartyCount
-_081138C4: .4byte CB2_TradeEvolutionSceneLoadGraphics
-_081138C8: .4byte word_2024E82
-_081138CC:
-	ldr r0, _08113900 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _081138DA
-	b _08113B3A
-_081138DA:
-	ldr r0, _08113904 @ =gMain
-	ldr r1, [r0, 0x4]
-	ldr r0, _08113908 @ =CB2_EvolutionSceneUpdate_1
-	cmp r1, r0
-	beq _081138E6
-	b _08113B3A
-_081138E6:
-	bl sub_809FA30
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0x4
-	bne _08113910
-	ldr r0, _0811390C @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x9
-	b _08113B38
-	.align 2, 0
-_08113900: .4byte gPaletteFade
-_08113904: .4byte gMain
-_08113908: .4byte CB2_EvolutionSceneUpdate_1
-_0811390C: .4byte gTasks
-_08113910:
-	adds r1, r6, 0
-	adds r1, 0xD
-	mov r0, r8
-	bl GetMonData
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl IsHMMove2
-	cmp r0, 0
-	beq _08113970
-	ldr r0, _0811395C @ =gBattleStringsTable
-	ldr r3, _08113960 @ =0x000004cc
-	adds r0, r3
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08113964 @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _08113968 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _0811396C @ =gTasks
-	mov r2, r9
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0xB
-	strh r1, [r0, 0x18]
-	b _08113B3A
-	.align 2, 0
-_0811395C: .4byte gBattleStringsTable
-_08113960: .4byte 0x000004cc
-_08113964: .4byte gUnknown_03004828
-_08113968: .4byte gDisplayedStringBattle
-_0811396C: .4byte gTasks
-_08113970:
-	ldr r1, _081139D0 @ =gBattleTextBuff2
-	movs r0, 0xFD
-	strb r0, [r1]
-	movs r0, 0x2
-	strb r0, [r1, 0x1]
-	strb r4, [r1, 0x2]
-	lsrs r0, r4, 8
-	strb r0, [r1, 0x3]
-	movs r0, 0xFF
-	strb r0, [r1, 0x4]
-	lsls r4, r6, 24
-	lsrs r4, 24
-	mov r0, r8
-	adds r1, r4, 0
-	bl RemoveMonPPBonus
-	ldr r0, _081139D4 @ =word_2024E82
-	ldrh r1, [r0]
-	mov r0, r8
-	adds r2, r4, 0
-	bl SetMonMoveSlot
-	ldr r0, _081139D8 @ =gBattleStringsTable
-	movs r3, 0xCF
-	lsls r3, 2
-	adds r0, r3
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _081139DC @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _081139E0 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _081139E4 @ =gTasks
-	mov r2, r9
-	adds r1, r2, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08113B38
-	.align 2, 0
-_081139D0: .4byte gBattleTextBuff2
-_081139D4: .4byte word_2024E82
-_081139D8: .4byte gBattleStringsTable
-_081139DC: .4byte gUnknown_03004828
-_081139E0: .4byte gDisplayedStringBattle
-_081139E4: .4byte gTasks
-_081139E8:
-	ldr r4, _08113A2C @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	beq _081139F4
-	b _08113B3A
-_081139F4:
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	beq _08113A00
-	b _08113B3A
-_08113A00:
-	ldr r0, _08113A30 @ =gBattleStringsTable
-	ldr r0, [r0, 0x1C]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _08113A34 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r0, _08113A38 @ =gTasks
-	mov r3, r9
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	ldrh r0, [r1, 0x18]
-	adds r0, 0x1
-	b _08113B38
-	.align 2, 0
-_08113A2C: .4byte gUnknown_03004828
-_08113A30: .4byte gBattleStringsTable
-_08113A34: .4byte gDisplayedStringBattle
-_08113A38: .4byte gTasks
-_08113A3C:
-	ldr r4, _08113A80 @ =gUnknown_03004828
-	ldr r0, [r4]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	bne _08113B3A
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08113B3A
-	ldr r0, _08113A84 @ =gBattleStringsTable
-	movs r1, 0xD0
-	lsls r1, 2
-	adds r0, r1
-	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _08113A88 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r4, 0xF
-	str r4, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08113A8C @ =gTasks
-	mov r2, r9
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	strh r4, [r0, 0x8]
-	b _08113B3A
-	.align 2, 0
-_08113A80: .4byte gUnknown_03004828
-_08113A84: .4byte gBattleStringsTable
-_08113A88: .4byte gDisplayedStringBattle
-_08113A8C: .4byte gTasks
-_08113A90:
-	ldr r0, _08113AC8 @ =gBattleStringsTable
-	ldr r0, [r0, 0x20]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08113ACC @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _08113AD0 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08113AD4 @ =gTasks
-	mov r3, r9
-	adds r0, r3, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0xA
-	strh r1, [r0, 0x1A]
-	strh r2, [r0, 0x1C]
-	movs r1, 0x3
-	strh r1, [r0, 0x18]
-	b _08113B3A
-	.align 2, 0
-_08113AC8: .4byte gBattleStringsTable
-_08113ACC: .4byte gUnknown_03004828
-_08113AD0: .4byte gDisplayedStringBattle
-_08113AD4: .4byte gTasks
-_08113AD8:
-	ldr r0, _08113B08 @ =gBattleStringsTable
-	ldr r0, [r0, 0x24]
-	bl StrCpyDecodeToDisplayedStringBattle
-	ldr r0, _08113B0C @ =gUnknown_03004828
-	ldr r2, [r0]
-	adds r0, r2, 0x4
-	ldr r1, _08113B10 @ =gDisplayedStringBattle
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-	movs r3, 0x2
-	bl sub_8002EB0
-	ldr r1, _08113B14 @ =gTasks
-	mov r2, r9
-	adds r0, r2, r7
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0xD
-	strh r1, [r0, 0x8]
-	b _08113B3A
-	.align 2, 0
-_08113B08: .4byte gBattleStringsTable
-_08113B0C: .4byte gUnknown_03004828
-_08113B10: .4byte gDisplayedStringBattle
-_08113B14: .4byte gTasks
-_08113B18:
-	ldr r0, _08113B48 @ =gUnknown_03004828
-	ldr r0, [r0]
-	ldrh r0, [r0, 0x1A]
-	cmp r0, 0
-	bne _08113B3A
-	bl IsSEPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _08113B3A
-	ldr r0, _08113B4C @ =gTasks
-	mov r3, r9
-	adds r1, r3, r7
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x5
-_08113B38:
-	strh r0, [r1, 0x18]
-_08113B3A:
-	add sp, 0x18
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08113B48: .4byte gUnknown_03004828
-_08113B4C: .4byte gTasks
-	thumb_func_end Task_TradeEvolutionScene
-
-	thumb_func_start unref_sub_8113B50
-unref_sub_8113B50: @ 8113B50
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x3C
-	str r0, [sp]
-	str r1, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	movs r1, 0
-	str r1, [sp, 0x10]
-	movs r2, 0
-	str r2, [sp, 0x8]
-	ldr r3, _08113C60 @ =0x02014800
-	mov r12, r3
-	ldr r4, _08113C64 @ =0x000018c4
-	add r4, r12
-	mov r10, r4
-	ldr r5, _08113C68 @ =0x000020c4
-	add r5, r12
-	mov r8, r5
-_08113B7C:
-	adds r0, r3, 0
-	adds r0, 0x84
-	ldr r1, [sp, 0x8]
-	adds r0, r1, r0
-	strb r2, [r0]
-	adds r0, r3, 0x4
-	adds r0, r1, r0
-	strb r2, [r0]
-	ldr r4, _08113C6C @ =0x02014844
-	adds r0, r1, r4
-	strb r2, [r0]
-	movs r6, 0
-	lsls r1, 5
-	mov r9, r1
-	ldr r5, [sp, 0x8]
-	lsls r4, r5, 6
-_08113B9C:
-	mov r0, r9
-	adds r1, r6, r0
-	ldr r5, _08113C70 @ =0x020158c4
-	adds r0, r1, r5
-	strb r2, [r0]
-	mov r5, r10
-	adds r0, r1, r5
-	strb r2, [r0]
-	mov r5, r8
-	adds r0, r1, r5
-	strb r2, [r0]
-	ldr r5, _08113C74 @ =0x020170c4
-	adds r0, r1, r5
-	strb r2, [r0]
-	adds r7, r3, 0
-	adds r7, 0xC4
-	adds r0, r1, r7
-	strb r2, [r0]
-	ldr r5, _08113C78 @ =0x000008c4
-	adds r0, r3, r5
-	adds r0, r1, r0
-	strb r2, [r0]
-	ldr r5, _08113C7C @ =0x000030c4
-	adds r0, r3, r5
-	adds r0, r1, r0
-	strb r2, [r0]
-	ldr r5, _08113C80 @ =0x000038c4
-	adds r0, r3, r5
-	adds r1, r0
-	strb r2, [r1]
-	lsls r1, r6, 1
-	adds r1, r4
-	ldr r5, _08113C84 @ =0x000060c4
-	adds r0, r3, r5
-	adds r0, r1, r0
-	strh r2, [r0]
-	ldr r5, _08113C88 @ =0x000070c4
-	adds r0, r3, r5
-	adds r0, r1, r0
-	strh r2, [r0]
-	ldr r5, _08113C8C @ =0x000080c4
-	adds r0, r3, r5
-	adds r0, r1, r0
-	strh r2, [r0]
-	ldr r5, _08113C90 @ =0x000090c4
-	adds r0, r3, r5
-	adds r1, r0
-	strh r2, [r1]
-	adds r6, 0x1
-	cmp r6, 0x1F
-	ble _08113B9C
-	ldr r0, [sp, 0x8]
-	adds r0, 0x1
-	str r0, [sp, 0x8]
-	cmp r0, 0x3F
-	ble _08113B7C
-	ldr r1, _08113C94 @ =0x0000a0c4
-	add r1, r12
-	movs r0, 0x40
-	strb r0, [r1]
-	movs r1, 0
-	mov r8, r1
-	movs r2, 0
-	str r2, [sp, 0x8]
-	movs r3, 0x80
-	lsls r3, 5
-	adds r3, r7
-	mov r12, r3
-	movs r4, 0xC0
-	lsls r4, 5
-	adds r4, r7
-	mov r9, r4
-	movs r5, 0
-	adds r4, r7, 0
-	subs r4, 0xC0
-_08113C32:
-	movs r3, 0
-	ldr r2, [sp]
-	add r2, r8
-	movs r6, 0
-	ldr r0, [sp, 0x8]
-	adds r0, 0x1
-	str r0, [sp, 0x30]
-	ldr r1, [sp, 0x8]
-	lsls r1, 7
-	mov r10, r1
-	movs r7, 0x1
-	negs r7, r7
-_08113C4A:
-	asrs r0, r6, 1
-	lsls r0, 2
-	add r0, r10
-	ldr r1, _08113C98 @ =0x020188c4
-	adds r0, r1
-	str r2, [r0]
-	cmp r3, 0
-	beq _08113C9C
-	cmp r3, 0x1
-	beq _08113CC6
-	b _08113CF4
-	.align 2, 0
-_08113C60: .4byte 0x02014800
-_08113C64: .4byte 0x000018c4
-_08113C68: .4byte 0x000020c4
-_08113C6C: .4byte 0x02014844
-_08113C70: .4byte 0x020158c4
-_08113C74: .4byte 0x020170c4
-_08113C78: .4byte 0x000008c4
-_08113C7C: .4byte 0x000030c4
-_08113C80: .4byte 0x000038c4
-_08113C84: .4byte 0x000060c4
-_08113C88: .4byte 0x000070c4
-_08113C8C: .4byte 0x000080c4
-_08113C90: .4byte 0x000090c4
-_08113C94: .4byte 0x0000a0c4
-_08113C98: .4byte 0x020188c4
-_08113C9C:
-	movs r0, 0x1
-	ands r0, r6
-	cmp r0, 0
-	beq _08113CAA
-	cmp r0, 0x1
-	beq _08113CB0
-	b _08113CF4
-_08113CAA:
-	ldrb r1, [r2]
-	movs r0, 0xF
-	b _08113CB4
-_08113CB0:
-	ldrb r1, [r2]
-	movs r0, 0xF0
-_08113CB4:
-	ands r0, r1
-	cmp r0, 0
-	beq _08113CF4
-	ldrb r0, [r4]
-	adds r0, r5
-	add r0, r12
-	strb r6, [r0]
-	movs r3, 0x1
-	b _08113CF4
-_08113CC6:
-	adds r0, r6, 0
-	ands r0, r3
-	cmp r0, 0
-	beq _08113CD4
-	cmp r0, 0x1
-	beq _08113CDA
-	b _08113CF4
-_08113CD4:
-	ldrb r1, [r2]
-	movs r0, 0xF
-	b _08113CDE
-_08113CDA:
-	ldrb r1, [r2]
-	movs r0, 0xF0
-_08113CDE:
-	ands r0, r1
-	cmp r0, 0
-	bne _08113CF4
-	ldrb r0, [r4]
-	adds r0, r5
-	add r0, r9
-	strb r7, [r0]
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	movs r3, 0
-_08113CF4:
-	adds r0, r6, 0x1
-	movs r1, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _08113D02
-	adds r2, 0x1D
-	b _08113D0C
-_08113D02:
-	movs r0, 0x1
-	ands r0, r6
-	cmp r0, 0
-	beq _08113D0C
-	adds r2, 0x1
-_08113D0C:
-	adds r7, 0x1
-	adds r6, 0x1
-	cmp r6, 0x3F
-	ble _08113C4A
-	cmp r3, 0
-	beq _08113D26
-	ldrb r0, [r4]
-	adds r0, r5
-	add r0, r9
-	strb r6, [r0]
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-_08113D26:
-	movs r0, 0x7
-	ldr r2, [sp, 0x30]
-	ands r2, r0
-	cmp r2, 0
-	bne _08113D36
-	movs r3, 0xE4
-	add r8, r3
-	b _08113D3A
-_08113D36:
-	movs r0, 0x4
-	add r8, r0
-_08113D3A:
-	adds r5, 0x20
-	adds r4, 0x1
-	ldr r1, [sp, 0x8]
-	adds r1, 0x1
-	str r1, [sp, 0x8]
-	cmp r1, 0x3F
-	bgt _08113D4A
-	b _08113C32
-_08113D4A:
-	movs r2, 0
-	mov r8, r2
-	movs r3, 0
-	str r3, [sp, 0x8]
-	ldr r0, _08113D84 @ =0x02014844
-	movs r4, 0x82
-	lsls r4, 6
-	adds r4, r0
-	mov r10, r4
-	movs r5, 0xA2
-	lsls r5, 6
-	adds r7, r0, r5
-	movs r5, 0
-	adds r4, r0, 0
-	movs r0, 0x1
-	mov r9, r0
-_08113D6A:
-	movs r3, 0
-	ldr r2, [sp, 0x4]
-	add r2, r8
-	movs r6, 0
-	ldr r1, [sp, 0x8]
-	adds r1, 0x1
-	str r1, [sp, 0x30]
-_08113D78:
-	cmp r3, 0
-	beq _08113D88
-	cmp r3, 0x1
-	beq _08113DB4
-	b _08113DE4
-	.align 2, 0
-_08113D84: .4byte 0x02014844
-_08113D88:
-	adds r0, r6, 0
-	mov r1, r9
-	ands r0, r1
-	cmp r0, 0
-	beq _08113D98
-	cmp r0, 0x1
-	beq _08113D9E
-	b _08113DE4
-_08113D98:
-	ldrb r1, [r2]
-	movs r0, 0xF
-	b _08113DA2
-_08113D9E:
-	ldrb r1, [r2]
-	movs r0, 0xF0
-_08113DA2:
-	ands r0, r1
-	cmp r0, 0
-	beq _08113DE4
-	ldrb r0, [r4]
-	adds r0, r5
-	add r0, r10
-	strb r6, [r0]
-	movs r3, 0x1
-	b _08113DE4
-_08113DB4:
-	adds r0, r6, 0
-	ands r0, r3
-	cmp r0, 0
-	beq _08113DC2
-	cmp r0, 0x1
-	beq _08113DC8
-	b _08113DE4
-_08113DC2:
-	ldrb r1, [r2]
-	movs r0, 0xF
-	b _08113DCC
-_08113DC8:
-	ldrb r1, [r2]
-	movs r0, 0xF0
-_08113DCC:
-	ands r0, r1
-	cmp r0, 0
-	bne _08113DE4
-	ldrb r0, [r4]
-	adds r0, r5
-	adds r0, r7
-	subs r1, r6, 0x1
-	strb r1, [r0]
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	movs r3, 0
-_08113DE4:
-	adds r1, r6, 0x1
-	movs r0, 0x7
-	ands r0, r1
-	cmp r0, 0
-	bne _08113DF2
-	adds r2, 0x1D
-	b _08113DFC
-_08113DF2:
-	mov r0, r9
-	ands r6, r0
-	cmp r6, 0
-	beq _08113DFC
-	adds r2, 0x1
-_08113DFC:
-	adds r6, r1, 0
-	cmp r6, 0x3F
-	ble _08113D78
-	cmp r3, 0
-	beq _08113E14
-	ldrb r0, [r4]
-	adds r0, r5
-	adds r0, r7
-	strb r6, [r0]
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-_08113E14:
-	movs r0, 0x7
-	ldr r1, [sp, 0x30]
-	ands r1, r0
-	cmp r1, 0
-	bne _08113E24
-	movs r2, 0xE4
-	add r8, r2
-	b _08113E28
-_08113E24:
-	movs r3, 0x4
-	add r8, r3
-_08113E28:
-	adds r5, 0x20
-	adds r4, 0x1
-	ldr r0, [sp, 0x8]
-	adds r0, 0x1
-	str r0, [sp, 0x8]
-	cmp r0, 0x3F
-	ble _08113D6A
-	movs r1, 0
-	str r1, [sp, 0x8]
-_08113E3A:
-	ldr r3, [sp, 0x8]
-	ldr r4, _08113EBC @ =0x02014804
-	adds r2, r3, r4
-	ldr r5, _08113EC0 @ =0x02014844
-	adds r1, r3, r5
-	ldrb r0, [r2]
-	adds r3, 0x1
-	str r3, [sp, 0x30]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bcc _08113E52
-	b _08113F9E
-_08113E52:
-	movs r0, 0
-	str r0, [sp, 0xC]
-	ldrb r2, [r2]
-	cmp r0, r2
-	bge _08113F54
-	ldr r0, _08113EC4 @ =0x02014800
-	adds r0, 0x4
-	ldr r1, [sp, 0x8]
-	adds r0, r1, r0
-	str r0, [sp, 0x18]
-_08113E66:
-	movs r2, 0x80
-	lsls r2, 1
-	str r2, [sp, 0x14]
-	movs r6, 0
-	ldr r3, [sp, 0x8]
-	ldr r4, _08113EC0 @ =0x02014844
-	adds r0, r3, r4
-	ldr r5, [sp, 0xC]
-	adds r5, 0x1
-	str r5, [sp, 0x34]
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _08113F3E
-	ldr r0, _08113EC4 @ =0x02014800
-	mov r10, r0
-	lsls r0, r3, 5
-	ldr r2, [sp, 0xC]
-	adds r1, r2, r0
-	mov r9, r0
-	ldr r0, _08113EC4 @ =0x02014800
-	adds r0, 0xC4
-	mov r3, r9
-	adds r7, r3, r0
-	mov r5, r9
-	ldr r4, _08113EC4 @ =0x02014800
-	ldr r2, _08113EC8 @ =0x000010c4
-	adds r0, r4, r2
-	adds r1, r0
-	mov r8, r1
-	ldrb r3, [r1]
-	str r3, [sp, 0x1C]
-_08113EA4:
-	ldr r0, _08113ECC @ =0x000020c4
-	add r0, r10
-	adds r0, r5, r0
-	ldr r4, [sp, 0x1C]
-	ldrb r1, [r0]
-	cmp r4, r1
-	bls _08113ED0
-	mov r2, r8
-	ldrb r1, [r2]
-	ldrb r0, [r0]
-	b _08113ED6
-	.align 2, 0
-_08113EBC: .4byte 0x02014804
-_08113EC0: .4byte 0x02014844
-_08113EC4: .4byte 0x02014800
-_08113EC8: .4byte 0x000010c4
-_08113ECC: .4byte 0x000020c4
-_08113ED0:
-	ldrb r1, [r0]
-	mov r3, r8
-	ldrb r0, [r3]
-_08113ED6:
-	subs r3, r1, r0
-	ldr r1, [sp, 0xC]
-	add r1, r9
-	ldr r0, _08113EFC @ =0x000018c4
-	add r0, r10
-	adds r4, r1, r0
-	ldr r0, _08113F00 @ =0x000028c4
-	add r0, r10
-	adds r2, r5, r0
-	ldrb r0, [r4]
-	ldr r1, _08113F04 @ =0x02014800
-	mov r12, r1
-	ldrb r1, [r2]
-	cmp r0, r1
-	bls _08113F08
-	adds r1, r0, 0
-	ldrb r0, [r2]
-	b _08113F0C
-	.align 2, 0
-_08113EFC: .4byte 0x000018c4
-_08113F00: .4byte 0x000028c4
-_08113F04: .4byte 0x02014800
-_08113F08:
-	ldrb r1, [r2]
-	ldrb r0, [r4]
-_08113F0C:
-	subs r1, r0
-	adds r3, r1
-	ldr r2, [sp, 0x14]
-	cmp r2, r3
-	ble _08113F2C
-	ldrb r0, [r7]
-	cmp r0, 0
-	bne _08113F2C
-	ldr r0, _08114050 @ =0x000008c4
-	add r0, r12
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08113F2C
-	str r6, [sp, 0x10]
-	str r3, [sp, 0x14]
-_08113F2C:
-	adds r7, 0x1
-	adds r5, 0x1
-	adds r6, 0x1
-	ldr r3, [sp, 0x8]
-	ldr r4, _08114054 @ =0x02014844
-	adds r0, r3, r4
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _08113EA4
-_08113F3E:
-	ldr r0, [sp, 0xC]
-	ldr r1, [sp, 0x10]
-	ldr r2, [sp, 0x8]
-	bl sub_81141F0
-	ldr r5, [sp, 0x34]
-	str r5, [sp, 0xC]
-	ldr r0, [sp, 0x18]
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _08113E66
-_08113F54:
-	movs r6, 0
-	ldr r2, _08114058 @ =0x02014800
-	ldr r1, [sp, 0x8]
-	ldr r3, _08114054 @ =0x02014844
-	adds r0, r1, r3
-	adds r4, r2, 0
-	mov r12, r4
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _08113F9E
-	mov r0, r12
-	adds r0, 0x44
-	adds r4, r1, r0
-_08113F6E:
-	ldr r5, [sp, 0x8]
-	lsls r0, r5, 5
-	adds r1, r6, r0
-	adds r0, r2, 0
-	adds r0, 0xC4
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08113F94
-	ldr r3, _08114050 @ =0x000008c4
-	adds r0, r2, r3
-	adds r0, r1, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08113F94
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl sub_811430C
-_08113F94:
-	adds r6, 0x1
-	ldr r2, _08114058 @ =0x02014800
-	ldrb r5, [r4]
-	cmp r6, r5
-	blt _08113F6E
-_08113F9E:
-	ldr r0, [sp, 0x8]
-	ldr r1, _0811405C @ =0x02014804
-	adds r2, r0, r1
-	ldr r3, _08114054 @ =0x02014844
-	adds r1, r0, r3
-	ldrb r0, [r2]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _08113FCC
-	movs r6, 0
-	ldrb r4, [r2]
-	cmp r6, r4
-	bge _08113FCC
-	adds r4, r2, 0
-_08113FBA:
-	adds r0, r6, 0
-	adds r1, r6, 0
-	ldr r2, [sp, 0x8]
-	bl sub_81141F0
-	adds r6, 0x1
-	ldrb r5, [r4]
-	cmp r6, r5
-	blt _08113FBA
-_08113FCC:
-	ldr r0, [sp, 0x8]
-	ldr r1, _0811405C @ =0x02014804
-	adds r2, r0, r1
-	ldr r3, _08114054 @ =0x02014844
-	adds r1, r0, r3
-	ldrb r0, [r2]
-	ldr r4, _08114058 @ =0x02014800
-	ldrb r5, [r1]
-	cmp r0, r5
-	bhi _08113FE2
-	b _081141C4
-_08113FE2:
-	movs r0, 0
-	str r0, [sp, 0x10]
-	ldrb r1, [r1]
-	cmp r0, r1
-	blt _08113FEE
-	b _08114104
-_08113FEE:
-	str r2, [sp, 0x2C]
-	ldr r1, [sp, 0x8]
-	lsls r1, 5
-	mov r9, r1
-	adds r0, r4, 0
-	adds r0, 0x44
-	ldr r2, [sp, 0x8]
-	adds r0, r2, r0
-	str r0, [sp, 0x20]
-	mov r3, r9
-	str r3, [sp, 0x24]
-_08114004:
-	movs r4, 0x80
-	lsls r4, 1
-	str r4, [sp, 0x14]
-	movs r6, 0
-	ldr r5, [sp, 0x10]
-	adds r5, 0x1
-	str r5, [sp, 0x38]
-	ldr r0, [sp, 0x2C]
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _081140C4
-	ldr r1, [sp, 0x10]
-	ldr r2, [sp, 0x24]
-	adds r1, r2
-	mov r10, r1
-	ldr r0, _08114058 @ =0x02014800
-	adds r0, 0xC4
-	adds r2, r0
-	mov r8, r2
-	ldr r7, [sp, 0x24]
-	ldr r3, _08114058 @ =0x02014800
-	ldr r4, _08114060 @ =0x000010c4
-	adds r0, r3, r4
-	adds r5, r7, r0
-	ldr r0, _08114064 @ =0x020168c4
-	add r0, r10
-	mov r12, r0
-	ldrb r1, [r0]
-	str r1, [sp, 0x28]
-_0811403E:
-	ldrb r0, [r5]
-	ldr r2, [sp, 0x28]
-	cmp r0, r2
-	bls _08114068
-	adds r1, r0, 0
-	mov r3, r12
-	ldrb r0, [r3]
-	b _0811406E
-	.align 2, 0
-_08114050: .4byte 0x000008c4
-_08114054: .4byte 0x02014844
-_08114058: .4byte 0x02014800
-_0811405C: .4byte 0x02014804
-_08114060: .4byte 0x000010c4
-_08114064: .4byte 0x020168c4
-_08114068:
-	mov r4, r12
-	ldrb r1, [r4]
-	ldrb r0, [r5]
-_0811406E:
-	subs r3, r1, r0
-	ldr r1, _0811408C @ =0x02014800
-	ldr r2, _08114090 @ =0x000018c4
-	adds r0, r1, r2
-	adds r4, r7, r0
-	ldr r2, _08114094 @ =0x020170c4
-	add r2, r10
-	ldrb r0, [r4]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bls _08114098
-	adds r1, r0, 0
-	ldrb r0, [r2]
-	b _0811409C
-	.align 2, 0
-_0811408C: .4byte 0x02014800
-_08114090: .4byte 0x000018c4
-_08114094: .4byte 0x020170c4
-_08114098:
-	ldrb r1, [r2]
-	ldrb r0, [r4]
-_0811409C:
-	subs r1, r0
-	adds r3, r1
-	ldr r2, [sp, 0x14]
-	cmp r2, r3
-	ble _081140B2
-	mov r4, r8
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _081140B2
-	str r6, [sp, 0xC]
-	str r3, [sp, 0x14]
-_081140B2:
-	movs r0, 0x1
-	add r8, r0
-	adds r7, 0x1
-	adds r5, 0x1
-	adds r6, 0x1
-	ldr r1, [sp, 0x2C]
-	ldrb r1, [r1]
-	cmp r6, r1
-	blt _0811403E
-_081140C4:
-	ldr r3, [sp, 0xC]
-	add r3, r9
-	ldr r2, _08114164 @ =0x02014800
-	ldr r4, _08114168 @ =0x000030c4
-	adds r1, r2, r4
-	adds r1, r3, r1
-	ldr r2, [sp, 0x10]
-	add r2, r9
-	ldr r5, _0811416C @ =0x020168c4
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, _08114164 @ =0x02014800
-	ldr r4, _08114170 @ =0x000038c4
-	adds r1, r0, r4
-	adds r1, r3, r1
-	ldr r5, _08114174 @ =0x020170c4
-	adds r2, r5
-	ldrb r0, [r2]
-	strb r0, [r1]
-	ldr r0, _08114164 @ =0x02014800
-	adds r0, 0xC4
-	adds r3, r0
-	movs r0, 0x1
-	strb r0, [r3]
-	ldr r0, [sp, 0x38]
-	str r0, [sp, 0x10]
-	ldr r1, [sp, 0x20]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bge _08114104
-	b _08114004
-_08114104:
-	movs r6, 0
-	ldr r4, _08114164 @ =0x02014800
-	ldr r2, [sp, 0x8]
-	ldr r3, _08114178 @ =0x02014804
-	adds r0, r2, r3
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _081141C4
-	adds r7, r4, 0
-	mov r9, r6
-	movs r5, 0xC4
-	adds r5, r7
-	mov r8, r5
-_0811411E:
-	ldr r1, [sp, 0x8]
-	lsls r0, r1, 5
-	adds r2, r6, r0
-	ldr r3, _0811417C @ =0x000020c4
-	adds r0, r7, r3
-	adds r0, r2
-	mov r10, r0
-	ldr r5, _08114168 @ =0x000030c4
-	adds r0, r7, r5
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	mov r1, r10
-	strb r0, [r1]
-	ldr r3, _08114180 @ =0x000028c4
-	adds r0, r7, r3
-	adds r3, r2, r0
-	ldr r5, _08114170 @ =0x000038c4
-	adds r0, r7, r5
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	strb r0, [r3]
-	mov r0, r8
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08114184
-	mov r2, r9
-	strb r2, [r1]
-	adds r0, r6, 0
-	adds r1, r6, 0
-	ldr r2, [sp, 0x8]
-	bl sub_81141F0
-	b _081141B4
-	.align 2, 0
-_08114164: .4byte 0x02014800
-_08114168: .4byte 0x000030c4
-_0811416C: .4byte 0x020168c4
-_08114170: .4byte 0x000038c4
-_08114174: .4byte 0x020170c4
-_08114178: .4byte 0x02014804
-_0811417C: .4byte 0x000020c4
-_08114180: .4byte 0x000028c4
-_08114184:
-	ldr r5, _081141E0 @ =0x000010c4
-	adds r1, r4, r5
-	adds r1, r2, r1
-	ldr r5, _081141E4 @ =0x000018c4
-	adds r0, r4, r5
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	ldrb r2, [r1]
-	subs r0, r2
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	adds r2, r0
-	strb r2, [r3]
-	mov r0, r10
-	strb r2, [r0]
-	ldrb r0, [r3]
-	subs r0, 0x1
-	strb r0, [r3]
-	adds r0, r6, 0
-	adds r1, r6, 0
-	ldr r2, [sp, 0x8]
-	bl sub_81141F0
-_081141B4:
-	adds r6, 0x1
-	ldr r4, _081141E8 @ =0x02014800
-	ldr r1, [sp, 0x8]
-	ldr r2, _081141EC @ =0x02014804
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r6, r0
-	blt _0811411E
-_081141C4:
-	ldr r3, [sp, 0x30]
-	str r3, [sp, 0x8]
-	cmp r3, 0x3F
-	bgt _081141CE
-	b _08113E3A
-_081141CE:
-	add sp, 0x3C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081141E0: .4byte 0x000010c4
-_081141E4: .4byte 0x000018c4
-_081141E8: .4byte 0x02014800
-_081141EC: .4byte 0x02014804
-	thumb_func_end unref_sub_8113B50
-
-	thumb_func_start sub_81141F0
-sub_81141F0: @ 81141F0
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r6, r0, 0
-	mov r8, r1
-	mov r9, r2
-	ldr r3, _0811424C @ =0x02014800
-	lsls r1, r2, 5
-	mov r0, r8
-	adds r4, r0, r1
-	ldr r5, _08114250 @ =0x000030c4
-	adds r2, r3, r5
-	adds r2, r4, r2
-	adds r1, r6, r1
-	ldr r7, _08114254 @ =0x000010c4
-	adds r0, r3, r7
-	adds r5, r1, r0
-	ldrb r0, [r5]
-	strb r0, [r2]
-	ldr r0, _08114258 @ =0x000038c4
-	adds r2, r3, r0
-	adds r2, r4, r2
-	ldr r7, _0811425C @ =0x000018c4
-	adds r0, r3, r7
-	adds r1, r0
-	ldrb r0, [r1]
-	strb r0, [r2]
-	movs r7, 0
-	ldr r1, _08114260 @ =0x000020c4
-	adds r0, r3, r1
-	adds r2, r4, r0
-	ldrb r1, [r5]
-	ldrb r0, [r2]
-	mov r12, r3
-	cmp r1, r0
-	bcs _08114264
-	mov r0, r12
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0x4
-	strb r1, [r0]
-	ldrb r1, [r2]
-	ldrb r0, [r5]
-	b _08114276
-	.align 2, 0
-_0811424C: .4byte 0x02014800
-_08114250: .4byte 0x000030c4
-_08114254: .4byte 0x000010c4
-_08114258: .4byte 0x000038c4
-_0811425C: .4byte 0x000018c4
-_08114260: .4byte 0x000020c4
-_08114264:
-	cmp r1, r0
-	bls _08114278
-	mov r0, r12
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0x1
-	strb r1, [r0]
-	ldrb r1, [r5]
-	ldrb r0, [r2]
-_08114276:
-	subs r7, r1, r0
-_08114278:
-	mov r5, r8
-	lsls r3, r5, 1
-	mov r0, r9
-	lsls r4, r0, 6
-	adds r0, r3, r4
-	ldr r1, _081142BC @ =0x000080c4
-	add r1, r12
-	adds r0, r1
-	lsls r1, r7, 4
-	strh r1, [r0]
-	movs r7, 0
-	mov r1, r9
-	lsls r2, r1, 5
-	adds r1, r6, r2
-	ldr r0, _081142C0 @ =0x000018c4
-	add r0, r12
-	adds r6, r1, r0
-	adds r1, r5, r2
-	ldr r0, _081142C4 @ =0x000028c4
-	add r0, r12
-	adds r5, r1, r0
-	ldrb r2, [r6]
-	ldrb r0, [r5]
-	cmp r2, r0
-	bcs _081142CC
-	ldr r0, _081142C8 @ =0x000008c4
-	add r0, r12
-	adds r0, r1, r0
-	movs r1, 0x3
-	strb r1, [r0]
-	ldrb r1, [r5]
-	ldrb r0, [r6]
-	b _081142DE
-	.align 2, 0
-_081142BC: .4byte 0x000080c4
-_081142C0: .4byte 0x000018c4
-_081142C4: .4byte 0x000028c4
-_081142C8: .4byte 0x000008c4
-_081142CC:
-	cmp r2, r0
-	bls _081142E0
-	ldr r0, _08114304 @ =0x000008c4
-	add r0, r12
-	adds r0, r1, r0
-	movs r1, 0x2
-	strb r1, [r0]
-	ldrb r1, [r6]
-	ldrb r0, [r5]
-_081142DE:
-	subs r7, r1, r0
-_081142E0:
-	adds r0, r3, r4
-	ldr r1, _08114308 @ =0x000090c4
-	add r1, r12
-	adds r0, r1
-	lsls r1, r7, 4
-	strh r1, [r0]
-	mov r1, r12
-	adds r1, 0x84
-	add r1, r9
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08114304: .4byte 0x000008c4
-_08114308: .4byte 0x000090c4
-	thumb_func_end sub_81141F0
-
-	thumb_func_start sub_811430C
-sub_811430C: @ 811430C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	ldr r5, _081143AC @ =0x02014800
-	lsls r4, r1, 5
-	adds r4, r0, r4
-	ldr r2, _081143B0 @ =0x000028c4
-	adds r2, r5
-	mov r10, r2
-	add r10, r4
-	mov r3, r10
-	ldrb r2, [r3]
-	ldr r6, _081143B4 @ =0x000020c4
-	adds r6, r5
-	mov r8, r6
-	add r8, r4
-	mov r6, r8
-	ldrb r3, [r6]
-	subs r7, r2, r3
-	ldr r2, _081143B8 @ =0x000030c4
-	adds r6, r5, r2
-	adds r6, r4, r6
-	ldr r2, _081143BC @ =0x000038c4
-	adds r2, r5
-	mov r9, r2
-	add r9, r4
-	lsrs r2, r7, 31
-	adds r2, r7, r2
-	asrs r2, 1
-	adds r3, r2
-	mov r2, r9
-	strb r3, [r2]
-	strb r3, [r6]
-	adds r2, r5, 0
-	adds r2, 0xC4
-	adds r2, r4, r2
-	movs r3, 0x5
-	strb r3, [r2]
-	ldr r3, _081143C0 @ =0x000008c4
-	adds r2, r5, r3
-	adds r4, r2
-	movs r2, 0x7
-	strb r2, [r4]
-	adds r3, r5, 0
-	adds r3, 0x84
-	adds r3, r1, r3
-	ldrb r2, [r3]
-	adds r2, 0x1
-	strb r2, [r3]
-	ldrb r3, [r6]
-	mov r4, r8
-	ldrb r2, [r4]
-	subs r7, r3, r2
-	lsls r0, 1
-	lsls r1, 6
-	adds r0, r1
-	ldr r6, _081143C4 @ =0x000080c4
-	adds r1, r5, r6
-	adds r1, r0, r1
-	lsls r2, r7, 4
-	strh r2, [r1]
-	mov r1, r10
-	ldrb r2, [r1]
-	mov r3, r9
-	ldrb r1, [r3]
-	subs r7, r2, r1
-	ldr r4, _081143C8 @ =0x000090c4
-	adds r5, r4
-	adds r0, r5
-	lsls r1, r7, 4
-	strh r1, [r0]
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081143AC: .4byte 0x02014800
-_081143B0: .4byte 0x000028c4
-_081143B4: .4byte 0x000020c4
-_081143B8: .4byte 0x000030c4
-_081143BC: .4byte 0x000038c4
-_081143C0: .4byte 0x000008c4
-_081143C4: .4byte 0x000080c4
-_081143C8: .4byte 0x000090c4
-	thumb_func_end sub_811430C
-
-	thumb_func_start unref_sub_81143CC
-unref_sub_81143CC: @ 81143CC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x14
-	movs r0, 0x1
-	str r0, [sp, 0x4]
-	ldr r0, _08114408 @ =0x02014800
-	ldr r2, _0811440C @ =0x0000a0c4
-	adds r1, r0, r2
-	ldrb r3, [r1]
-	adds r4, r0, 0
-	cmp r3, 0
-	beq _081143EE
-	subs r0, r3, 0x1
-	strb r0, [r1]
-_081143EE:
-	movs r5, 0
-	str r5, [sp]
-_081143F2:
-	movs r3, 0
-	adds r2, r4, 0
-	adds r0, r4, 0
-	adds r0, 0x84
-	ldr r1, [sp]
-	adds r0, r1, r0
-	adds r1, 0x1
-	str r1, [sp, 0x8]
-	bl _08114D84
-	.align 2, 0
-_08114408: .4byte 0x02014800
-_0811440C: .4byte 0x0000a0c4
-_08114410:
-	ldr r5, [sp]
-	lsls r0, r5, 5
-	adds r1, r3, r0
-	adds r2, 0xC4
-	adds r1, r2
-	ldrb r2, [r1]
-	mov r8, r0
-	adds r0, r3, 0x1
-	mov r10, r0
-	cmp r2, 0xC
-	bls _08114428
-	b _081148D2
-_08114428:
-	lsls r0, r2, 2
-	ldr r1, _08114434 @ =_08114438
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08114434: .4byte _08114438
-	.align 2, 0
-_08114438:
-	.4byte _081148D2
-	.4byte _0811446C
-	.4byte _081144F0
-	.4byte _0811457C
-	.4byte _08114600
-	.4byte _0811468C
-	.4byte _081146C8
-	.4byte _08114704
-	.4byte _08114740
-	.4byte _0811477C
-	.4byte _081147D0
-	.4byte _08114810
-	.4byte _08114858
-_0811446C:
-	movs r1, 0
-	str r1, [sp, 0x4]
-	lsls r0, r3, 1
-	ldr r2, [sp]
-	lsls r1, r2, 6
-	adds r0, r1
-	ldr r5, _081144E0 @ =0x000060c4
-	adds r2, r4, r5
-	adds r2, r0, r2
-	ldr r5, _081144E4 @ =0x000080c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	adds r1, r3, 0x1
-	mov r10, r1
-	ldr r2, [sp, 0x4]
-	cmp r2, r5
-	blt _081144A6
-	b _081148D2
-_081144A6:
-	mov r9, r4
-	mov r4, r8
-	adds r7, r3, r4
-	ldr r0, _081144E8 @ =0x000030c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _081144EC @ =0x000020c4
-	add r0, r9
-	adds r2, r7, r0
-_081144B8:
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldrb r0, [r4]
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _081144D8
-	b _081148A0
-_081144D8:
-	adds r6, 0x1
-	cmp r6, r5
-	blt _081144B8
-	b _081148D2
-	.align 2, 0
-_081144E0: .4byte 0x000060c4
-_081144E4: .4byte 0x000080c4
-_081144E8: .4byte 0x000030c4
-_081144EC: .4byte 0x000020c4
-_081144F0:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r4, _08114568 @ =0x02014800
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _0811456C @ =0x000060c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _08114570 @ =0x000080c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	adds r1, r3, 0x1
-	mov r10, r1
-	ldr r2, [sp, 0x4]
-	cmp r2, r5
-	blt _0811452C
-	b _081148D2
-_0811452C:
-	mov r9, r4
-	mov r4, r8
-	adds r7, r3, r4
-	ldr r0, _08114574 @ =0x000030c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _08114578 @ =0x000020c4
-	add r0, r9
-	adds r2, r7, r0
-_0811453E:
-	ldrb r0, [r4]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _08114548
-	b _081148B8
-_08114548:
-	adds r1, r0, 0
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DF0
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	adds r6, 0x1
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	cmp r6, r5
-	blt _0811453E
-	b _081148D2
-	.align 2, 0
-_08114568: .4byte 0x02014800
-_0811456C: .4byte 0x000060c4
-_08114570: .4byte 0x000080c4
-_08114574: .4byte 0x000030c4
-_08114578: .4byte 0x000020c4
-_0811457C:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _081145F0 @ =0x000060c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _081145F4 @ =0x000080c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	adds r1, r3, 0x1
-	mov r10, r1
-	ldr r2, [sp, 0x4]
-	cmp r2, r5
-	blt _081145B6
-	b _081148D2
-_081145B6:
-	mov r9, r4
-	mov r4, r8
-	adds r7, r3, r4
-	ldr r0, _081145F8 @ =0x000030c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _081145FC @ =0x000020c4
-	add r0, r9
-	adds r2, r7, r0
-_081145C8:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldrb r0, [r4]
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _081145E8
-	b _081148AC
-_081145E8:
-	adds r6, 0x1
-	cmp r6, r5
-	blt _081145C8
-	b _081148D2
-	.align 2, 0
-_081145F0: .4byte 0x000060c4
-_081145F4: .4byte 0x000080c4
-_081145F8: .4byte 0x000030c4
-_081145FC: .4byte 0x000020c4
-_08114600:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r4, _08114678 @ =0x02014800
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _0811467C @ =0x000060c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _08114680 @ =0x000080c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	adds r1, r3, 0x1
-	mov r10, r1
-	ldr r2, [sp, 0x4]
-	cmp r2, r5
-	blt _0811463C
-	b _081148D2
-_0811463C:
-	mov r9, r4
-	mov r4, r8
-	adds r7, r3, r4
-	ldr r0, _08114684 @ =0x000030c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _08114688 @ =0x000020c4
-	add r0, r9
-	adds r2, r7, r0
-_0811464E:
-	ldrb r0, [r4]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _08114658
-	b _081148B8
-_08114658:
-	adds r1, r0, 0
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DF0
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	adds r6, 0x1
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	cmp r6, r5
-	blt _0811464E
-	b _081148D2
-	.align 2, 0
-_08114678: .4byte 0x02014800
-_0811467C: .4byte 0x000060c4
-_08114680: .4byte 0x000080c4
-_08114684: .4byte 0x000030c4
-_08114688: .4byte 0x000020c4
-_0811468C:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r5, _081146C0 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _081146C4 @ =0x000030c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114E48
-	lsls r0, 24
-	ldr r3, [sp, 0x10]
-	adds r2, r3, 0x1
-	mov r10, r2
-	cmp r0, 0
-	bne _081146B4
-	b _081148D2
-_081146B4:
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0x9
-	strb r1, [r0]
-	b _081148D2
-	.align 2, 0
-_081146C0: .4byte 0x02014800
-_081146C4: .4byte 0x000030c4
-_081146C8:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _081146FC @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114700 @ =0x000030c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114E48
-	lsls r0, 24
-	ldr r3, [sp, 0x10]
-	adds r2, r3, 0x1
-	mov r10, r2
-	cmp r0, 0
-	bne _081146F0
-	b _081148D2
-_081146F0:
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0xA
-	strb r1, [r0]
-	b _081148D2
-	.align 2, 0
-_081146FC: .4byte 0x02014800
-_08114700: .4byte 0x000030c4
-_08114704:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _08114738 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _0811473C @ =0x000030c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114E48
-	lsls r0, 24
-	ldr r3, [sp, 0x10]
-	adds r2, r3, 0x1
-	mov r10, r2
-	cmp r0, 0
-	bne _0811472C
-	b _081148D2
-_0811472C:
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0xB
-	strb r1, [r0]
-	b _081148D2
-	.align 2, 0
-_08114738: .4byte 0x02014800
-_0811473C: .4byte 0x000030c4
-_08114740:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _08114774 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114778 @ =0x000030c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114E48
-	lsls r0, 24
-	ldr r3, [sp, 0x10]
-	adds r2, r3, 0x1
-	mov r10, r2
-	cmp r0, 0
-	bne _08114768
-	b _081148D2
-_08114768:
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r4, r0
-	movs r1, 0xC
-	strb r1, [r0]
-	b _081148D2
-	.align 2, 0
-_08114774: .4byte 0x02014800
-_08114778: .4byte 0x000030c4
-_0811477C:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r6, _081147B4 @ =0x02014800
-	mov r0, r8
-	adds r5, r3, r0
-	ldr r1, _081147B8 @ =0x000030c4
-	adds r4, r6, r1
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldr r2, _081147BC @ =0x000020c4
-	adds r0, r6, r2
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldr r3, [sp, 0x10]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _081147C0
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	mov r4, sp
-	ldrb r4, [r4, 0x4]
-	strb r4, [r0]
-	b _08114844
-	.align 2, 0
-_081147B4: .4byte 0x02014800
-_081147B8: .4byte 0x000030c4
-_081147BC: .4byte 0x000020c4
-_081147C0:
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	movs r1, 0x1
-	strb r1, [r0]
-	adds r0, r3, 0x1
-	mov r10, r0
-	b _081148D2
-_081147D0:
-	movs r1, 0
-	str r1, [sp, 0x4]
-	ldr r6, _08114804 @ =0x02014800
-	mov r2, r8
-	adds r5, r3, r2
-	ldr r0, _08114808 @ =0x000030c4
-	adds r4, r6, r0
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114DF0
-	ldr r1, _0811480C @ =0x000020c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldr r3, [sp, 0x10]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _08114882
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	movs r1, 0x2
-	b _08114842
-	.align 2, 0
-_08114804: .4byte 0x02014800
-_08114808: .4byte 0x000030c4
-_0811480C: .4byte 0x000020c4
-_08114810:
-	movs r0, 0
-	str r0, [sp, 0x4]
-	ldr r6, _0811484C @ =0x02014800
-	mov r1, r8
-	adds r5, r3, r1
-	ldr r2, _08114850 @ =0x000030c4
-	adds r4, r6, r2
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldr r1, _08114854 @ =0x000020c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldr r3, [sp, 0x10]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _08114882
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	movs r1, 0x3
-_08114842:
-	strb r1, [r0]
-_08114844:
-	adds r5, r3, 0x1
-	mov r10, r5
-	b _081148D2
-	.align 2, 0
-_0811484C: .4byte 0x02014800
-_08114850: .4byte 0x000030c4
-_08114854: .4byte 0x000020c4
-_08114858:
-	movs r0, 0
-	str r0, [sp, 0x4]
-	ldr r6, _08114894 @ =0x02014800
-	mov r1, r8
-	adds r5, r3, r1
-	ldr r2, _08114898 @ =0x000030c4
-	adds r4, r6, r2
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r3, [sp, 0x10]
-	bl sub_8114DF0
-	ldr r1, _0811489C @ =0x000020c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldr r3, [sp, 0x10]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _081148C4
-_08114882:
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	mov r2, sp
-	ldrb r2, [r2, 0x4]
-	strb r2, [r0]
-	adds r4, r3, 0x1
-	mov r10, r4
-	b _081148D2
-	.align 2, 0
-_08114894: .4byte 0x02014800
-_08114898: .4byte 0x000030c4
-_0811489C: .4byte 0x000020c4
-_081148A0:
-	mov r0, r9
-	adds r0, 0xC4
-	adds r0, r7, r0
-	movs r5, 0
-	strb r5, [r0]
-	b _081148D2
-_081148AC:
-	mov r0, r9
-	adds r0, 0xC4
-	adds r0, r7, r0
-	movs r1, 0
-	strb r1, [r0]
-	b _081148D2
-_081148B8:
-	mov r0, r9
-	adds r0, 0xC4
-	adds r0, r7, r0
-	movs r1, 0
-	strb r1, [r0]
-	b _081148D2
-_081148C4:
-	adds r0, r6, 0
-	adds r0, 0xC4
-	adds r0, r5, r0
-	movs r1, 0x4
-	strb r1, [r0]
-	adds r2, r3, 0x1
-	mov r10, r2
-_081148D2:
-	ldr r0, _081148F4 @ =0x02014800
-	mov r4, r8
-	adds r1, r3, r4
-	ldr r5, _081148F8 @ =0x000008c4
-	adds r2, r0, r5
-	adds r1, r2
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	cmp r1, 0xC
-	bls _081148E8
-	b _08114D76
-_081148E8:
-	lsls r0, r1, 2
-	ldr r1, _081148FC @ =_08114900
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_081148F4: .4byte 0x02014800
-_081148F8: .4byte 0x000008c4
-_081148FC: .4byte _08114900
-	.align 2, 0
-_08114900:
-	.4byte _08114D76
-	.4byte _08114934
-	.4byte _081149B8
-	.4byte _08114A3C
-	.4byte _08114AC0
-	.4byte _08114B44
-	.4byte _08114B7C
-	.4byte _08114BB4
-	.4byte _08114BEC
-	.4byte _08114C24
-	.4byte _08114C78
-	.4byte _08114CB8
-	.4byte _08114CF8
-_08114934:
-	movs r0, 0
-	str r0, [sp, 0x4]
-	lsls r0, r3, 1
-	ldr r2, [sp]
-	lsls r1, r2, 6
-	adds r0, r1
-	ldr r5, _081149A8 @ =0x000070c4
-	adds r2, r4, r5
-	adds r2, r0, r2
-	ldr r5, _081149AC @ =0x000090c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	ldr r1, [sp, 0x4]
-	cmp r1, r5
-	blt _0811496A
-	b _08114D76
-_0811496A:
-	mov r9, r4
-	mov r2, r8
-	adds r7, r3, r2
-	ldr r0, _081149B0 @ =0x000038c4
-	add r0, r9
-	adds r4, r7, r0
-	movs r3, 0
-	ldr r0, _081149B4 @ =0x000028c4
-	add r0, r9
-	adds r2, r7, r0
-_0811497E:
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldrb r0, [r4]
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _0811499E
-	b _08114D4C
-_0811499E:
-	adds r6, 0x1
-	cmp r6, r5
-	blt _0811497E
-	b _08114D76
-	.align 2, 0
-_081149A8: .4byte 0x000070c4
-_081149AC: .4byte 0x000090c4
-_081149B0: .4byte 0x000038c4
-_081149B4: .4byte 0x000028c4
-_081149B8:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r4, _08114A28 @ =0x02014800
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _08114A2C @ =0x000070c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _08114A30 @ =0x000090c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	ldr r1, [sp, 0x4]
-	cmp r1, r5
-	blt _081149F0
-	b _08114D76
-_081149F0:
-	mov r9, r4
-	mov r2, r8
-	adds r7, r3, r2
-	ldr r0, _08114A34 @ =0x000038c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _08114A38 @ =0x000028c4
-	add r0, r9
-	adds r2, r7, r0
-_08114A02:
-	ldrb r0, [r4]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _08114A0C
-	b _08114D3C
-_08114A0C:
-	adds r1, r0, 0
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	bl sub_8114DF0
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	adds r6, 0x1
-	ldr r2, [sp, 0xC]
-	cmp r6, r5
-	blt _08114A02
-	b _08114D76
-	.align 2, 0
-_08114A28: .4byte 0x02014800
-_08114A2C: .4byte 0x000070c4
-_08114A30: .4byte 0x000090c4
-_08114A34: .4byte 0x000038c4
-_08114A38: .4byte 0x000028c4
-_08114A3C:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _08114AB0 @ =0x000070c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _08114AB4 @ =0x000090c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	ldr r1, [sp, 0x4]
-	cmp r1, r5
-	blt _08114A72
-	b _08114D76
-_08114A72:
-	mov r9, r4
-	mov r2, r8
-	adds r7, r3, r2
-	ldr r0, _08114AB8 @ =0x000038c4
-	add r0, r9
-	adds r4, r7, r0
-	movs r3, 0
-	ldr r0, _08114ABC @ =0x000028c4
-	add r0, r9
-	adds r2, r7, r0
-_08114A86:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	str r3, [sp, 0x10]
-	bl sub_8114DB4
-	ldrb r0, [r4]
-	ldr r2, [sp, 0xC]
-	ldr r3, [sp, 0x10]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _08114AA6
-	b _08114D4C
-_08114AA6:
-	adds r6, 0x1
-	cmp r6, r5
-	blt _08114A86
-	b _08114D76
-	.align 2, 0
-_08114AB0: .4byte 0x000070c4
-_08114AB4: .4byte 0x000090c4
-_08114AB8: .4byte 0x000038c4
-_08114ABC: .4byte 0x000028c4
-_08114AC0:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r4, _08114B30 @ =0x02014800
-	lsls r0, r3, 1
-	ldr r5, [sp]
-	lsls r1, r5, 6
-	adds r0, r1
-	ldr r1, _08114B34 @ =0x000070c4
-	adds r2, r4, r1
-	adds r2, r0, r2
-	ldr r5, _08114B38 @ =0x000090c4
-	adds r1, r4, r5
-	adds r0, r1
-	ldrh r1, [r0]
-	ldrh r0, [r2]
-	adds r1, r0
-	movs r0, 0xFF
-	lsls r0, 8
-	ands r0, r1
-	lsrs r5, r0, 8
-	movs r0, 0xFF
-	ands r1, r0
-	strh r1, [r2]
-	movs r6, 0
-	ldr r1, [sp, 0x4]
-	cmp r1, r5
-	blt _08114AF8
-	b _08114D76
-_08114AF8:
-	mov r9, r4
-	mov r2, r8
-	adds r7, r3, r2
-	ldr r0, _08114B3C @ =0x000038c4
-	add r0, r9
-	adds r4, r7, r0
-	ldr r0, _08114B40 @ =0x000028c4
-	add r0, r9
-	adds r2, r7, r0
-_08114B0A:
-	ldrb r0, [r4]
-	ldrb r1, [r2]
-	cmp r0, r1
-	bne _08114B14
-	b _08114D5C
-_08114B14:
-	adds r1, r0, 0
-	ldr r0, [sp]
-	str r2, [sp, 0xC]
-	bl sub_8114DF0
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	adds r6, 0x1
-	ldr r2, [sp, 0xC]
-	cmp r6, r5
-	blt _08114B0A
-	b _08114D76
-	.align 2, 0
-_08114B30: .4byte 0x02014800
-_08114B34: .4byte 0x000070c4
-_08114B38: .4byte 0x000090c4
-_08114B3C: .4byte 0x000038c4
-_08114B40: .4byte 0x000028c4
-_08114B44:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r5, _08114B70 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114B74 @ =0x000038c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	bl sub_8114E48
-	lsls r0, 24
-	cmp r0, 0
-	bne _08114B64
-	b _08114D76
-_08114B64:
-	ldr r2, _08114B78 @ =0x000008c4
-	adds r0, r5, r2
-	adds r0, r4, r0
-	movs r1, 0x9
-	b _08114D74
-	.align 2, 0
-_08114B70: .4byte 0x02014800
-_08114B74: .4byte 0x000038c4
-_08114B78: .4byte 0x000008c4
-_08114B7C:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _08114BA8 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114BAC @ =0x000038c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	bl sub_8114E48
-	lsls r0, 24
-	cmp r0, 0
-	bne _08114B9C
-	b _08114D76
-_08114B9C:
-	ldr r2, _08114BB0 @ =0x000008c4
-	adds r0, r5, r2
-	adds r0, r4, r0
-	movs r1, 0xA
-	b _08114D74
-	.align 2, 0
-_08114BA8: .4byte 0x02014800
-_08114BAC: .4byte 0x000038c4
-_08114BB0: .4byte 0x000008c4
-_08114BB4:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _08114BE0 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114BE4 @ =0x000038c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	bl sub_8114E48
-	lsls r0, 24
-	cmp r0, 0
-	bne _08114BD4
-	b _08114D76
-_08114BD4:
-	ldr r2, _08114BE8 @ =0x000008c4
-	adds r0, r5, r2
-	adds r0, r4, r0
-	movs r1, 0xB
-	b _08114D74
-	.align 2, 0
-_08114BE0: .4byte 0x02014800
-_08114BE4: .4byte 0x000038c4
-_08114BE8: .4byte 0x000008c4
-_08114BEC:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r5, _08114C18 @ =0x02014800
-	mov r0, r8
-	adds r4, r3, r0
-	ldr r1, _08114C1C @ =0x000038c4
-	adds r0, r5, r1
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, [sp]
-	bl sub_8114E48
-	lsls r0, 24
-	cmp r0, 0
-	bne _08114C0C
-	b _08114D76
-_08114C0C:
-	ldr r2, _08114C20 @ =0x000008c4
-	adds r0, r5, r2
-	adds r0, r4, r0
-	movs r1, 0xC
-	b _08114D74
-	.align 2, 0
-_08114C18: .4byte 0x02014800
-_08114C1C: .4byte 0x000038c4
-_08114C20: .4byte 0x000008c4
-_08114C24:
-	movs r4, 0
-	str r4, [sp, 0x4]
-	ldr r6, _08114C58 @ =0x02014800
-	mov r0, r8
-	adds r5, r3, r0
-	ldr r1, _08114C5C @ =0x000038c4
-	adds r4, r6, r1
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	bl sub_8114DB4
-	ldr r2, _08114C60 @ =0x000028c4
-	adds r0, r6, r2
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _08114C68
-	ldr r4, _08114C64 @ =0x000008c4
-	adds r0, r6, r4
-	adds r0, r5, r0
-	mov r5, sp
-	ldrb r5, [r5, 0x4]
-	strb r5, [r0]
-	b _08114D76
-	.align 2, 0
-_08114C58: .4byte 0x02014800
-_08114C5C: .4byte 0x000038c4
-_08114C60: .4byte 0x000028c4
-_08114C64: .4byte 0x000008c4
-_08114C68:
-	ldr r1, _08114C74 @ =0x000008c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	movs r1, 0x1
-	b _08114D74
-	.align 2, 0
-_08114C74: .4byte 0x000008c4
-_08114C78:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r6, _08114CA8 @ =0x02014800
-	mov r4, r8
-	adds r5, r3, r4
-	ldr r0, _08114CAC @ =0x000038c4
-	adds r4, r6, r0
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	bl sub_8114DF0
-	ldr r1, _08114CB0 @ =0x000028c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _08114D1E
-	ldr r1, _08114CB4 @ =0x000008c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	movs r1, 0x2
-	b _08114D74
-	.align 2, 0
-_08114CA8: .4byte 0x02014800
-_08114CAC: .4byte 0x000038c4
-_08114CB0: .4byte 0x000028c4
-_08114CB4: .4byte 0x000008c4
-_08114CB8:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r6, _08114CE8 @ =0x02014800
-	mov r4, r8
-	adds r5, r3, r4
-	ldr r0, _08114CEC @ =0x000038c4
-	adds r4, r6, r0
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	bl sub_8114DB4
-	ldr r1, _08114CF0 @ =0x000028c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _08114D1E
-	ldr r1, _08114CF4 @ =0x000008c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	movs r1, 0x3
-	b _08114D74
-	.align 2, 0
-_08114CE8: .4byte 0x02014800
-_08114CEC: .4byte 0x000038c4
-_08114CF0: .4byte 0x000028c4
-_08114CF4: .4byte 0x000008c4
-_08114CF8:
-	movs r2, 0
-	str r2, [sp, 0x4]
-	ldr r6, _08114D2C @ =0x02014800
-	mov r4, r8
-	adds r5, r3, r4
-	ldr r0, _08114D30 @ =0x000038c4
-	adds r4, r6, r0
-	adds r4, r5, r4
-	ldrb r1, [r4]
-	ldr r0, [sp]
-	bl sub_8114DF0
-	ldr r1, _08114D34 @ =0x000028c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	ldrb r1, [r4]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _08114D6C
-_08114D1E:
-	ldr r2, _08114D38 @ =0x000008c4
-	adds r0, r6, r2
-	adds r0, r5, r0
-	mov r4, sp
-	ldrb r4, [r4, 0x4]
-	strb r4, [r0]
-	b _08114D76
-	.align 2, 0
-_08114D2C: .4byte 0x02014800
-_08114D30: .4byte 0x000038c4
-_08114D34: .4byte 0x000028c4
-_08114D38: .4byte 0x000008c4
-_08114D3C:
-	ldr r0, _08114D48 @ =0x000008c4
-	add r0, r9
-	adds r0, r7, r0
-	movs r1, 0
-	b _08114D74
-	.align 2, 0
-_08114D48: .4byte 0x000008c4
-_08114D4C:
-	ldr r0, _08114D58 @ =0x000008c4
-	add r0, r9
-	adds r0, r7, r0
-	strb r3, [r0]
-	b _08114D76
-	.align 2, 0
-_08114D58: .4byte 0x000008c4
-_08114D5C:
-	ldr r0, _08114D68 @ =0x000008c4
-	add r0, r9
-	adds r0, r7, r0
-	movs r1, 0
-	b _08114D74
-	.align 2, 0
-_08114D68: .4byte 0x000008c4
-_08114D6C:
-	ldr r1, _08114DAC @ =0x000008c4
-	adds r0, r6, r1
-	adds r0, r5, r0
-	movs r1, 0x4
-_08114D74:
-	strb r1, [r0]
-_08114D76:
-	mov r3, r10
-	ldr r2, _08114DB0 @ =0x02014800
-	adds r0, r2, 0
-	adds r0, 0x84
-	ldr r4, [sp]
-	adds r0, r4, r0
-	adds r4, r2, 0
-_08114D84:
-	ldrb r0, [r0]
-	cmp r3, r0
-	bge _08114D8E
-	bl _08114410
-_08114D8E:
-	ldr r5, [sp, 0x8]
-	str r5, [sp]
-	cmp r5, 0x3F
-	bgt _08114D9A
-	bl _081143F2
-_08114D9A:
-	ldr r0, [sp, 0x4]
-	add sp, 0x14
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08114DAC: .4byte 0x000008c4
-_08114DB0: .4byte 0x02014800
-	thumb_func_end unref_sub_81143CC
-
-	thumb_func_start sub_8114DB4
-sub_8114DB4: @ 8114DB4
-	push {lr}
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldr r2, _08114DDC @ =0x02014800
-	lsrs r1, 25
-	lsls r1, 2
-	lsls r0, 7
-	adds r1, r0
-	ldr r0, _08114DE0 @ =0x000040c4
-	adds r2, r0
-	adds r1, r2
-	ldr r2, [r1]
-	movs r0, 0x1
-	ands r3, r0
-	cmp r3, 0
-	beq _08114DE4
-	ldrb r0, [r2]
-	movs r1, 0xF0
-	b _08114DE8
-	.align 2, 0
-_08114DDC: .4byte 0x02014800
-_08114DE0: .4byte 0x000040c4
-_08114DE4:
-	ldrb r0, [r2]
-	movs r1, 0xF
-_08114DE8:
-	orrs r0, r1
-	strb r0, [r2]
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8114DB4
-
-	thumb_func_start sub_8114DF0
-sub_8114DF0: @ 8114DF0
-	push {lr}
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldr r2, _08114E28 @ =0x02014800
-	lsrs r1, 25
-	lsls r1, 2
-	lsls r0, 7
-	adds r1, r0
-	ldr r0, _08114E2C @ =0x000040c4
-	adds r2, r0
-	adds r1, r2
-	ldr r2, [r1]
-	movs r0, 0xC0
-	lsls r0, 7
-	adds r1, r2, r0
-	movs r0, 0x1
-	ands r3, r0
-	cmp r3, 0
-	beq _08114E30
-	ldrb r1, [r1]
-	movs r0, 0xF0
-	ands r0, r1
-	cmp r0, 0
-	bne _08114E42
-	ldrb r1, [r2]
-	movs r0, 0xF
-	b _08114E3E
-	.align 2, 0
-_08114E28: .4byte 0x02014800
-_08114E2C: .4byte 0x000040c4
-_08114E30:
-	ldrb r1, [r1]
-	movs r0, 0xF
-	ands r0, r1
-	cmp r0, 0
-	bne _08114E42
-	ldrb r1, [r2]
-	movs r0, 0xF0
-_08114E3E:
-	ands r0, r1
-	strb r0, [r2]
-_08114E42:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8114DF0
-
-	thumb_func_start sub_8114E48
-sub_8114E48: @ 8114E48
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	ldr r1, _08114E6C @ =0x02014800
-	ldr r2, _08114E70 @ =0x0000a0c4
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r5, r1, 0
-	cmp r0, 0
-	bne _08114E60
-	b _08114F5E
-_08114E60:
-	movs r1, 0
-	movs r3, 0
-	cmp r4, 0
-	bne _08114E74
-	movs r1, 0x1
-	b _08114EA6
-	.align 2, 0
-_08114E6C: .4byte 0x02014800
-_08114E70: .4byte 0x0000a0c4
-_08114E74:
-	subs r0, r4, 0x1
-	lsls r0, 5
-	adds r2, r3, r0
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08114EA6
-	ldr r7, _08114EC4 @ =0x000008c4
-	adds r0, r5, r7
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08114EA6
-	adds r3, 0x1
-	cmp r3, 0x1F
-	bgt _08114EA6
-	cmp r4, 0
-	bne _08114E74
-	lsls r0, r1, 24
-	movs r1, 0x80
-	lsls r1, 17
-	adds r0, r1
-	lsrs r1, r0, 24
-_08114EA6:
-	cmp r3, 0x20
-	bne _08114EB4
-	lsls r0, r1, 24
-	movs r2, 0x80
-	lsls r2, 17
-	adds r0, r2
-	lsrs r1, r0, 24
-_08114EB4:
-	movs r3, 0
-	cmp r4, 0x3F
-	bne _08114EC8
-	lsls r0, r1, 24
-	movs r7, 0x80
-	lsls r7, 17
-	adds r0, r7
-	b _08114EF8
-	.align 2, 0
-_08114EC4: .4byte 0x000008c4
-_08114EC8:
-	adds r0, r4, 0x1
-	lsls r0, 5
-	adds r2, r3, r0
-	adds r0, r5, 0
-	adds r0, 0xC4
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08114EFA
-	ldr r7, _08114F64 @ =0x000008c4
-	adds r0, r5, r7
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08114EFA
-	adds r3, 0x1
-	cmp r3, 0x1F
-	bgt _08114EFA
-	cmp r4, 0x3F
-	bne _08114EC8
-	lsls r0, r1, 24
-	movs r1, 0x80
-	lsls r1, 17
-	adds r0, r1
-_08114EF8:
-	lsrs r1, r0, 24
-_08114EFA:
-	cmp r3, 0x20
-	bne _08114F08
-	lsls r0, r1, 24
-	movs r2, 0x80
-	lsls r2, 17
-	adds r0, r2
-	lsrs r1, r0, 24
-_08114F08:
-	cmp r1, 0x2
-	beq _08114F5E
-	subs r0, r6, 0x2
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r0, 0
-	bge _08114F18
-	movs r1, 0
-_08114F18:
-	adds r0, r6, 0x2
-	lsls r0, 24
-	lsrs r2, r0, 24
-	asrs r0, 24
-	cmp r0, 0x3F
-	ble _08114F26
-	movs r2, 0x3F
-_08114F26:
-	lsls r1, 24
-	asrs r3, r1, 24
-	lsls r0, r2, 24
-	asrs r2, r0, 24
-	adds r6, r1, 0
-	adds r7, r0, 0
-	cmp r3, r2
-	bge _08114F7C
-	cmp r4, 0
-	beq _08114F7C
-	subs r0, r4, 0x1
-	lsls r5, r0, 7
-	ldr r0, _08114F68 @ =0x020188c4
-	mov r12, r0
-_08114F42:
-	asrs r0, r3, 1
-	lsls r0, 2
-	adds r0, r5
-	add r0, r12
-	ldr r1, [r0]
-	movs r0, 0x1
-	ands r0, r3
-	cmp r0, 0
-	beq _08114F6C
-	ldrb r1, [r1]
-	movs r0, 0xF0
-_08114F58:
-	ands r0, r1
-	cmp r0, 0
-	beq _08114F72
-_08114F5E:
-	movs r0, 0x1
-	b _08114FCA
-	.align 2, 0
-_08114F64: .4byte 0x000008c4
-_08114F68: .4byte 0x020188c4
-_08114F6C:
-	ldrb r1, [r1]
-	movs r0, 0xF
-	b _08114F58
-_08114F72:
-	adds r3, 0x1
-	cmp r3, r2
-	bge _08114F7C
-	cmp r4, 0
-	bne _08114F42
-_08114F7C:
-	asrs r3, r6, 24
-	asrs r1, r7, 24
-	cmp r3, r1
-	bge _08114FC8
-	cmp r4, 0x3F
-	beq _08114FC8
-	adds r0, r4, 0x1
-	lsls r5, r0, 7
-	ldr r6, _08114FB0 @ =0x020188c4
-	adds r2, r1, 0
-_08114F90:
-	asrs r0, r3, 1
-	lsls r0, 2
-	adds r0, r5
-	adds r0, r6
-	ldr r1, [r0]
-	movs r0, 0x1
-	ands r0, r3
-	cmp r0, 0
-	beq _08114FB4
-	ldrb r1, [r1]
-	movs r0, 0xF0
-	ands r0, r1
-	cmp r0, 0
-	beq _08114FBE
-	b _08114F5E
-	.align 2, 0
-_08114FB0: .4byte 0x020188c4
-_08114FB4:
-	ldrb r1, [r1]
-	movs r0, 0xF
-	ands r0, r1
-	cmp r0, 0
-	bne _08114F5E
-_08114FBE:
-	adds r3, 0x1
-	cmp r3, r2
-	bge _08114FC8
-	cmp r4, 0x3F
-	bne _08114F90
-_08114FC8:
-	movs r0, 0
-_08114FCA:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8114E48
-
-	thumb_func_start HBlankCB_EvolutionScene
-HBlankCB_EvolutionScene: @ 8114FD0
-	bx lr
-	thumb_func_end HBlankCB_EvolutionScene
-
-	thumb_func_start VBlankCB_EvolutionScene
-VBlankCB_EvolutionScene: @ 8114FD4
-	push {lr}
-	ldr r1, _08115034 @ =REG_BG0CNT
-	ldr r2, _08115038 @ =0x00009803
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x8
-	ldr r0, _0811503C @ =gUnknown_030042A4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115040 @ =gUnknown_030042A0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115044 @ =gUnknown_030042C0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115048 @ =gUnknown_030041B4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _0811504C @ =gUnknown_03004288
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115050 @ =gUnknown_03004280
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115054 @ =gUnknown_030041B0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _08115058 @ =gUnknown_030041B8
-	ldrh r0, [r0]
-	strh r0, [r1]
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	bl sub_8089668
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08115034: .4byte REG_BG0CNT
-_08115038: .4byte 0x00009803
-_0811503C: .4byte gUnknown_030042A4
-_08115040: .4byte gUnknown_030042A0
-_08115044: .4byte gUnknown_030042C0
-_08115048: .4byte gUnknown_030041B4
-_0811504C: .4byte gUnknown_03004288
-_08115050: .4byte gUnknown_03004280
-_08115054: .4byte gUnknown_030041B0
-_08115058: .4byte gUnknown_030041B8
-	thumb_func_end VBlankCB_EvolutionScene
-
-	thumb_func_start VBlankCB_TradeEvolutionScene
-VBlankCB_TradeEvolutionScene: @ 811505C
-	push {lr}
-	ldr r1, _081150B4 @ =REG_BG0HOFS
-	ldr r0, _081150B8 @ =gUnknown_030042A4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150BC @ =gUnknown_030042A0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150C0 @ =gUnknown_030042C0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150C4 @ =gUnknown_030041B4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150C8 @ =gUnknown_03004288
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150CC @ =gUnknown_03004280
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150D0 @ =gUnknown_030041B0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r0, _081150D4 @ =gUnknown_030041B8
-	ldrh r0, [r0]
-	strh r0, [r1]
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	bl sub_8089668
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081150B4: .4byte REG_BG0HOFS
-_081150B8: .4byte gUnknown_030042A4
-_081150BC: .4byte gUnknown_030042A0
-_081150C0: .4byte gUnknown_030042C0
-_081150C4: .4byte gUnknown_030041B4
-_081150C8: .4byte gUnknown_03004288
-_081150CC: .4byte gUnknown_03004280
-_081150D0: .4byte gUnknown_030041B0
-_081150D4: .4byte gUnknown_030041B8
-	thumb_func_end VBlankCB_TradeEvolutionScene
-
-	thumb_func_start sub_81150D8
-sub_81150D8: @ 81150D8
-	push {lr}
-	ldr r0, _081150F4 @ =gBattleCommunication
-	ldrb r1, [r0, 0x1]
-	lsls r1, 28
-	movs r0, 0x90
-	lsls r0, 23
-	adds r1, r0
-	lsrs r1, 24
-	movs r0, 0xC8
-	bl sub_814A880
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081150F4: .4byte gBattleCommunication
-	thumb_func_end sub_81150D8
-
-	thumb_func_start HBlankCB_TradeEvolutionScene
-HBlankCB_TradeEvolutionScene: @ 81150F8
-	bx lr
-	thumb_func_end HBlankCB_TradeEvolutionScene
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 9df9dfd8d..5e54550e3 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -581,7 +581,7 @@ _08126C68: .4byte gSprites
 	thumb_func_start FldEff_Shadow
 FldEff_Shadow: @ 8126C6C
 	push {r4,r5,lr}
-	ldr r5, _08126CF8 @ =gUnknown_0202FF84
+	ldr r5, _08126CF8 @ =gFieldEffectArguments
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
@@ -649,7 +649,7 @@ _08126CF0:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08126CF8: .4byte gUnknown_0202FF84
+_08126CF8: .4byte gFieldEffectArguments
 _08126CFC: .4byte gMapObjects
 _08126D00: .4byte gFieldEffectObjectTemplatePointers
 _08126D04: .4byte gUnknown_08401E32
@@ -758,7 +758,7 @@ _08126DD4: .4byte 0x00400001
 FldEff_TallGrass: @ 8126DD8
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, _08126E70 @ =gUnknown_0202FF84
+	ldr r5, _08126E70 @ =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -830,7 +830,7 @@ _08126E64:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08126E70: .4byte gUnknown_0202FF84
+_08126E70: .4byte gFieldEffectArguments
 _08126E74: .4byte gFieldEffectObjectTemplatePointers
 _08126E78: .4byte gSprites
 	thumb_func_end FldEff_TallGrass
@@ -972,7 +972,7 @@ _08126F7C: .4byte gMapObjects
 	thumb_func_start FldEff_JumpTallGrass
 FldEff_JumpTallGrass: @ 8126F80
 	push {r4,lr}
-	ldr r4, _08126FE4 @ =gUnknown_0202FF84
+	ldr r4, _08126FE4 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1021,7 +1021,7 @@ _08126FDC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08126FE4: .4byte gUnknown_0202FF84
+_08126FE4: .4byte gFieldEffectArguments
 _08126FE8: .4byte gFieldEffectObjectTemplatePointers
 _08126FEC: .4byte gSprites
 	thumb_func_end FldEff_JumpTallGrass
@@ -1106,7 +1106,7 @@ _08127074:
 FldEff_LongGrass: @ 8127080
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, _0812711C @ =gUnknown_0202FF84
+	ldr r5, _0812711C @ =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -1179,7 +1179,7 @@ _08127110:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0812711C: .4byte gUnknown_0202FF84
+_0812711C: .4byte gFieldEffectArguments
 _08127120: .4byte gFieldEffectObjectTemplatePointers
 _08127124: .4byte gSprites
 	thumb_func_end FldEff_LongGrass
@@ -1313,7 +1313,7 @@ _0812721C: .4byte gMapObjects
 	thumb_func_start FldEff_JumpLongGrass
 FldEff_JumpLongGrass: @ 8127220
 	push {r4,lr}
-	ldr r4, _08127284 @ =gUnknown_0202FF84
+	ldr r4, _08127284 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1362,7 +1362,7 @@ _0812727C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127284: .4byte gUnknown_0202FF84
+_08127284: .4byte gFieldEffectArguments
 _08127288: .4byte gFieldEffectObjectTemplatePointers
 _0812728C: .4byte gSprites
 	thumb_func_end FldEff_JumpLongGrass
@@ -1370,7 +1370,7 @@ _0812728C: .4byte gSprites
 	thumb_func_start FldEff_ShortGrass
 FldEff_ShortGrass: @ 8127290
 	push {r4-r6,lr}
-	ldr r6, _08127324 @ =gUnknown_0202FF84
+	ldr r6, _08127324 @ =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -1443,7 +1443,7 @@ _0812731C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127324: .4byte gUnknown_0202FF84
+_08127324: .4byte gFieldEffectArguments
 _08127328: .4byte gMapObjects
 _0812732C: .4byte gFieldEffectObjectTemplatePointers
 _08127330: .4byte gSprites
@@ -1577,7 +1577,7 @@ _08127424: .4byte gSprites
 	thumb_func_start FldEff_SandFootprints
 FldEff_SandFootprints: @ 8127428
 	push {r4,lr}
-	ldr r4, _08127490 @ =gUnknown_0202FF84
+	ldr r4, _08127490 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1626,7 +1626,7 @@ _08127486:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127490: .4byte gUnknown_0202FF84
+_08127490: .4byte gFieldEffectArguments
 _08127494: .4byte gFieldEffectObjectTemplatePointers
 _08127498: .4byte gSprites
 	thumb_func_end FldEff_SandFootprints
@@ -1634,7 +1634,7 @@ _08127498: .4byte gSprites
 	thumb_func_start FldEff_DeepSandFootprints
 FldEff_DeepSandFootprints: @ 812749C
 	push {r4,r5,lr}
-	ldr r4, _08127504 @ =gUnknown_0202FF84
+	ldr r4, _08127504 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1684,7 +1684,7 @@ _081274FC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127504: .4byte gUnknown_0202FF84
+_08127504: .4byte gFieldEffectArguments
 _08127508: .4byte gFieldEffectObjectTemplatePointers
 _0812750C: .4byte gSprites
 	thumb_func_end FldEff_DeepSandFootprints
@@ -1692,7 +1692,7 @@ _0812750C: .4byte gSprites
 	thumb_func_start FldEff_BikeTireTracks
 FldEff_BikeTireTracks: @ 8127510
 	push {r4,r5,lr}
-	ldr r4, _08127578 @ =gUnknown_0202FF84
+	ldr r4, _08127578 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1742,7 +1742,7 @@ _08127570:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127578: .4byte gUnknown_0202FF84
+_08127578: .4byte gFieldEffectArguments
 _0812757C: .4byte gFieldEffectObjectTemplatePointers
 _08127580: .4byte gSprites
 	thumb_func_end FldEff_BikeTireTracks
@@ -1827,7 +1827,7 @@ _08127608:
 	thumb_func_start FldEff_Splash
 FldEff_Splash: @ 8127610
 	push {r4-r6,lr}
-	ldr r6, _081276A4 @ =gUnknown_0202FF84
+	ldr r6, _081276A4 @ =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -1897,7 +1897,7 @@ _0812769A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081276A4: .4byte gUnknown_0202FF84
+_081276A4: .4byte gFieldEffectArguments
 _081276A8: .4byte gMapObjects
 _081276AC: .4byte gFieldEffectObjectTemplatePointers
 _081276B0: .4byte gSprites
@@ -1978,7 +1978,7 @@ _0812773C: .4byte gMapObjects
 	thumb_func_start FldEff_JumpSmallSplash
 FldEff_JumpSmallSplash: @ 8127740
 	push {r4,lr}
-	ldr r4, _081277A4 @ =gUnknown_0202FF84
+	ldr r4, _081277A4 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2027,7 +2027,7 @@ _0812779C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081277A4: .4byte gUnknown_0202FF84
+_081277A4: .4byte gFieldEffectArguments
 _081277A8: .4byte gFieldEffectObjectTemplatePointers
 _081277AC: .4byte gSprites
 	thumb_func_end FldEff_JumpSmallSplash
@@ -2035,7 +2035,7 @@ _081277AC: .4byte gSprites
 	thumb_func_start FldEff_JumpBigSplash
 FldEff_JumpBigSplash: @ 81277B0
 	push {r4,lr}
-	ldr r4, _08127814 @ =gUnknown_0202FF84
+	ldr r4, _08127814 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2084,7 +2084,7 @@ _0812780C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127814: .4byte gUnknown_0202FF84
+_08127814: .4byte gFieldEffectArguments
 _08127818: .4byte gFieldEffectObjectTemplatePointers
 _0812781C: .4byte gSprites
 	thumb_func_end FldEff_JumpBigSplash
@@ -2092,7 +2092,7 @@ _0812781C: .4byte gSprites
 	thumb_func_start FldEff_FeetInFlowingWater
 FldEff_FeetInFlowingWater: @ 8127820
 	push {r4-r7,lr}
-	ldr r7, _081278C0 @ =gUnknown_0202FF84
+	ldr r7, _081278C0 @ =gFieldEffectArguments
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
@@ -2168,7 +2168,7 @@ _081278B6:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081278C0: .4byte gUnknown_0202FF84
+_081278C0: .4byte gFieldEffectArguments
 _081278C4: .4byte gMapObjects
 _081278C8: .4byte gFieldEffectObjectTemplatePointers
 _081278CC: .4byte gSprites
@@ -2263,7 +2263,7 @@ FldEff_Ripple: @ 8127978
 	push {r4,lr}
 	ldr r0, _081279CC @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x14]
-	ldr r4, _081279D0 @ =gUnknown_0202FF84
+	ldr r4, _081279D0 @ =gFieldEffectArguments
 	movs r2, 0
 	ldrsh r1, [r4, r2]
 	movs r3, 0x4
@@ -2304,14 +2304,14 @@ _081279C4:
 	bx r1
 	.align 2, 0
 _081279CC: .4byte gFieldEffectObjectTemplatePointers
-_081279D0: .4byte gUnknown_0202FF84
+_081279D0: .4byte gFieldEffectArguments
 _081279D4: .4byte gSprites
 	thumb_func_end FldEff_Ripple
 
 	thumb_func_start FldEff_HotSpringsWater
 FldEff_HotSpringsWater: @ 81279D8
 	push {r4-r6,lr}
-	ldr r6, _08127A6C @ =gUnknown_0202FF84
+	ldr r6, _08127A6C @ =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -2384,7 +2384,7 @@ _08127A64:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127A6C: .4byte gUnknown_0202FF84
+_08127A6C: .4byte gFieldEffectArguments
 _08127A70: .4byte gMapObjects
 _08127A74: .4byte gFieldEffectObjectTemplatePointers
 _08127A78: .4byte gSprites
@@ -2472,7 +2472,7 @@ _08127B10: .4byte gSprites
 	thumb_func_start FldEff_Unknown19
 FldEff_Unknown19: @ 8127B14
 	push {r4,lr}
-	ldr r4, _08127B74 @ =gUnknown_0202FF84
+	ldr r4, _08127B74 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2519,7 +2519,7 @@ _08127B6C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127B74: .4byte gUnknown_0202FF84
+_08127B74: .4byte gFieldEffectArguments
 _08127B78: .4byte gFieldEffectObjectTemplatePointers
 _08127B7C: .4byte gSprites
 	thumb_func_end FldEff_Unknown19
@@ -2527,7 +2527,7 @@ _08127B7C: .4byte gSprites
 	thumb_func_start FldEff_Unknown20
 FldEff_Unknown20: @ 8127B80
 	push {r4,lr}
-	ldr r4, _08127BE0 @ =gUnknown_0202FF84
+	ldr r4, _08127BE0 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2574,7 +2574,7 @@ _08127BD8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127BE0: .4byte gUnknown_0202FF84
+_08127BE0: .4byte gFieldEffectArguments
 _08127BE4: .4byte gFieldEffectObjectTemplatePointers
 _08127BE8: .4byte gSprites
 	thumb_func_end FldEff_Unknown20
@@ -2582,7 +2582,7 @@ _08127BE8: .4byte gSprites
 	thumb_func_start FldEff_Unknown21
 FldEff_Unknown21: @ 8127BEC
 	push {r4,lr}
-	ldr r4, _08127C4C @ =gUnknown_0202FF84
+	ldr r4, _08127C4C @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2629,7 +2629,7 @@ _08127C44:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127C4C: .4byte gUnknown_0202FF84
+_08127C4C: .4byte gFieldEffectArguments
 _08127C50: .4byte gFieldEffectObjectTemplatePointers
 _08127C54: .4byte gSprites
 	thumb_func_end FldEff_Unknown21
@@ -2637,7 +2637,7 @@ _08127C54: .4byte gSprites
 	thumb_func_start FldEff_Unknown22
 FldEff_Unknown22: @ 8127C58
 	push {r4,lr}
-	ldr r4, _08127CB8 @ =gUnknown_0202FF84
+	ldr r4, _08127CB8 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2684,7 +2684,7 @@ _08127CB0:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127CB8: .4byte gUnknown_0202FF84
+_08127CB8: .4byte gFieldEffectArguments
 _08127CBC: .4byte gFieldEffectObjectTemplatePointers
 _08127CC0: .4byte gSprites
 	thumb_func_end FldEff_Unknown22
@@ -2694,7 +2694,7 @@ ash: @ 8127CC4
 	push {r4,lr}
 	lsls r2, 16
 	lsrs r2, 16
-	ldr r4, _08127CF4 @ =gUnknown_0202FF84
+	ldr r4, _08127CF4 @ =gFieldEffectArguments
 	lsls r0, 16
 	asrs r0, 16
 	str r0, [r4]
@@ -2715,14 +2715,14 @@ ash: @ 8127CC4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08127CF4: .4byte gUnknown_0202FF84
+_08127CF4: .4byte gFieldEffectArguments
 	thumb_func_end ash
 
 	thumb_func_start FldEff_Ash
 FldEff_Ash: @ 8127CF8
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, _08127D78 @ =gUnknown_0202FF84
+	ldr r5, _08127D78 @ =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -2784,7 +2784,7 @@ _08127D6E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127D78: .4byte gUnknown_0202FF84
+_08127D78: .4byte gFieldEffectArguments
 _08127D7C: .4byte gFieldEffectObjectTemplatePointers
 _08127D80: .4byte gSprites
 	thumb_func_end FldEff_Ash
@@ -2907,7 +2907,7 @@ _08127E50:
 	thumb_func_start FldEff_SurfBlob
 FldEff_SurfBlob: @ 8127E58
 	push {r4,r5,lr}
-	ldr r4, _08127EC0 @ =gUnknown_0202FF84
+	ldr r4, _08127EC0 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2957,7 +2957,7 @@ _08127EB2:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08127EC0: .4byte gUnknown_0202FF84
+_08127EC0: .4byte gFieldEffectArguments
 _08127EC4: .4byte gFieldEffectObjectTemplatePointers
 _08127EC8: .4byte gSprites
 _08127ECC: .4byte 0x0000ffff
@@ -3375,7 +3375,7 @@ _081281B0: .4byte gSprites
 	thumb_func_start FldEff_Dust
 FldEff_Dust: @ 81281B4
 	push {r4,lr}
-	ldr r4, _08128218 @ =gUnknown_0202FF84
+	ldr r4, _08128218 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3424,7 +3424,7 @@ _08128210:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08128218: .4byte gUnknown_0202FF84
+_08128218: .4byte gFieldEffectArguments
 _0812821C: .4byte gFieldEffectObjectTemplatePointers
 _08128220: .4byte gSprites
 	thumb_func_end FldEff_Dust
@@ -3432,7 +3432,7 @@ _08128220: .4byte gSprites
 	thumb_func_start FldEff_SandPile
 FldEff_SandPile: @ 8128224
 	push {r4-r7,lr}
-	ldr r7, _081282D0 @ =gUnknown_0202FF84
+	ldr r7, _081282D0 @ =gFieldEffectArguments
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
@@ -3515,7 +3515,7 @@ _081282C8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081282D0: .4byte gUnknown_0202FF84
+_081282D0: .4byte gFieldEffectArguments
 _081282D4: .4byte gMapObjects
 _081282D8: .4byte gFieldEffectObjectTemplatePointers
 _081282DC: .4byte gSprites
@@ -3629,7 +3629,7 @@ _081283A8: .4byte gMapObjects
 	thumb_func_start FldEff_Bubbles
 FldEff_Bubbles: @ 81283AC
 	push {r4,lr}
-	ldr r4, _08128404 @ =gUnknown_0202FF84
+	ldr r4, _08128404 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3672,7 +3672,7 @@ _081283FC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08128404: .4byte gUnknown_0202FF84
+_08128404: .4byte gFieldEffectArguments
 _08128408: .4byte gFieldEffectObjectTemplatePointers
 _0812840C: .4byte gSprites
 	thumb_func_end FldEff_Bubbles
@@ -3714,7 +3714,7 @@ _0812844C: .4byte 0x00001004
 	thumb_func_start FldEff_BerryTreeGrowthSparkle
 FldEff_BerryTreeGrowthSparkle: @ 8128450
 	push {r4,lr}
-	ldr r4, _081284B8 @ =gUnknown_0202FF84
+	ldr r4, _081284B8 @ =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3765,7 +3765,7 @@ _081284B0:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_081284B8: .4byte gUnknown_0202FF84
+_081284B8: .4byte gFieldEffectArguments
 _081284BC: .4byte gFieldEffectObjectTemplatePointers
 _081284C0: .4byte gSprites
 	thumb_func_end FldEff_BerryTreeGrowthSparkle
@@ -3816,7 +3816,7 @@ ShowDisguiseFieldEffect: @ 81284F4
 	lsrs r6, r1, 24
 	lsls r2, 24
 	lsrs r7, r2, 24
-	ldr r5, _08128528 @ =gUnknown_0202FF84
+	ldr r5, _08128528 @ =gFieldEffectArguments
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
@@ -3830,7 +3830,7 @@ ShowDisguiseFieldEffect: @ 81284F4
 	movs r0, 0x40
 	b _08128598
 	.align 2, 0
-_08128528: .4byte gUnknown_0202FF84
+_08128528: .4byte gFieldEffectArguments
 _0812852C:
 	ldr r1, _081285A4 @ =gFieldEffectObjectTemplatePointers
 	lsls r0, r6, 2
@@ -4084,7 +4084,7 @@ _081286FC:
 	thumb_func_start FldEff_Sparkle
 FldEff_Sparkle: @ 8128700
 	push {r4,lr}
-	ldr r4, _08128768 @ =gUnknown_0202FF84
+	ldr r4, _08128768 @ =gFieldEffectArguments
 	ldr r0, [r4]
 	adds r0, 0x7
 	str r0, [r4]
@@ -4135,7 +4135,7 @@ _08128760:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08128768: .4byte gUnknown_0202FF84
+_08128768: .4byte gFieldEffectArguments
 _0812876C: .4byte gFieldEffectObjectTemplatePointers
 _08128770: .4byte gSprites
 	thumb_func_end FldEff_Sparkle
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
deleted file mode 100644
index 47c4b4c60..000000000
--- a/asm/field_ground_effect.s
+++ /dev/null
@@ -1,1302 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start FieldObjectCheckForReflectiveSurface
-FieldObjectCheckForReflectiveSurface: @ 8063A44
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	adds r1, 0x8
-	lsls r1, 12
-	lsrs r1, 16
-	str r1, [sp]
-	movs r1, 0xA
-	ldrsh r0, [r0, r1]
-	adds r0, 0x8
-	lsls r0, 12
-	movs r4, 0
-	lsrs r2, r0, 16
-	str r2, [sp, 0x4]
-	asrs r0, 16
-	cmp r4, r0
-	blt _08063A7A
-	b _08063B80
-_08063A7A:
-	movs r0, 0x1
-	mov r10, r0
-_08063A7E:
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	add r1, r10
-	lsls r4, 16
-	asrs r6, r4, 16
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r4
-	cmp r0, 0
-	bne _08063B82
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	add r1, r10
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08063B82
-	movs r2, 0x1
-	ldr r1, [sp]
-	lsls r0, r1, 16
-	asrs r1, r0, 16
-	mov r8, r0
-	cmp r2, r1
-	bge _08063B6E
-	movs r0, 0x80
-	lsls r0, 9
-	asrs r7, r0, 16
-_08063AD8:
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	lsls r1, r2, 16
-	asrs r4, r1, 16
-	adds r0, r4
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08063B82
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	subs r0, r4
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08063B82
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	adds r0, r4
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08063B82
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	subs r0, r4
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08063B82
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r0, r8
-	blt _08063AD8
-_08063B6E:
-	movs r1, 0x80
-	lsls r1, 9
-	add r1, r9
-	lsrs r4, r1, 16
-	ldr r2, [sp, 0x4]
-	lsls r0, r2, 16
-	cmp r1, r0
-	bge _08063B80
-	b _08063A7E
-_08063B80:
-	movs r0, 0
-_08063B82:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldObjectCheckForReflectiveSurface
-
-	thumb_func_start GetReflectionTypeByMetatileBehavior
-GetReflectionTypeByMetatileBehavior: @ 8063B94
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsIce
-	lsls r0, 24
-	cmp r0, 0
-	beq _08063BAA
-	movs r0, 0x1
-	b _08063BBC
-_08063BAA:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsReflective
-	lsls r0, 24
-	cmp r0, 0
-	bne _08063BBA
-	movs r0, 0
-	b _08063BBC
-_08063BBA:
-	movs r0, 0x2
-_08063BBC:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetReflectionTypeByMetatileBehavior
-
-	thumb_func_start GetLedgeJumpDirection
-GetLedgeJumpDirection: @ 8063BC4
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r3, r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 24
-	lsrs r4, r2, 24
-	cmp r4, 0
-	beq _08063C0A
-	cmp r4, 0x4
-	bls _08063BE0
-	subs r0, r4, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-_08063BE0:
-	subs r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r3, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08063C10 @ =gUnknown_08376040
-	lsls r1, r4, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08063C14
-_08063C0A:
-	movs r0, 0
-	b _08063C1A
-	.align 2, 0
-_08063C10: .4byte gUnknown_08376040
-_08063C14:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-_08063C1A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetLedgeJumpDirection
-
-	thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
-FieldObjectSetSpriteOamTableForLongGrass: @ 8063C20
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldrb r0, [r5]
-	lsls r0, 27
-	cmp r0, 0
-	blt _08063C74
-	ldrb r0, [r5, 0x1E]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08063C74
-	ldrb r0, [r5, 0x1F]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08063C74
-	adds r4, 0x42
-	ldrb r1, [r4]
-	movs r6, 0x40
-	negs r6, r6
-	adds r0, r6, 0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-	ldrb r0, [r5, 0xB]
-	lsrs r0, 4
-	bl ZCoordToPriority
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08063C74
-	ldrb r0, [r4]
-	adds r1, r6, 0
-	ands r1, r0
-	movs r0, 0x5
-	orrs r1, r0
-	strb r1, [r4]
-_08063C74:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
-
-	thumb_func_start IsZCoordMismatchAt
-IsZCoordMismatchAt: @ 8063C7C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 16
-	lsrs r0, r1, 16
-	lsls r2, 16
-	lsrs r1, r2, 16
-	cmp r4, 0
-	beq _08063CAA
-	lsls r0, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _08063CAA
-	cmp r0, 0xF
-	beq _08063CAA
-	cmp r0, r4
-	bne _08063CAE
-_08063CAA:
-	movs r0, 0
-	b _08063CB0
-_08063CAE:
-	movs r0, 0x1
-_08063CB0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end IsZCoordMismatchAt
-
-	thumb_func_start FieldObjectUpdateZCoordAndPriority
-FieldObjectUpdateZCoordAndPriority: @ 8063CB8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x3]
-	lsls r0, 29
-	cmp r0, 0
-	blt _08063D06
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
-	ldr r1, _08063D0C @ =gFieldObjectPriorities_08376070
-	ldrb r2, [r4, 0xB]
-	lsls r2, 24
-	lsrs r0, r2, 28
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r4, r5, 0
-	adds r4, 0x42
-	movs r1, 0x3F
-	ands r1, r0
-	ldrb r3, [r4]
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r4]
-	ldr r0, _08063D10 @ =gFieldObjectPriorities_08376060
-	lsrs r2, 28
-	adds r2, r0
-	movs r0, 0x3
-	ldrb r1, [r2]
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-_08063D06:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063D0C: .4byte gFieldObjectPriorities_08376070
-_08063D10: .4byte gFieldObjectPriorities_08376060
-	thumb_func_end FieldObjectUpdateZCoordAndPriority
-
-	thumb_func_start InitObjectPriorityByZCoord
-InitObjectPriorityByZCoord: @ 8063D14
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, _08063D58 @ =gFieldObjectPriorities_08376070
-	adds r2, r1, r2
-	ldrb r2, [r2]
-	movs r3, 0x42
-	adds r3, r0
-	mov r12, r3
-	movs r3, 0x3F
-	ands r3, r2
-	mov r2, r12
-	ldrb r4, [r2]
-	movs r2, 0x40
-	negs r2, r2
-	ands r2, r4
-	orrs r2, r3
-	mov r3, r12
-	strb r2, [r3]
-	ldr r2, _08063D5C @ =gFieldObjectPriorities_08376060
-	adds r1, r2
-	movs r3, 0x3
-	ldrb r2, [r1]
-	ands r2, r3
-	lsls r2, 2
-	ldrb r3, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063D58: .4byte gFieldObjectPriorities_08376070
-_08063D5C: .4byte gFieldObjectPriorities_08376060
-	thumb_func_end InitObjectPriorityByZCoord
-
-	thumb_func_start ZCoordToPriority
-ZCoordToPriority: @ 8063D60
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08063D6C @ =gFieldObjectPriorities_08376060
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.align 2, 0
-_08063D6C: .4byte gFieldObjectPriorities_08376060
-	thumb_func_end ZCoordToPriority
-
-	thumb_func_start FieldObjectUpdateZCoord
-FieldObjectUpdateZCoord: @ 8063D70
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	movs r2, 0x16
-	ldrsh r1, [r4, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r5, 0xF
-	beq _08063DBE
-	cmp r0, 0xF
-	beq _08063DBE
-	movs r3, 0xF
-	adds r0, r5, 0
-	ands r0, r3
-	ldrb r1, [r4, 0xB]
-	movs r2, 0x10
-	negs r2, r2
-	ands r2, r1
-	orrs r2, r0
-	strb r2, [r4, 0xB]
-	cmp r5, 0
-	beq _08063DBE
-	cmp r5, 0xF
-	beq _08063DBE
-	lsls r0, r5, 4
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r4, 0xB]
-_08063DBE:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateZCoord
-
-	thumb_func_start SetObjectSubpriorityByZCoord
-SetObjectSubpriorityByZCoord: @ 8063DC4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 24
-	lsrs r2, 24
-	adds r3, r1, 0
-	adds r3, 0x29
-	movs r5, 0
-	ldrsb r5, [r3, r5]
-	ldrh r4, [r1, 0x22]
-	ldr r3, _08063E04 @ =gSpriteCoordOffsetY
-	subs r4, r5
-	ldrh r3, [r3]
-	adds r4, r3
-	adds r4, 0x8
-	movs r3, 0xFF
-	ands r4, r3
-	lsrs r4, 4
-	movs r3, 0x10
-	subs r3, r4
-	lsls r3, 17
-	ldr r4, _08063E08 @ =gUnknown_08376050
-	adds r0, r4
-	lsrs r3, 16
-	ldrb r0, [r0]
-	adds r3, r0
-	adds r2, r3
-	adds r1, 0x43
-	strb r2, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063E04: .4byte gSpriteCoordOffsetY
-_08063E08: .4byte gUnknown_08376050
-	thumb_func_end SetObjectSubpriorityByZCoord
-
-	thumb_func_start FieldObjectUpdateSubpriority
-FieldObjectUpdateSubpriority: @ 8063E0C
-	push {lr}
-	adds r2, r0, 0
-	ldrb r0, [r2, 0x3]
-	lsls r0, 29
-	cmp r0, 0
-	blt _08063E22
-	ldrb r0, [r2, 0xB]
-	lsrs r0, 4
-	movs r2, 0x1
-	bl SetObjectSubpriorityByZCoord
-_08063E22:
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateSubpriority
-
-	thumb_func_start AreZCoordsCompatible
-AreZCoordsCompatible: @ 8063E28
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r0, 0
-	beq _08063E3E
-	cmp r1, 0
-	beq _08063E3E
-	cmp r0, r1
-	bne _08063E42
-_08063E3E:
-	movs r0, 0x1
-	b _08063E44
-_08063E42:
-	movs r0, 0
-_08063E44:
-	pop {r1}
-	bx r1
-	thumb_func_end AreZCoordsCompatible
-
-	thumb_func_start GroundEffect_SpawnOnTallGrass
-GroundEffect_SpawnOnTallGrass: @ 8063E48
-	push {lr}
-	ldr r3, _08063E8C @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r1, _08063E90 @ =gSaveBlock1
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0x1
-	str r0, [r3, 0x1C]
-	movs r0, 0x4
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063E8C: .4byte gUnknown_0202FF84
-_08063E90: .4byte gSaveBlock1
-	thumb_func_end GroundEffect_SpawnOnTallGrass
-
-	thumb_func_start sub_8063E94
-sub_8063E94: @ 8063E94
-	push {lr}
-	ldr r3, _08063ED8 @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r1, _08063EDC @ =gSaveBlock1
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0
-	str r0, [r3, 0x1C]
-	movs r0, 0x4
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063ED8: .4byte gUnknown_0202FF84
-_08063EDC: .4byte gSaveBlock1
-	thumb_func_end sub_8063E94
-
-	thumb_func_start sub_8063EE0
-sub_8063EE0: @ 8063EE0
-	push {lr}
-	ldr r3, _08063F24 @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r1, _08063F28 @ =gSaveBlock1
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0x1
-	str r0, [r3, 0x1C]
-	movs r0, 0x11
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063F24: .4byte gUnknown_0202FF84
-_08063F28: .4byte gSaveBlock1
-	thumb_func_end sub_8063EE0
-
-	thumb_func_start sub_8063F2C
-sub_8063F2C: @ 8063F2C
-	push {lr}
-	ldr r3, _08063F70 @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r1, _08063F74 @ =gSaveBlock1
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0
-	str r0, [r3, 0x1C]
-	movs r0, 0x11
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063F70: .4byte gUnknown_0202FF84
-_08063F74: .4byte gSaveBlock1
-	thumb_func_end sub_8063F2C
-
-	thumb_func_start GroundEffect_WaterReflection
-GroundEffect_WaterReflection: @ 8063F78
-	push {lr}
-	movs r2, 0
-	bl SetUpReflection
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_WaterReflection
-
-	thumb_func_start GroundEffect_IceReflection
-GroundEffect_IceReflection: @ 8063F84
-	push {lr}
-	movs r2, 0x1
-	bl SetUpReflection
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_IceReflection
-
-	thumb_func_start GroundEffect_FlowingWater
-GroundEffect_FlowingWater: @ 8063F90
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x22
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_FlowingWater
-
-	thumb_func_start sub_8063FA0
-sub_8063FA0: @ 8063FA0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldr r1, _08063FC8 @ =gUnknown_08376080
-	ldrb r0, [r0, 0xD]
-	lsls r0, 2
-	adds r0, r1
-	ldr r3, [r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl _call_via_r3
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063FC8: .4byte gUnknown_08376080
-	thumb_func_end sub_8063FA0
-
-	thumb_func_start sub_8063FCC
-sub_8063FCC: @ 8063FCC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldr r1, _08063FF4 @ =gUnknown_08376080
-	ldrb r0, [r0, 0xD]
-	lsls r0, 2
-	adds r0, r1
-	ldr r3, [r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl _call_via_r3
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08063FF4: .4byte gUnknown_08376080
-	thumb_func_end sub_8063FCC
-
-	thumb_func_start nullsub_50
-nullsub_50: @ 8063FF8
-	bx lr
-	thumb_func_end nullsub_50
-
-	thumb_func_start DoTracksGroundEffect_Footprints
-DoTracksGroundEffect_Footprints: @ 8063FFC
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	lsls r4, r2, 24
-	lsrs r4, 24
-	ldr r1, _08064044 @ =gSandFootprints_FieldEffectData
-	mov r0, sp
-	movs r2, 0x4
-	bl memcpy
-	ldr r1, _08064048 @ =gUnknown_0202FF84
-	movs r2, 0x14
-	ldrsh r0, [r5, r2]
-	str r0, [r1]
-	movs r2, 0x16
-	ldrsh r0, [r5, r2]
-	str r0, [r1, 0x4]
-	movs r0, 0x95
-	str r0, [r1, 0x8]
-	movs r0, 0x2
-	str r0, [r1, 0xC]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	str r0, [r1, 0x10]
-	lsls r4, 1
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	bl FieldEffectStart
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064044: .4byte gSandFootprints_FieldEffectData
-_08064048: .4byte gUnknown_0202FF84
-	thumb_func_end DoTracksGroundEffect_Footprints
-
-	thumb_func_start DoTracksGroundEffect_BikeTireTracks
-DoTracksGroundEffect_BikeTireTracks: @ 806404C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, [r4, 0x10]
-	ldr r0, [r4, 0x14]
-	cmp r1, r0
-	beq _0806408E
-	ldr r2, _08064094 @ =gUnknown_0202FF84
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	str r0, [r2]
-	movs r1, 0x16
-	ldrsh r0, [r4, r1]
-	str r0, [r2, 0x4]
-	movs r0, 0x95
-	str r0, [r2, 0x8]
-	movs r0, 0x2
-	str r0, [r2, 0xC]
-	ldr r3, _08064098 @ =gBikeTireTracks_Transitions
-	ldrb r1, [r4, 0x18]
-	lsls r1, 28
-	lsrs r1, 28
-	adds r0, r4, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	lsls r0, 2
-	subs r0, 0x5
-	adds r1, r0
-	adds r1, r3
-	ldrb r0, [r1]
-	str r0, [r2, 0x10]
-	movs r0, 0x23
-	bl FieldEffectStart
-_0806408E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064094: .4byte gUnknown_0202FF84
-_08064098: .4byte gBikeTireTracks_Transitions
-	thumb_func_end DoTracksGroundEffect_BikeTireTracks
-
-	thumb_func_start GroundEffect_Ripple
-GroundEffect_Ripple: @ 806409C
-	push {lr}
-	bl DoRippleFieldEffect
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_Ripple
-
-	thumb_func_start GroundEffect_StepOnPuddle
-GroundEffect_StepOnPuddle: @ 80640A8
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0xF
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_StepOnPuddle
-
-	thumb_func_start GroundEffect_SandPile
-GroundEffect_SandPile: @ 80640B8
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x27
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_SandPile
-
-	thumb_func_start GroundEffect_JumpOnTallGrass
-GroundEffect_JumpOnTallGrass: @ 80640C8
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r1, _0806411C @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r0, [r5, r2]
-	str r0, [r1]
-	movs r4, 0x12
-	ldrsh r0, [r5, r4]
-	str r0, [r1, 0x4]
-	ldrb r0, [r5, 0xB]
-	lsrs r0, 4
-	str r0, [r1, 0x8]
-	movs r0, 0x2
-	str r0, [r1, 0xC]
-	movs r0, 0xC
-	bl FieldEffectStart
-	ldrb r0, [r5, 0x8]
-	ldrb r1, [r5, 0x9]
-	ldrb r2, [r5, 0xA]
-	movs r7, 0x10
-	ldrsh r3, [r5, r7]
-	movs r7, 0x12
-	ldrsh r4, [r5, r7]
-	str r4, [sp]
-	bl sub_8126FF0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	bne _08064112
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl GroundEffect_SpawnOnTallGrass
-_08064112:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806411C: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_JumpOnTallGrass
-
-	thumb_func_start GroundEffect_JumpOnLongGrass
-GroundEffect_JumpOnLongGrass: @ 8064120
-	push {lr}
-	ldr r2, _08064144 @ =gUnknown_0202FF84
-	movs r3, 0x10
-	ldrsh r1, [r0, r3]
-	str r1, [r2]
-	movs r3, 0x12
-	ldrsh r1, [r0, r3]
-	str r1, [r2, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r2, 0x8]
-	movs r0, 0x2
-	str r0, [r2, 0xC]
-	movs r0, 0x12
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064144: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_JumpOnLongGrass
-
-	thumb_func_start GroundEffect_JumpOnShallowWater
-GroundEffect_JumpOnShallowWater: @ 8064148
-	push {r4,lr}
-	ldr r3, _08064174 @ =gUnknown_0202FF84
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0x10
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064174: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_JumpOnShallowWater
-
-	thumb_func_start GroundEffect_JumpOnWater
-GroundEffect_JumpOnWater: @ 8064178
-	push {r4,lr}
-	ldr r3, _080641A4 @ =gUnknown_0202FF84
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0xE
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080641A4: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_JumpOnWater
-
-	thumb_func_start GroundEffect_JumpLandingDust
-GroundEffect_JumpLandingDust: @ 80641A8
-	push {r4,lr}
-	ldr r3, _080641D4 @ =gUnknown_0202FF84
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0xA
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080641D4: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_JumpLandingDust
-
-	thumb_func_start GroundEffect_ShortGrass
-GroundEffect_ShortGrass: @ 80641D8
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x29
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_ShortGrass
-
-	thumb_func_start GroundEffect_HotSprings
-GroundEffect_HotSprings: @ 80641E8
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2A
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_HotSprings
-
-	thumb_func_start GroundEffect_Seaweed
-GroundEffect_Seaweed: @ 80641F8
-	push {lr}
-	ldr r2, _08064214 @ =gUnknown_0202FF84
-	movs r3, 0x10
-	ldrsh r1, [r0, r3]
-	str r1, [r2]
-	movs r1, 0x12
-	ldrsh r0, [r0, r1]
-	str r0, [r2, 0x4]
-	movs r0, 0x35
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064214: .4byte gUnknown_0202FF84
-	thumb_func_end GroundEffect_Seaweed
-
-	thumb_func_start sub_8064218
-sub_8064218: @ 8064218
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r7, r0, 0
-	adds r6, r1, 0
-	adds r5, r2, 0
-	movs r4, 0
-	ldr r0, _08064258 @ =gUnknown_083760A0
-	mov r8, r0
-_0806422A:
-	movs r0, 0x1
-	ands r0, r5
-	cmp r0, 0
-	beq _08064240
-	lsls r0, r4, 2
-	add r0, r8
-	ldr r2, [r0]
-	adds r0, r7, 0
-	adds r1, r6, 0
-	bl _call_via_r2
-_08064240:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsrs r5, 1
-	cmp r4, 0x13
-	bls _0806422A
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064258: .4byte gUnknown_083760A0
-	thumb_func_end sub_8064218
-
-	thumb_func_start filters_out_some_ground_effects
-filters_out_some_ground_effects: @ 806425C
-	push {lr}
-	adds r2, r0, 0
-	adds r3, r1, 0
-	ldrb r0, [r2]
-	lsls r0, 27
-	cmp r0, 0
-	bge _0806428A
-	ldrb r1, [r2, 0x2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	adds r1, 0x8
-	ands r0, r1
-	subs r1, 0x18
-	ands r0, r1
-	strb r0, [r2, 0x2]
-	ldr r0, [r3]
-	ldr r1, _08064290 @ =0xfff9f7bd
-	ands r0, r1
-	str r0, [r3]
-_0806428A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08064290: .4byte 0xfff9f7bd
-	thumb_func_end filters_out_some_ground_effects
-
-	thumb_func_start FilterOutStepOnPuddleGroundEffectIfJumping
-FilterOutStepOnPuddleGroundEffectIfJumping: @ 8064294
-	push {lr}
-	adds r2, r1, 0
-	ldrb r0, [r0]
-	lsls r0, 26
-	cmp r0, 0
-	bge _080642A8
-	ldr r0, [r2]
-	ldr r1, _080642AC @ =0xfffffbff
-	ands r0, r1
-	str r0, [r2]
-_080642A8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080642AC: .4byte 0xfffffbff
-	thumb_func_end FilterOutStepOnPuddleGroundEffectIfJumping
-
-	thumb_func_start DoGroundEffects_OnSpawn
-DoGroundEffects_OnSpawn: @ 80642B0
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 29
-	cmp r0, 0
-	bge _080642F4
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8064218
-	ldrb r1, [r4]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_080642F4:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnSpawn
-
-	thumb_func_start DoGroundEffects_OnBeginStep
-DoGroundEffects_OnBeginStep: @ 80642FC
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 29
-	cmp r0, 0
-	bge _08064348
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	adds r0, r4, 0
-	mov r1, sp
-	bl filters_out_some_ground_effects
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8064218
-	ldrb r1, [r4]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_08064348:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnBeginStep
-
-	thumb_func_start DoGroundEffects_OnFinishStep
-DoGroundEffects_OnFinishStep: @ 8064350
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 28
-	cmp r0, 0
-	bge _0806439C
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnFinishStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	adds r0, r4, 0
-	mov r1, sp
-	bl FilterOutStepOnPuddleGroundEffectIfJumping
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8064218
-	ldrb r1, [r4]
-	movs r0, 0x9
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x21
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_0806439C:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnFinishStep
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 33182fc6a..011ce6427 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -741,7 +741,7 @@ _080C627C: .4byte gMapHeader
 	thumb_func_start sub_80C6280
 sub_80C6280: @ 80C6280
 	push {lr}
-	ldr r1, _080C6294 @ =gUnknown_0202FF84
+	ldr r1, _080C6294 @ =gFieldEffectArguments
 	ldr r0, [r1, 0x4]
 	cmp r0, 0x2
 	beq _080C62AA
@@ -751,7 +751,7 @@ sub_80C6280: @ 80C6280
 	beq _080C62A2
 	b _080C62BE
 	.align 2, 0
-_080C6294: .4byte gUnknown_0202FF84
+_080C6294: .4byte gFieldEffectArguments
 _080C6298:
 	cmp r0, 0x3
 	beq _080C62AE
@@ -815,7 +815,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
 	bne _080C6330
 	bl sub_80C6264
 	ldr r1, _080C6320 @ =gFieldCallback
-	ldr r0, _080C6324 @ =sub_808AB90
+	ldr r0, _080C6324 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6328 @ =gUnknown_03005CE4
 	ldr r0, _080C632C @ =sub_80C639C
@@ -824,7 +824,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
 _080C6318: .4byte gScriptResult
 _080C631C: .4byte gUnknown_0203923C
 _080C6320: .4byte gFieldCallback
-_080C6324: .4byte sub_808AB90
+_080C6324: .4byte FieldCallback_Teleport
 _080C6328: .4byte gUnknown_03005CE4
 _080C632C: .4byte sub_80C639C
 _080C6330:
@@ -836,14 +836,14 @@ _080C6330:
 	bne _080C6360
 	bl sub_80C6264
 	ldr r1, _080C6350 @ =gFieldCallback
-	ldr r0, _080C6354 @ =sub_808AB90
+	ldr r0, _080C6354 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6358 @ =gUnknown_03005CE4
 	ldr r0, _080C635C @ =sub_80C64A8
 	b _080C6380
 	.align 2, 0
 _080C6350: .4byte gFieldCallback
-_080C6354: .4byte sub_808AB90
+_080C6354: .4byte FieldCallback_Teleport
 _080C6358: .4byte gUnknown_03005CE4
 _080C635C: .4byte sub_80C64A8
 _080C6360:
@@ -859,7 +859,7 @@ _080C636E:
 _080C6372:
 	bl sub_80C6264
 	ldr r1, _080C638C @ =gFieldCallback
-	ldr r0, _080C6390 @ =sub_808AB90
+	ldr r0, _080C6390 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6394 @ =gUnknown_03005CE4
 	ldr r0, _080C6398 @ =sub_80C660C
@@ -872,7 +872,7 @@ _080C6384:
 	bx r1
 	.align 2, 0
 _080C638C: .4byte gFieldCallback
-_080C6390: .4byte sub_808AB90
+_080C6390: .4byte FieldCallback_Teleport
 _080C6394: .4byte gUnknown_03005CE4
 _080C6398: .4byte sub_80C660C
 	thumb_func_end SetUpFieldMove_SecretPower
@@ -880,7 +880,7 @@ _080C6398: .4byte sub_80C660C
 	thumb_func_start sub_80C639C
 sub_80C639C: @ 80C639C
 	push {lr}
-	ldr r1, _080C63B0 @ =gUnknown_0202FF84
+	ldr r1, _080C63B0 @ =gFieldEffectArguments
 	ldr r0, _080C63B4 @ =gLastFieldPokeMenuOpened
 	ldrb r0, [r0]
 	str r0, [r1]
@@ -889,7 +889,7 @@ sub_80C639C: @ 80C639C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C63B0: .4byte gUnknown_0202FF84
+_080C63B0: .4byte gFieldEffectArguments
 _080C63B4: .4byte gLastFieldPokeMenuOpened
 _080C63B8: .4byte gUnknown_081A2CE6
 	thumb_func_end sub_80C639C
@@ -943,7 +943,7 @@ FldEff_SecretPowerCave: @ 80C63FC
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, _080C6448 @ =gUnknown_0202FF84
+	ldr r4, _080C6448 @ =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -963,7 +963,7 @@ FldEff_SecretPowerCave: @ 80C63FC
 _080C643C: .4byte gSpriteTemplate_83D2614
 _080C6440: .4byte gSprites
 _080C6444: .4byte gPlayerAvatar
-_080C6448: .4byte gUnknown_0202FF84
+_080C6448: .4byte gFieldEffectArguments
 	thumb_func_end FldEff_SecretPowerCave
 
 	thumb_func_start sub_80C644C
@@ -1025,7 +1025,7 @@ sub_80C6498: @ 80C6498
 	thumb_func_start sub_80C64A8
 sub_80C64A8: @ 80C64A8
 	push {lr}
-	ldr r1, _080C64BC @ =gUnknown_0202FF84
+	ldr r1, _080C64BC @ =gFieldEffectArguments
 	ldr r0, _080C64C0 @ =gLastFieldPokeMenuOpened
 	ldrb r0, [r0]
 	str r0, [r1]
@@ -1034,7 +1034,7 @@ sub_80C64A8: @ 80C64A8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C64BC: .4byte gUnknown_0202FF84
+_080C64BC: .4byte gFieldEffectArguments
 _080C64C0: .4byte gLastFieldPokeMenuOpened
 _080C64C4: .4byte gUnknown_081A2D3E
 	thumb_func_end sub_80C64A8
@@ -1088,13 +1088,13 @@ FldEff_SecretPowerTree: @ 80C6508
 	ands r2, r0
 	cmp r2, 0x96
 	bne _080C652A
-	ldr r1, _080C6588 @ =gUnknown_0202FF84
+	ldr r1, _080C6588 @ =gFieldEffectArguments
 	movs r0, 0
 	str r0, [r1, 0x1C]
 _080C652A:
 	cmp r2, 0x9C
 	bne _080C6534
-	ldr r1, _080C6588 @ =gUnknown_0202FF84
+	ldr r1, _080C6588 @ =gFieldEffectArguments
 	movs r0, 0x2
 	str r0, [r1, 0x1C]
 _080C6534:
@@ -1110,7 +1110,7 @@ _080C6534:
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, _080C6588 @ =gUnknown_0202FF84
+	ldr r4, _080C6588 @ =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -1137,7 +1137,7 @@ _080C6576:
 	.align 2, 0
 _080C6580: .4byte gUnknown_0203923C
 _080C6584: .4byte 0x00000fff
-_080C6588: .4byte gUnknown_0202FF84
+_080C6588: .4byte gFieldEffectArguments
 _080C658C: .4byte gSpriteTemplate_83D262C
 _080C6590: .4byte gSprites
 _080C6594: .4byte gPlayerAvatar
@@ -1149,7 +1149,7 @@ sub_80C6598: @ 80C6598
 	adds r4, r0, 0
 	movs r0, 0x9B
 	bl PlaySE
-	ldr r0, _080C65BC @ =gUnknown_0202FF84
+	ldr r0, _080C65BC @ =gFieldEffectArguments
 	ldr r1, [r0, 0x1C]
 	adds r2, r4, 0
 	adds r2, 0x2A
@@ -1162,7 +1162,7 @@ sub_80C6598: @ 80C6598
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C65BC: .4byte gUnknown_0202FF84
+_080C65BC: .4byte gFieldEffectArguments
 _080C65C0: .4byte sub_80C65C4
 	thumb_func_end sub_80C6598
 
@@ -1177,7 +1177,7 @@ sub_80C65C4: @ 80C65C4
 	asrs r0, 16
 	cmp r0, 0x27
 	ble _080C65EE
-	ldr r0, _080C65F4 @ =gUnknown_0202FF84
+	ldr r0, _080C65F4 @ =gFieldEffectArguments
 	ldr r0, [r0, 0x1C]
 	cmp r0, 0
 	beq _080C65E2
@@ -1195,7 +1195,7 @@ _080C65EE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C65F4: .4byte gUnknown_0202FF84
+_080C65F4: .4byte gFieldEffectArguments
 _080C65F8: .4byte sub_80C65FC
 	thumb_func_end sub_80C65C4
 
@@ -1212,7 +1212,7 @@ sub_80C65FC: @ 80C65FC
 	thumb_func_start sub_80C660C
 sub_80C660C: @ 80C660C
 	push {lr}
-	ldr r1, _080C6620 @ =gUnknown_0202FF84
+	ldr r1, _080C6620 @ =gFieldEffectArguments
 	ldr r0, _080C6624 @ =gLastFieldPokeMenuOpened
 	ldrb r0, [r0]
 	str r0, [r1]
@@ -1221,7 +1221,7 @@ sub_80C660C: @ 80C660C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C6620: .4byte gUnknown_0202FF84
+_080C6620: .4byte gFieldEffectArguments
 _080C6624: .4byte gLastFieldPokeMenuOpened
 _080C6628: .4byte gUnknown_081A2D96
 	thumb_func_end sub_80C660C
@@ -1275,7 +1275,7 @@ FldEff_SecretPowerShrub: @ 80C666C
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, _080C66B8 @ =gUnknown_0202FF84
+	ldr r4, _080C66B8 @ =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -1295,7 +1295,7 @@ FldEff_SecretPowerShrub: @ 80C666C
 _080C66AC: .4byte gSpriteTemplate_83D2644
 _080C66B0: .4byte gSprites
 _080C66B4: .4byte gPlayerAvatar
-_080C66B8: .4byte gUnknown_0202FF84
+_080C66B8: .4byte gFieldEffectArguments
 	thumb_func_end FldEff_SecretPowerShrub
 
 	thumb_func_start sub_80C66BC
@@ -2103,7 +2103,7 @@ FldEff_SandPillar: @ 80C6D3C
 	mov r0, sp
 	adds r1, r4, 0
 	bl GetXYCoordsOneStepInFrontOfPlayer
-	ldr r1, _080C6D78 @ =gUnknown_0202FF84
+	ldr r1, _080C6D78 @ =gFieldEffectArguments
 	mov r0, sp
 	movs r2, 0
 	ldrsh r0, [r0, r2]
@@ -2122,7 +2122,7 @@ FldEff_SandPillar: @ 80C6D3C
 	beq _080C6D86
 	b _080C6E4C
 	.align 2, 0
-_080C6D78: .4byte gUnknown_0202FF84
+_080C6D78: .4byte gFieldEffectArguments
 _080C6D7C:
 	cmp r0, 0x3
 	beq _080C6DEC
@@ -2240,7 +2240,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
 	adds r5, r0, 0
 	movs r0, 0x83
 	bl PlaySE
-	ldr r4, _080C6E90 @ =gUnknown_0202FF84
+	ldr r4, _080C6E90 @ =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	subs r1, 0x1
@@ -2255,7 +2255,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
 	bl MapGridSetMetatileIdAt
 	b _080C6EAA
 	.align 2, 0
-_080C6E90: .4byte gUnknown_0202FF84
+_080C6E90: .4byte gFieldEffectArguments
 _080C6E94: .4byte 0x00000286
 _080C6E98: .4byte 0x00000e02
 _080C6E9C:
@@ -2266,7 +2266,7 @@ _080C6E9C:
 	lsls r2, 2
 	bl MapGridSetMetatileIdAt
 _080C6EAA:
-	ldr r4, _080C6ED8 @ =gUnknown_0202FF84
+	ldr r4, _080C6ED8 @ =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	ldr r2, _080C6EDC @ =0x0000020a
@@ -2286,7 +2286,7 @@ _080C6EAA:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C6ED8: .4byte gUnknown_0202FF84
+_080C6ED8: .4byte gFieldEffectArguments
 _080C6EDC: .4byte 0x0000020a
 _080C6EE0: .4byte SpriteCB_SandPillar_1
 	thumb_func_end SpriteCB_SandPillar_0
@@ -2304,7 +2304,7 @@ SpriteCB_SandPillar_1: @ 80C6EE4
 	strh r0, [r5, 0x2E]
 	b _080C6F14
 _080C6EF8:
-	ldr r4, _080C6F1C @ =gUnknown_0202FF84
+	ldr r4, _080C6F1C @ =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	ldr r2, _080C6F20 @ =0x00000e8c
@@ -2321,7 +2321,7 @@ _080C6F14:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C6F1C: .4byte gUnknown_0202FF84
+_080C6F1C: .4byte gFieldEffectArguments
 _080C6F20: .4byte 0x00000e8c
 _080C6F24: .4byte SpriteCB_SandPillar_2
 	thumb_func_end SpriteCB_SandPillar_1
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index cd2927c66..9fddd9194 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1493,6 +1493,12 @@
 	callstd \type
 	.endm
 
+	@ Message box types
+	MSGBOX_YESNO = 5
+
+	YES = 1
+	NO  = 0
+
 	.macro giveitem item, amount=1, function=0
 	setorcopyvar 0x8000, \item
 	setorcopyvar 0x8001, \amount
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s
deleted file mode 100644
index 726de6fc1..000000000
--- a/asm/mauville_old_man.s
+++ /dev/null
@@ -1,1522 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80F7DC0
-sub_80F7DC0: @ 80F7DC0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x18
-	ldr r1, _080F7E84 @ =gUnknown_083E53C8
-	mov r0, sp
-	movs r2, 0x18
-	bl memcpy
-	movs r5, 0
-	movs r0, 0x2
-	add r0, sp
-	mov r8, r0
-	ldr r1, _080F7E88 @ =gSaveBlock1 + 0x2D94
-	adds r1, 0x18
-	adds r3, r1, 0
-_080F7DE4:
-	adds r0, r3, r5
-	strb r5, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x7
-	bls _080F7DE4
-	movs r5, 0
-	ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94
-	adds r2, 0x4
-	mov r9, r2
-	adds r6, r1, 0
-_080F7DFC:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r4, r5, 0x1
-	adds r1, r4, 0
-	bl __modsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	adds r2, r6, r5
-	ldrb r7, [r2]
-	adds r1, r6, r1
-	ldrb r0, [r1]
-	strb r0, [r2]
-	strb r7, [r1]
-	lsls r4, 16
-	lsrs r5, r4, 16
-	cmp r5, 0x7
-	bls _080F7DFC
-	movs r3, 0
-	mov r10, r3
-	movs r5, 0
-_080F7E2A:
-	lsls r4, r5, 2
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	bl sub_80EAE88
-	add r4, r8
-	strh r0, [r4]
-	add r0, r10
-	lsls r0, 16
-	lsrs r0, 16
-	mov r10, r0
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x5
-	bls _080F7E2A
-	movs r0, 0
-	ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94
-	strb r0, [r2, 0x2]
-	movs r7, 0
-	movs r5, 0
-_080F7E56:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0x2
-	bhi _080F7E90
-	cmp r7, 0x7
-	bhi _080F7E90
-	lsls r0, r5, 1
-	add r0, r9
-	ldr r1, _080F7E8C @ =0x0000ffff
-	strh r1, [r0]
-	adds r0, r7, 0x1
-	lsls r0, 16
-	lsrs r7, r0, 16
-	adds r4, r5, 0x1
-	b _080F7EE2
-	.align 2, 0
-_080F7E84: .4byte gUnknown_083E53C8
-_080F7E88: .4byte gSaveBlock1 + 0x2D94
-_080F7E8C: .4byte 0x0000ffff
-_080F7E90:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	mov r1, r10
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r1, 0
-	adds r4, r5, 0x1
-	lsls r6, r5, 1
-	cmp r5, 0x5
-	bhi _080F7ECC
-	mov r3, r8
-	ldrh r0, [r3]
-	b _080F7EC2
-_080F7EB2:
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r5, 0x5
-	bhi _080F7ECC
-	lsls r0, r1, 2
-	adds r0, r3, r0
-	ldrh r0, [r0]
-_080F7EC2:
-	subs r0, r2, r0
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r0, 0
-	bgt _080F7EB2
-_080F7ECC:
-	cmp r1, 0x6
-	bne _080F7ED2
-	movs r1, 0
-_080F7ED2:
-	lsls r0, r1, 2
-	add r0, sp
-	ldrh r0, [r0]
-	bl sub_80EB784
-	mov r2, r9
-	adds r1, r2, r6
-	strh r0, [r1]
-_080F7EE2:
-	lsls r0, r4, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x9
-	bls _080F7E56
-	add sp, 0x18
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7DC0
-
-	thumb_func_start sub_80F7EFC
-sub_80F7EFC: @ 80F7EFC
-	ldr r0, _080F7F08 @ =gSaveBlock1 + 0x2D94
-	adds r0, 0x29
-	movs r1, 0
-	strb r1, [r0]
-	bx lr
-	.align 2, 0
-_080F7F08: .4byte gSaveBlock1 + 0x2D94
-	thumb_func_end sub_80F7EFC
-
-	thumb_func_start sub_80F7F0C
-sub_80F7F0C: @ 80F7F0C
-	ldr r1, _080F7F14 @ =gSaveBlock1 + 0x2D94
-	movs r0, 0
-	strb r0, [r1, 0x1]
-	bx lr
-	.align 2, 0
-_080F7F14: .4byte gSaveBlock1 + 0x2D94
-	thumb_func_end sub_80F7F0C
-
-	thumb_func_start sub_80F7F18
-sub_80F7F18: @ 80F7F18
-	push {lr}
-	bl sub_8109A20
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7F18
-
-	thumb_func_start sub_80F7F24
-sub_80F7F24: @ 80F7F24
-	push {lr}
-	bl sub_80F8428
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7F24
-
-	thumb_func_start sub_80F7F30
-sub_80F7F30: @ 80F7F30
-	push {lr}
-	bl GetCurrentMauvilleOldMan
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x4
-	bhi _080F7F76
-	lsls r0, 2
-	ldr r1, _080F7F48 @ =_080F7F4C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080F7F48: .4byte _080F7F4C
-	.align 2, 0
-_080F7F4C:
-	.4byte _080F7F60
-	.4byte _080F7F66
-	.4byte _080F7F72
-	.4byte _080F7F6C
-	.4byte _080F7F76
-_080F7F60:
-	bl sub_80F7EFC
-	b _080F7F76
-_080F7F66:
-	bl sub_80F7F0C
-	b _080F7F76
-_080F7F6C:
-	bl sub_80F7F24
-	b _080F7F76
-_080F7F72:
-	bl sub_80F7F18
-_080F7F76:
-	bl sub_80F83D0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7F30
-
-	thumb_func_start sub_80F7F80
-sub_80F7F80: @ 80F7F80
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _080F7FA8 @ =sub_80F8184
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080F7FAC @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	strh r4, [r1, 0x12]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F7FA8: .4byte sub_80F8184
-_080F7FAC: .4byte gTasks
-	thumb_func_end sub_80F7F80
-
-	thumb_func_start sub_80F7FB0
-sub_80F7FB0: @ 80F7FB0
-	push {r4-r7,lr}
-	adds r6, r1, 0
-	movs r1, 0x8
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x5
-	bls _080F7FBE
-	b _080F817A
-_080F7FBE:
-	lsls r0, 2
-	ldr r1, _080F7FC8 @ =_080F7FCC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080F7FC8: .4byte _080F7FCC
-	.align 2, 0
-_080F7FCC:
-	.4byte _080F7FE4
-	.4byte _080F817A
-	.4byte _080F8040
-	.4byte _080F8074
-	.4byte _080F8074
-	.4byte _080F817A
-_080F7FE4:
-	ldr r2, _080F8034 @ =gSaveBlock1 + 0x2D94
-	ldr r0, _080F8038 @ =gSpecialVar_0x8004
-	ldrh r0, [r0]
-	adds r1, r2, 0
-	adds r1, 0xE
-	cmp r0, 0
-	bne _080F7FF4
-	adds r1, r2, 0x2
-_080F7FF4:
-	adds r2, r1, 0
-	adds r1, r6, 0
-	adds r1, 0xC
-	movs r3, 0x5
-_080F7FFC:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080F7FFC
-	ldr r2, _080F803C @ =0x0000ffff
-	adds r4, r2, 0
-	movs r2, 0
-	adds r1, r6, 0
-	adds r1, 0x18
-	movs r3, 0x5
-_080F8016:
-	ldrh r0, [r1]
-	orrs r0, r4
-	strh r0, [r1]
-	strh r2, [r1, 0x2]
-	strh r2, [r1, 0x4]
-	strh r2, [r1, 0x6]
-	adds r1, 0x8
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080F8016
-	movs r0, 0
-	strb r0, [r6]
-	strb r0, [r6, 0x1]
-	strh r0, [r6, 0x4]
-	b _080F817A
-	.align 2, 0
-_080F8034: .4byte gSaveBlock1 + 0x2D94
-_080F8038: .4byte gSpecialVar_0x8004
-_080F803C: .4byte 0x0000ffff
-_080F8040:
-	ldrb r1, [r6]
-	lsls r1, 1
-	adds r0, r6, 0
-	adds r0, 0xC
-	adds r0, r1
-	ldrh r4, [r0]
-	lsrs r0, r4, 9
-	ldr r1, _080F8070 @ =0x000001ff
-	ands r1, r4
-	bl sub_814A2D0
-	adds r1, r0, 0
-	movs r0, 0
-	strh r0, [r6, 0x4]
-	movs r2, 0x3
-	ands r2, r4
-	lsrs r4, 3
-	movs r0, 0x1
-	ands r4, r0
-	adds r2, r4
-	adds r0, r6, 0
-	bl sub_814A2EC
-	b _080F817A
-	.align 2, 0
-_080F8070: .4byte 0x000001ff
-_080F8074:
-	ldrb r1, [r6, 0x1]
-	lsls r0, r1, 3
-	adds r0, 0x18
-	adds r7, r6, r0
-	ldrb r0, [r6, 0x3]
-	cmp r0, 0x1
-	beq _080F8124
-	cmp r0, 0x1
-	bgt _080F808C
-	cmp r0, 0
-	beq _080F8092
-	b _080F817A
-_080F808C:
-	cmp r0, 0xFE
-	beq _080F8170
-	b _080F817A
-_080F8092:
-	ldrb r0, [r6, 0x2]
-	cmp r0, 0
-	bne _080F80D0
-	cmp r1, 0x6
-	beq _080F80A2
-	ldrh r0, [r7]
-	cmp r0, 0xFF
-	bne _080F80A6
-_080F80A2:
-	movs r0, 0xFE
-	b _080F8178
-_080F80A6:
-	ldrh r0, [r7, 0x2]
-	strb r0, [r6, 0x2]
-	ldrh r0, [r7]
-	cmp r0, 0x32
-	bhi _080F80CA
-	movs r1, 0x3
-	bl __udivsi3
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r0, r1, 1
-	adds r0, r1
-	adds r0, 0xF9
-	lsls r0, 16
-	lsrs r0, 16
-	bl m4aSongNumStart
-_080F80CA:
-	movs r0, 0x1
-	strb r0, [r6, 0x3]
-	b _080F8114
-_080F80D0:
-	ldrh r1, [r6, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r6, r2]
-	cmp r0, 0xA
-	ble _080F80E0
-	ldrh r0, [r6, 0x6]
-	subs r0, 0x2
-	strh r0, [r6, 0x6]
-_080F80E0:
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080F80EE
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x40
-	b _080F80F2
-_080F80EE:
-	ldrh r0, [r6, 0x8]
-	subs r0, 0x40
-_080F80F2:
-	strh r0, [r6, 0x8]
-	ldr r4, _080F811C @ =gMPlay_SE2
-	ldr r5, _080F8120 @ =0x0000ffff
-	ldrh r2, [r6, 0x6]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl m4aMPlayVolumeControl
-	movs r0, 0x8
-	ldrsh r2, [r6, r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl m4aMPlayPitchControl
-	ldrh r0, [r6, 0xA]
-	adds r0, 0x1
-	strh r0, [r6, 0xA]
-_080F8114:
-	ldrb r0, [r6, 0x2]
-	subs r0, 0x1
-	strb r0, [r6, 0x2]
-	b _080F817A
-	.align 2, 0
-_080F811C: .4byte gMPlay_SE2
-_080F8120: .4byte 0x0000ffff
-_080F8124:
-	adds r0, r1, 0x1
-	movs r1, 0
-	strb r0, [r6, 0x1]
-	strb r1, [r6, 0x3]
-	ldrh r0, [r7]
-	cmp r0, 0x32
-	bhi _080F817A
-	ldrh r0, [r7, 0x6]
-	lsls r0, 4
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r1
-	strh r0, [r6, 0x6]
-	ldr r4, _080F8168 @ =gMPlay_SE2
-	ldr r5, _080F816C @ =0x0000ffff
-	ldrh r2, [r6, 0x6]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl m4aMPlayVolumeControl
-	movs r2, 0x80
-	lsls r2, 2
-	adds r0, r2, 0
-	ldrh r7, [r7, 0x4]
-	adds r0, r7
-	strh r0, [r6, 0x8]
-	movs r0, 0x8
-	ldrsh r2, [r6, r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl m4aMPlayPitchControl
-	b _080F817A
-	.align 2, 0
-_080F8168: .4byte gMPlay_SE2
-_080F816C: .4byte 0x0000ffff
-_080F8170:
-	ldr r0, _080F8180 @ =gMPlay_SE2
-	bl m4aMPlayStop
-	movs r0, 0xFF
-_080F8178:
-	strb r0, [r6, 0x3]
-_080F817A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8180: .4byte gMPlay_SE2
-	thumb_func_end sub_80F7FB0
-
-	thumb_func_start sub_80F8184
-sub_80F8184: @ 80F8184
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, _080F81B4 @ =gTasks
-	adds r5, r0, r1
-	ldr r1, _080F81B8 @ =gUnknown_03005DA0
-	adds r0, r5, 0
-	bl sub_80F7FB0
-	movs r1, 0x8
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x5
-	bls _080F81A8
-	b _080F83C8
-_080F81A8:
-	lsls r0, 2
-	ldr r1, _080F81BC @ =_080F81C0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080F81B4: .4byte gTasks
-_080F81B8: .4byte gUnknown_03005DA0
-_080F81BC: .4byte _080F81C0
-	.align 2, 0
-_080F81C0:
-	.4byte _080F81D8
-	.4byte _080F8218
-	.4byte _080F8228
-	.4byte _080F82D8
-	.4byte _080F83B8
-	.4byte _080F82C6
-_080F81D8:
-	bl sub_80F7BA0
-	ldr r4, _080F820C @ =gMenuWindowPtr
-	ldr r0, [r4]
-	ldr r1, _080F8210 @ =gWindowConfig_81E6CE4
-	bl InitWindowFromConfig
-	ldr r0, [r4]
-	ldr r1, _080F8214 @ =gStringVar4
-	movs r2, 0xF
-	str r2, [sp]
-	movs r2, 0x2
-	movs r3, 0x4
-	bl sub_8002EB0
-	movs r0, 0
-	strh r0, [r5, 0xA]
-	strh r0, [r5, 0xC]
-	strh r0, [r5, 0xE]
-	strh r0, [r5, 0x10]
-	movs r0, 0x4
-	bl FadeOutBGMTemporarily
-	movs r0, 0x1
-	b _080F83C6
-	.align 2, 0
-_080F820C: .4byte gMenuWindowPtr
-_080F8210: .4byte gWindowConfig_81E6CE4
-_080F8214: .4byte gStringVar4
-_080F8218:
-	bl IsBGMPausedOrStopped
-	lsls r0, 24
-	cmp r0, 0
-	bne _080F8224
-	b _080F83C8
-_080F8224:
-	movs r0, 0x2
-	b _080F83C6
-_080F8228:
-	ldr r4, _080F8240 @ =gSaveBlock1 + 0x2D94
-	movs r2, 0xE
-	ldrsh r1, [r5, r2]
-	ldr r0, _080F8244 @ =gStringVar4
-	adds r1, r0
-	movs r3, 0
-	ldrb r0, [r1]
-	ldr r7, _080F8248 @ =gUnknown_03005DA0
-	ldrh r2, [r5, 0x12]
-	ldr r6, _080F824C @ =gUnknown_020388BC
-	b _080F825A
-	.align 2, 0
-_080F8240: .4byte gSaveBlock1 + 0x2D94
-_080F8244: .4byte gStringVar4
-_080F8248: .4byte gUnknown_03005DA0
-_080F824C: .4byte gUnknown_020388BC
-_080F8250:
-	adds r1, 0x1
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrb r0, [r1]
-_080F825A:
-	cmp r0, 0
-	beq _080F826A
-	cmp r0, 0xFE
-	beq _080F826A
-	cmp r0, 0xFC
-	beq _080F826A
-	cmp r0, 0xFF
-	bne _080F8250
-_080F826A:
-	cmp r2, 0
-	bne _080F8278
-	movs r0, 0x10
-	ldrsh r1, [r5, r0]
-	lsls r1, 1
-	adds r0, r4, 0x2
-	b _080F8282
-_080F8278:
-	movs r2, 0x10
-	ldrsh r1, [r5, r2]
-	lsls r1, 1
-	adds r0, r4, 0
-	adds r0, 0xE
-_080F8282:
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x3
-	ands r1, r0
-	lsrs r0, 3
-	movs r2, 0x1
-	ands r0, r2
-	adds r1, r0
-	strh r1, [r6]
-	movs r1, 0x4
-	ldrsh r0, [r7, r1]
-	adds r1, r3, 0
-	bl __divsi3
-	movs r1, 0
-	strh r0, [r7, 0x4]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _080F82AC
-	movs r0, 0x1
-	strh r0, [r7, 0x4]
-_080F82AC:
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x1
-	strh r0, [r5, 0x10]
-	movs r2, 0xC
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	bne _080F82BE
-	movs r0, 0x3
-	b _080F82C0
-_080F82BE:
-	movs r0, 0x5
-_080F82C0:
-	strh r0, [r5, 0x8]
-	strh r1, [r5, 0xA]
-	b _080F83C8
-_080F82C6:
-	ldrh r1, [r5, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	bne _080F82D2
-	b _080F83C4
-_080F82D2:
-	subs r0, r1, 0x1
-	strh r0, [r5, 0xC]
-	b _080F83C8
-_080F82D8:
-	ldr r1, _080F8304 @ =gStringVar4
-	movs r2, 0xE
-	ldrsh r0, [r5, r2]
-	adds r0, r1
-	ldrb r4, [r0]
-	cmp r4, 0xFF
-	bne _080F830C
-	movs r0, 0xC8
-	lsls r0, 1
-	movs r1, 0x6
-	bl FadeInNewBGM
-	ldr r0, _080F8308 @ =gMPlay_SE2
-	movs r1, 0x2
-	bl m4aMPlayFadeOutTemporarily
-	bl EnableBothScriptContexts
-	adds r0, r6, 0
-	bl DestroyTask
-	b _080F83C8
-	.align 2, 0
-_080F8304: .4byte gStringVar4
-_080F8308: .4byte gMPlay_SE2
-_080F830C:
-	cmp r4, 0
-	bne _080F832C
-	ldr r0, _080F8328 @ =gMenuWindowPtr
-	ldr r0, [r0]
-	bl sub_8003418
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	strh r0, [r5, 0xE]
-	movs r0, 0x2
-	strh r0, [r5, 0x8]
-	strh r4, [r5, 0xC]
-	b _080F83C8
-	.align 2, 0
-_080F8328: .4byte gMenuWindowPtr
-_080F832C:
-	cmp r4, 0xFE
-	bne _080F8340
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r5, 0xE]
-	movs r0, 0x2
-	strh r0, [r5, 0x8]
-	strh r1, [r5, 0xC]
-	b _080F83C8
-_080F8340:
-	cmp r4, 0xFC
-	bne _080F8354
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x2
-	strh r0, [r5, 0xE]
-	movs r0, 0x2
-	strh r0, [r5, 0x8]
-	movs r0, 0x8
-	strh r0, [r5, 0xC]
-	b _080F83C8
-_080F8354:
-	cmp r4, 0x37
-	bne _080F8374
-	movs r4, 0
-	strb r4, [r0]
-	ldr r0, _080F8370 @ =gMenuWindowPtr
-	ldr r0, [r0]
-	bl sub_8003418
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	strh r0, [r5, 0xE]
-	strh r4, [r5, 0xC]
-	b _080F83C8
-	.align 2, 0
-_080F8370: .4byte gMenuWindowPtr
-_080F8374:
-	movs r1, 0xA
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _080F8394
-	cmp r0, 0x1
-	bgt _080F8386
-	cmp r0, 0
-	beq _080F838C
-	b _080F83C8
-_080F8386:
-	cmp r0, 0x2
-	beq _080F83A0
-	b _080F83C8
-_080F838C:
-	ldr r0, _080F839C @ =gMenuWindowPtr
-	ldr r0, [r0]
-	bl sub_8003418
-_080F8394:
-	ldrh r0, [r5, 0xA]
-	adds r0, 0x1
-	strh r0, [r5, 0xA]
-	b _080F83C8
-	.align 2, 0
-_080F839C: .4byte gMenuWindowPtr
-_080F83A0:
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r5, 0xE]
-	strh r1, [r5, 0xA]
-	ldr r0, _080F83B4 @ =gUnknown_03005DA0
-	ldrh r0, [r0, 0x4]
-	strh r0, [r5, 0xC]
-	movs r0, 0x4
-	b _080F83C6
-	.align 2, 0
-_080F83B4: .4byte gUnknown_03005DA0
-_080F83B8:
-	ldrh r0, [r5, 0xC]
-	subs r0, 0x1
-	strh r0, [r5, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080F83C8
-_080F83C4:
-	movs r0, 0x3
-_080F83C6:
-	strh r0, [r5, 0x8]
-_080F83C8:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F8184
-
-	thumb_func_start sub_80F83D0
-sub_80F83D0: @ 80F83D0
-	push {r4,lr}
-	ldr r4, _080F83F4 @ =0x00004010
-	bl GetCurrentMauvilleOldMan
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 8
-	movs r0, 0x8A
-	lsls r0, 15
-	adds r1, r0
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl VarSet
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F83F4: .4byte 0x00004010
-	thumb_func_end sub_80F83D0
-
-	thumb_func_start sub_80F83F8
-sub_80F83F8: @ 80F83F8
-	push {r4,lr}
-	ldr r0, _080F8424 @ =gSaveBlock1 + 0x2D94
-	movs r2, 0
-	movs r1, 0x3
-	strb r1, [r0]
-	strb r2, [r0, 0x1]
-	movs r4, 0
-	movs r3, 0xFF
-	adds r1, r0, 0x4
-	movs r2, 0x3
-_080F840C:
-	strb r4, [r1]
-	ldrb r0, [r1, 0x4]
-	orrs r0, r3
-	strb r0, [r1, 0x4]
-	adds r1, 0x1
-	subs r2, 0x1
-	cmp r2, 0
-	bge _080F840C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8424: .4byte gSaveBlock1 + 0x2D94
-	thumb_func_end sub_80F83F8
-
-	thumb_func_start sub_80F8428
-sub_80F8428: @ 80F8428
-	ldr r0, _080F8434 @ =gSaveBlock1 + 0x2D94
-	movs r2, 0
-	movs r1, 0x3
-	strb r1, [r0]
-	strb r2, [r0, 0x1]
-	bx lr
-	.align 2, 0
-_080F8434: .4byte gSaveBlock1 + 0x2D94
-	thumb_func_end sub_80F8428
-
-	thumb_func_start sub_80F8438
-sub_80F8438: @ 80F8438
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x32
-	bne _080F8444
-	movs r0, 0
-_080F8444:
-	bl GetGameStat
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8438
-
-	thumb_func_start sub_80F844C
-sub_80F844C: @ 80F844C
-	push {lr}
-	adds r3, r0, 0
-	movs r2, 0
-	ldr r1, _080F8460 @ =gUnknown_083E53E0
-_080F8454:
-	ldrb r0, [r1]
-	cmp r0, r3
-	bne _080F8464
-	adds r0, r1, 0
-	b _080F846E
-	.align 2, 0
-_080F8460: .4byte gUnknown_083E53E0
-_080F8464:
-	adds r1, 0x10
-	adds r2, 0x1
-	cmp r2, 0x23
-	ble _080F8454
-	ldr r0, _080F8474 @ =gUnknown_083E5610
-_080F846E:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080F8474: .4byte gUnknown_083E5610
-	thumb_func_end sub_80F844C
-
-	thumb_func_start sub_80F8478
-sub_80F8478: @ 80F8478
-	push {lr}
-	bl sub_80F844C
-	ldr r0, [r0, 0x4]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8478
-
-	thumb_func_start sub_80F8484
-sub_80F8484: @ 80F8484
-	push {lr}
-	bl sub_80F844C
-	ldr r0, [r0, 0xC]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8484
-
-	thumb_func_start sub_80F8490
-sub_80F8490: @ 80F8490
-	push {lr}
-	bl sub_80F844C
-	ldr r0, [r0, 0x8]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8490
-
-	thumb_func_start sub_80F849C
-sub_80F849C: @ 80F849C
-	push {lr}
-	movs r1, 0
-	ldr r2, _080F84C4 @ =gSaveBlock1 + 0x2D94
-	ldrb r0, [r2, 0x4]
-	cmp r0, 0
-	beq _080F84BC
-	adds r2, 0x4
-_080F84AA:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x3
-	bhi _080F84BC
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080F84AA
-_080F84BC:
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080F84C4: .4byte gSaveBlock1 + 0x2D94
-	thumb_func_end sub_80F849C
-
-	thumb_func_start sub_80F84C8
-sub_80F84C8: @ 80F84C8
-	lsls r0, 2
-	ldr r1, _080F84E8 @ =gSaveBlock1 + 0x2DB8
-	adds r0, r1
-	ldrb r2, [r0]
-	ldrb r1, [r0, 0x1]
-	lsls r1, 8
-	orrs r2, r1
-	ldrb r1, [r0, 0x2]
-	lsls r1, 16
-	orrs r2, r1
-	ldrb r0, [r0, 0x3]
-	lsls r0, 24
-	orrs r2, r0
-	adds r0, r2, 0
-	bx lr
-	.align 2, 0
-_080F84E8: .4byte gSaveBlock1 + 0x2DB8
-	thumb_func_end sub_80F84C8
-
-	thumb_func_start sub_80F84EC
-sub_80F84EC: @ 80F84EC
-	lsls r0, 2
-	ldr r2, _080F8504 @ =gSaveBlock1 + 0x2DB8
-	adds r0, r2
-	strb r1, [r0]
-	lsrs r2, r1, 8
-	strb r2, [r0, 0x1]
-	lsrs r2, r1, 16
-	strb r2, [r0, 0x2]
-	lsrs r1, 24
-	strb r1, [r0, 0x3]
-	bx lr
-	.align 2, 0
-_080F8504: .4byte gSaveBlock1 + 0x2DB8
-	thumb_func_end sub_80F84EC
-
-	thumb_func_start sub_80F8508
-sub_80F8508: @ 80F8508
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _080F8528 @ =gSaveBlock1 + 0x2D94
-	adds r0, 0x4
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	bl sub_80F8438
-	adds r4, r0, 0
-	adds r0, r5, 0
-	bl sub_80F84C8
-	cmp r4, r0
-	bhi _080F852C
-	movs r0, 0
-	b _080F852E
-	.align 2, 0
-_080F8528: .4byte gSaveBlock1 + 0x2D94
-_080F852C:
-	movs r0, 0x1
-_080F852E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8508
-
-	thumb_func_start sub_80F8534
-sub_80F8534: @ 80F8534
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	lsls r4, r0, 3
-	subs r4, r0
-	ldr r0, _080F855C @ =gSaveBlock1 + 0x2D9C
-	adds r4, r0
-	adds r0, r5, 0
-	movs r1, 0xFF
-	movs r2, 0x8
-	bl memset
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0x7
-	bl memcpy
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F855C: .4byte gSaveBlock1 + 0x2D9C
-	thumb_func_end sub_80F8534
-
-	thumb_func_start sub_80F8560
-sub_80F8560: @ 80F8560
-	push {r4-r6,lr}
-	adds r6, r1, 0
-	lsls r5, r0, 3
-	subs r5, r0
-	ldr r0, _080F8594 @ =gSaveBlock1 + 0x2D9C
-	adds r5, r0
-	adds r0, r6, 0
-	bl StringLength
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0xFF
-	movs r2, 0x7
-	bl memset
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl StringCopyN
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8594: .4byte gSaveBlock1 + 0x2D9C
-	thumb_func_end sub_80F8560
-
-	thumb_func_start sub_80F8598
-sub_80F8598: @ 80F8598
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r0, _080F85EC @ =gSaveBlock1 + 0x2D94
-	adds r0, 0x4
-	adds r0, r5, r0
-	strb r6, [r0]
-	ldr r1, _080F85F0 @ =gSaveBlock2
-	adds r0, r5, 0
-	bl sub_80F8560
-	lsls r4, r6, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl sub_80F8438
-	adds r1, r0, 0
-	adds r0, r5, 0
-	bl sub_80F84EC
-	ldr r5, _080F85F4 @ =gStringVar1
-	adds r0, r4, 0
-	bl sub_80F8438
-	adds r1, r0, 0
-	adds r0, r5, 0
-	movs r2, 0
-	movs r3, 0xA
-	bl ConvertIntToDecimalStringN
-	ldr r4, _080F85F8 @ =gStringVar2
-	adds r0, r6, 0
-	bl sub_80F8490
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl StringCopy
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F85EC: .4byte gSaveBlock1 + 0x2D94
-_080F85F0: .4byte gSaveBlock2
-_080F85F4: .4byte gStringVar1
-_080F85F8: .4byte gStringVar2
-	thumb_func_end sub_80F8598
-
-	thumb_func_start sub_80F85FC
-sub_80F85FC: @ 80F85FC
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	adds r6, r1, 0
-	movs r5, 0
-	cmp r5, r6
-	bge _080F8612
-_080F8608:
-	adds r0, r7, r5
-	strb r5, [r0]
-	adds r5, 0x1
-	cmp r5, r6
-	blt _080F8608
-_080F8612:
-	cmp r6, 0
-	ble _080F8648
-	adds r5, r6, 0
-_080F8618:
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r6, 0
-	bl __modsi3
-	adds r4, r0, 0
-	bl Random
-	lsls r0, 16
-	lsrs r0, 16
-	adds r1, r6, 0
-	bl __modsi3
-	adds r4, r7, r4
-	ldrb r2, [r4]
-	adds r0, r7, r0
-	ldrb r1, [r0]
-	strb r1, [r4]
-	strb r2, [r0]
-	subs r5, 0x1
-	cmp r5, 0
-	bne _080F8618
-_080F8648:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F85FC
-
-	thumb_func_start sub_80F8650
-sub_80F8650: @ 80F8650
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r7, sp
-	mov r10, sp
-	ldr r0, _080F86D4 @ =gUnknown_083E5620
-	ldr r0, [r0]
-	lsls r0, 3
-	lsrs r0, 3
-	adds r0, 0x3
-	lsrs r0, 2
-	lsls r0, 2
-	mov r1, sp
-	subs r1, r0
-	mov sp, r1
-	mov r8, sp
-	mov r0, sp
-	movs r1, 0x24
-	bl sub_80F85FC
-	movs r5, 0
-	ldr r0, _080F86D8 @ =gUnknown_083E53E0
-	mov r9, r0
-	ldr r3, _080F86DC @ =gSaveBlock1 + 0x2D94
-_080F8686:
-	mov r1, r8
-	adds r0, r1, r5
-	ldrb r0, [r0]
-	lsls r0, 4
-	add r0, r9
-	ldrb r4, [r0]
-	ldrb r6, [r0, 0x1]
-	movs r1, 0
-	ldrb r0, [r3, 0x4]
-	cmp r0, r4
-	beq _080F86AC
-	ldr r2, _080F86E0 @ =gSaveBlock1 + 0x2D98
-_080F869E:
-	adds r1, 0x1
-	cmp r1, 0x3
-	bgt _080F86AC
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, r4
-	bne _080F869E
-_080F86AC:
-	cmp r1, 0x4
-	bne _080F86E4
-	adds r0, r4, 0
-	str r3, [r7]
-	bl sub_80F8438
-	ldr r3, [r7]
-	cmp r0, r6
-	bcc _080F86E4
-	movs r0, 0x1
-	strb r0, [r3, 0x1]
-	bl sub_80F849C
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	bl sub_80F8598
-	movs r0, 0x1
-	b _080F86EC
-	.align 2, 0
-_080F86D4: .4byte gUnknown_083E5620
-_080F86D8: .4byte gUnknown_083E53E0
-_080F86DC: .4byte gSaveBlock1 + 0x2D94
-_080F86E0: .4byte gSaveBlock1 + 0x2D98
-_080F86E4:
-	adds r5, 0x1
-	cmp r5, 0x23
-	ble _080F8686
-	movs r0, 0
-_080F86EC:
-	mov sp, r10
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F8650
-
-	thumb_func_start sub_80F8700
-sub_80F8700: @ 80F8700
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, _080F8748 @ =gSaveBlock1 + 0x2D94
-	adds r0, 0x4
-	adds r0, r5, r0
-	ldrb r6, [r0]
-	ldr r4, _080F874C @ =gStringVar1
-	adds r0, r5, 0
-	bl sub_80F84C8
-	adds r1, r0, 0
-	adds r0, r4, 0
-	movs r2, 0
-	movs r3, 0xA
-	bl ConvertIntToDecimalStringN
-	ldr r4, _080F8750 @ =gStringVar2
-	adds r0, r6, 0
-	bl sub_80F8490
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl StringCopy
-	ldr r1, _080F8754 @ =gStringVar3
-	adds r0, r5, 0
-	bl sub_80F8534
-	adds r0, r6, 0
-	bl sub_80F8484
-	bl ShowFieldMessage
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8748: .4byte gSaveBlock1 + 0x2D94
-_080F874C: .4byte gStringVar1
-_080F8750: .4byte gStringVar2
-_080F8754: .4byte gStringVar3
-	thumb_func_end sub_80F8700
-
-	thumb_func_start sub_80F8758
-sub_80F8758: @ 80F8758
-	push {r4-r6,lr}
-	bl sub_80F849C
-	adds r3, r0, 0
-	lsls r3, 25
-	movs r0, 0x80
-	lsls r0, 19
-	adds r3, r0
-	lsrs r3, 24
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x19
-	bl MenuDrawTextWindow
-	movs r4, 0
-	ldr r1, _080F87BC @ =gSaveBlock1 + 0x2D94
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _080F87A4
-	adds r6, r1, 0x4
-	movs r5, 0x80
-	lsls r5, 18
-_080F8784:
-	bl sub_80F8478
-	lsrs r2, r5, 24
-	movs r1, 0x1
-	bl MenuPrint
-	movs r1, 0x80
-	lsls r1, 18
-	adds r5, r1
-	adds r4, 0x1
-	cmp r4, 0x3
-	bgt _080F87A4
-	adds r0, r4, r6
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080F8784
-_080F87A4:
-	ldr r0, _080F87C0 @ =gPCText_Cancel
-	lsls r2, r4, 25
-	movs r1, 0x80
-	lsls r1, 18
-	adds r2, r1
-	lsrs r2, 24
-	movs r1, 0x1
-	bl MenuPrint
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F87BC: .4byte gSaveBlock1 + 0x2D94
-_080F87C0: .4byte gPCText_Cancel
-	thumb_func_end sub_80F8758
-
-	thumb_func_start sub_80F87C4
-sub_80F87C4: @ 80F87C4
-	push {r4-r6,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, _080F87E4 @ =gTasks
-	adds r4, r0, r1
-	movs r0, 0x8
-	ldrsh r5, [r4, r0]
-	cmp r5, 0
-	beq _080F87E8
-	cmp r5, 0x1
-	beq _080F8810
-	b _080F8862
-	.align 2, 0
-_080F87E4: .4byte gTasks
-_080F87E8:
-	bl sub_80F8758
-	bl sub_80F849C
-	adds r3, r0, 0
-	adds r3, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	str r5, [sp]
-	movs r0, 0x18
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0x2
-	bl InitMenu
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _080F8862
-_080F8810:
-	bl ProcessMenuInput
-	lsls r0, 24
-	asrs r4, r0, 24
-	movs r0, 0x2
-	negs r0, r0
-	cmp r4, r0
-	beq _080F8862
-	adds r0, 0x1
-	cmp r4, r0
-	beq _080F8832
-	bl sub_80F849C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _080F8840
-_080F8832:
-	ldr r1, _080F883C @ =gScriptResult
-	movs r0, 0
-	strh r0, [r1]
-	b _080F8848
-	.align 2, 0
-_080F883C: .4byte gScriptResult
-_080F8840:
-	ldr r0, _080F886C @ =gScriptResult
-	strh r5, [r0]
-	ldr r0, _080F8870 @ =gUnknown_03000748
-	strb r4, [r0]
-_080F8848:
-	bl HandleDestroyMenuCursors
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x19
-	movs r3, 0xC
-	bl MenuZeroFillWindowRect
-	adds r0, r6, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-_080F8862:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F886C: .4byte gScriptResult
-_080F8870: .4byte gUnknown_03000748
-	thumb_func_end sub_80F87C4
-
-	thumb_func_start sub_80F8874
-sub_80F8874: @ 80F8874
-	push {lr}
-	ldr r0, _080F8884 @ =sub_80F87C4
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8884: .4byte sub_80F87C4
-	thumb_func_end sub_80F8874
-
-	thumb_func_start sub_80F8888
-sub_80F8888: @ 80F8888
-	push {lr}
-	ldr r0, _080F8898 @ =gUnknown_03000748
-	ldrb r0, [r0]
-	bl sub_80F8700
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F8898: .4byte gUnknown_03000748
-	thumb_func_end sub_80F8888
-
-	thumb_func_start sub_80F889C
-sub_80F889C: @ 80F889C
-	push {lr}
-	bl sub_80F849C
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F889C
-
-	thumb_func_start sub_80F88AC
-sub_80F88AC: @ 80F88AC
-	push {r4,r5,lr}
-	ldr r1, _080F88C8 @ =gSaveBlock1 + 0x2D94
-	ldr r5, _080F88CC @ =gUnknown_03000748
-	ldrb r0, [r5]
-	adds r1, 0x4
-	adds r1, r0, r1
-	ldrb r4, [r1]
-	bl sub_80F8508
-	cmp r0, 0x1
-	beq _080F88D0
-	movs r0, 0
-	b _080F88DA
-	.align 2, 0
-_080F88C8: .4byte gSaveBlock1 + 0x2D94
-_080F88CC: .4byte gUnknown_03000748
-_080F88D0:
-	ldrb r0, [r5]
-	adds r1, r4, 0
-	bl sub_80F8598
-	movs r0, 0x1
-_080F88DA:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F88AC
-
-	thumb_func_start sub_80F88E0
-sub_80F88E0: @ 80F88E0
-	push {lr}
-	ldr r0, _080F88F0 @ =gSaveBlock1 + 0x2D94
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0
-	beq _080F88F4
-	movs r0, 0x1
-	b _080F88F6
-	.align 2, 0
-_080F88F0: .4byte gSaveBlock1 + 0x2D94
-_080F88F4:
-	movs r0, 0
-_080F88F6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F88E0
-
-	thumb_func_start sub_80F88FC
-sub_80F88FC: @ 80F88FC
-	push {lr}
-	bl sub_80F8650
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80F88FC
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 8a7c153b9..ec6754b86 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -7645,7 +7645,7 @@ _08070AF4:
 	ldr r7, _08070B28 @ =0x0201c000
 	ldr r0, [r7]
 	movs r1, 0x1
-	bl sub_803B7C8
+	bl MonTryLearningNewMove
 	lsls r0, 16
 	lsrs r4, r0, 16
 	ldr r1, _08070B2C @ =0xfffff282
@@ -7680,7 +7680,7 @@ _08070B40:
 	lsrs r2, r0, 16
 	cmp r2, 0
 	beq _08070B74
-	ldr r1, _08070B6C @ =gUnknown_03005E94
+	ldr r1, _08070B6C @ =gCB2_AfterEvolution
 	ldr r0, _08070B70 @ =sub_80A53F8
 	str r0, [r1]
 	ldr r0, [r7]
@@ -7692,7 +7692,7 @@ _08070B40:
 	bl DestroyTask
 	b _08070C2C
 	.align 2, 0
-_08070B6C: .4byte gUnknown_03005E94
+_08070B6C: .4byte gCB2_AfterEvolution
 _08070B70: .4byte sub_80A53F8
 _08070B74:
 	adds r0, r6, 0
@@ -7703,7 +7703,7 @@ _08070B7C:
 	ldr r1, _08070BBC @ =gStringVar1
 	bl GetMonNickname
 	ldr r0, _08070BC0 @ =gStringVar2
-	ldr r5, _08070BC4 @ =word_2024E82
+	ldr r5, _08070BC4 @ =gMoveToLearn
 	ldrh r2, [r5]
 	movs r1, 0xD
 	muls r1, r2
@@ -7729,7 +7729,7 @@ _08070B7C:
 	.align 2, 0
 _08070BBC: .4byte gStringVar1
 _08070BC0: .4byte gStringVar2
-_08070BC4: .4byte word_2024E82
+_08070BC4: .4byte gMoveToLearn
 _08070BC8: .4byte gMoveNames
 _08070BCC: .4byte gStringVar4
 _08070BD0: .4byte gOtherText_WantsToLearn
@@ -7796,7 +7796,7 @@ sub_8070C54: @ 8070C54
 	ldr r7, _08070C78 @ =0x0201c000
 	ldr r0, [r7]
 	movs r1, 0
-	bl sub_803B7C8
+	bl MonTryLearningNewMove
 	lsls r0, 16
 	lsrs r4, r0, 16
 	ldr r0, _08070C7C @ =0x0000fffe
@@ -7826,7 +7826,7 @@ _08070C8C:
 	lsrs r2, r0, 16
 	cmp r2, 0
 	beq _08070CC0
-	ldr r1, _08070CB8 @ =gUnknown_03005E94
+	ldr r1, _08070CB8 @ =gCB2_AfterEvolution
 	ldr r0, _08070CBC @ =sub_80A53F8
 	str r0, [r1]
 	ldr r0, [r7]
@@ -7838,7 +7838,7 @@ _08070C8C:
 	bl DestroyTask
 	b _08070D68
 	.align 2, 0
-_08070CB8: .4byte gUnknown_03005E94
+_08070CB8: .4byte gCB2_AfterEvolution
 _08070CBC: .4byte sub_80A53F8
 _08070CC0:
 	adds r0, r6, 0
@@ -7849,7 +7849,7 @@ _08070CC8:
 	ldr r1, _08070D08 @ =gStringVar1
 	bl GetMonNickname
 	ldr r0, _08070D0C @ =gStringVar2
-	ldr r5, _08070D10 @ =word_2024E82
+	ldr r5, _08070D10 @ =gMoveToLearn
 	ldrh r2, [r5]
 	movs r1, 0xD
 	muls r1, r2
@@ -7875,7 +7875,7 @@ _08070CC8:
 	.align 2, 0
 _08070D08: .4byte gStringVar1
 _08070D0C: .4byte gStringVar2
-_08070D10: .4byte word_2024E82
+_08070D10: .4byte gMoveToLearn
 _08070D14: .4byte gMoveNames
 _08070D18: .4byte gStringVar4
 _08070D1C: .4byte gOtherText_WantsToLearn
@@ -7971,7 +7971,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC
 	adds r1, r6, 0
 	adds r2, r5, 0
 	bl sub_806E8D0
-	ldr r1, _08070E20 @ =gUnknown_03005E94
+	ldr r1, _08070E20 @ =gCB2_AfterEvolution
 	ldr r0, _08070E24 @ =sub_80A53F8
 	str r0, [r1]
 	ldr r0, _08070E28 @ =0x0201c000
@@ -7995,7 +7995,7 @@ DoEvolutionStoneItemEffect: @ 8070DBC
 	.align 2, 0
 _08070E18: .4byte gTasks
 _08070E1C: .4byte TaskDummy
-_08070E20: .4byte gUnknown_03005E94
+_08070E20: .4byte gCB2_AfterEvolution
 _08070E24: .4byte sub_80A53F8
 _08070E28: .4byte 0x0201c000
 _08070E2C: .4byte gUnknown_0202E8F4
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index 542eed201..9e380f597 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -518,7 +518,7 @@ _08110A44:
 	bl GetRoamerLocation
 	ldrb r0, [r4, 0x10]
 	ldrb r1, [r4, 0x11]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	strh r0, [r4, 0x12]
 	movs r3, 0x88
@@ -566,7 +566,7 @@ SetAreaHasMon: @ 8110A98
 	adds r0, r5
 	strb r1, [r0, 0x11]
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	bl sub_80FBA04
 	ldrh r1, [r4]
@@ -599,7 +599,7 @@ SetSpecialMapHasMon: @ 8110AE4
 	cmp r0, 0x1F
 	bhi _08110B96
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r6, r0, 0
 	ldrb r0, [r6, 0x14]
 	cmp r0, 0x57
diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s
deleted file mode 100644
index fe1b41724..000000000
--- a/asm/pokemon_menu.s
+++ /dev/null
@@ -1,3438 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8089A70
-sub_8089A70: @ 8089A70
-	push {lr}
-	ldr r0, _08089A88 @ =gPaletteFade
-	ldrb r1, [r0, 0x8]
-	movs r2, 0x80
-	orrs r1, r2
-	strb r1, [r0, 0x8]
-	movs r0, 0
-	movs r1, 0
-	bl OpenPartyMenu
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089A88: .4byte gPaletteFade
-	thumb_func_end sub_8089A70
-
-	thumb_func_start sub_8089A8C
-sub_8089A8C: @ 8089A8C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r5, _08089AD0 @ =gUnknown_0202FFA9
-	movs r0, 0
-	strb r0, [r5]
-	ldr r0, _08089AD4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08089AD8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	beq _08089AE0
-	ldr r4, _08089ADC @ =gUnknown_0202FFAA
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl AppendToList
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl AppendToList
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x3
-	bl AppendToList
-	b _08089BC8
-	.align 2, 0
-_08089AD0: .4byte gUnknown_0202FFA9
-_08089AD4: .4byte gLastFieldPokeMenuOpened
-_08089AD8: .4byte gPlayerParty
-_08089ADC: .4byte gUnknown_0202FFAA
-_08089AE0:
-	movs r6, 0
-	ldr r0, _08089B24 @ =gUnknown_0839F554
-	ldrh r0, [r0]
-	mov r8, r0
-_08089AE8:
-	movs r4, 0
-	adds r7, r6, 0x1
-	mov r0, r8
-	cmp r0, 0xFF
-	beq _08089B48
-	ldr r5, _08089B24 @ =gUnknown_0839F554
-_08089AF4:
-	ldr r0, _08089B28 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08089B2C @ =gPlayerParty
-	adds r0, r1
-	adds r1, r6, 0
-	adds r1, 0xD
-	bl GetMonData
-	lsls r1, r4, 1
-	adds r1, r5
-	ldrh r1, [r1]
-	cmp r0, r1
-	bne _08089B38
-	adds r2, r4, 0
-	adds r2, 0xA
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, _08089B30 @ =gUnknown_0202FFAA
-	ldr r1, _08089B34 @ =gUnknown_0202FFA9
-	bl AppendToList
-	b _08089B48
-	.align 2, 0
-_08089B24: .4byte gUnknown_0839F554
-_08089B28: .4byte gLastFieldPokeMenuOpened
-_08089B2C: .4byte gPlayerParty
-_08089B30: .4byte gUnknown_0202FFAA
-_08089B34: .4byte gUnknown_0202FFA9
-_08089B38:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsls r0, r4, 1
-	adds r0, r5
-	ldrh r0, [r0]
-	cmp r0, 0xFF
-	bne _08089AF4
-_08089B48:
-	lsls r0, r7, 16
-	lsrs r6, r0, 16
-	cmp r6, 0x3
-	bls _08089AE8
-	ldr r4, _08089BA4 @ =gUnknown_0202FFAA
-	ldr r5, _08089BA8 @ =gUnknown_0202FFA9
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl AppendToList
-	ldr r6, _08089BAC @ =gPlayerParty + 1 * 0x64
-	adds r0, r6, 0
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	beq _08089B76
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl AppendToList
-_08089B76:
-	ldr r0, _08089BB0 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	adds r1, r6, 0
-	subs r1, 0x64
-	adds r0, r1
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _08089BB4
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x7
-	bl AppendToList
-	b _08089BBE
-	.align 2, 0
-_08089BA4: .4byte gUnknown_0202FFAA
-_08089BA8: .4byte gUnknown_0202FFA9
-_08089BAC: .4byte gPlayerParty + 1 * 0x64
-_08089BB0: .4byte gLastFieldPokeMenuOpened
-_08089BB4:
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x2
-	bl AppendToList
-_08089BBE:
-	ldr r0, _08089BD4 @ =gUnknown_0202FFAA
-	ldr r1, _08089BD8 @ =gUnknown_0202FFA9
-	movs r2, 0x3
-	bl AppendToList
-_08089BC8:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089BD4: .4byte gUnknown_0202FFAA
-_08089BD8: .4byte gUnknown_0202FFA9
-	thumb_func_end sub_8089A8C
-
-	thumb_func_start sub_8089BDC
-sub_8089BDC: @ 8089BDC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	adds r4, r2, 0
-	mov r8, r3
-	ldr r7, [sp, 0x20]
-	ldr r1, [sp, 0x24]
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x5
-	bl sub_806D538
-	adds r4, r5, r4
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r8
-	lsls r3, r0, 1
-	adds r3, r6, r3
-	adds r3, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl MenuDrawTextWindow
-	adds r5, 0x1
-	lsls r5, 24
-	lsrs r5, 24
-	adds r6, 0x1
-	lsls r6, 24
-	lsrs r6, 24
-	str r7, [sp]
-	adds r0, r5, 0
-	adds r1, r6, 0
-	mov r2, r8
-	ldr r3, [sp, 0x1C]
-	bl PrintMenuItemsReordered
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8089BDC
-
-	thumb_func_start sub_8089C50
-sub_8089C50: @ 8089C50
-	push {r4,r5,lr}
-	sub sp, 0xC
-	ldr r4, [sp, 0x18]
-	ldr r5, [sp, 0x1C]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	str r4, [sp]
-	str r5, [sp, 0x4]
-	movs r4, 0x1
-	str r4, [sp, 0x8]
-	bl sub_8089BDC
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8089C50
-
-	thumb_func_start sub_8089C7C
-sub_8089C7C: @ 8089C7C
-	push {r4-r6,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r6, _08089CC8 @ =gUnknown_0202FFA9
-	ldrb r0, [r6]
-	lsls r0, 1
-	movs r4, 0x12
-	subs r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	ldrb r3, [r6]
-	ldr r0, _08089CCC @ =gPokemonMenuActions
-	str r0, [sp]
-	ldr r0, _08089CD0 @ =gUnknown_0202FFAA
-	str r0, [sp, 0x4]
-	movs r0, 0x3
-	str r0, [sp, 0x8]
-	movs r0, 0x13
-	adds r1, r4, 0
-	movs r2, 0xA
-	bl sub_8089BDC
-	movs r2, 0x1
-	orrs r2, r4
-	ldrb r3, [r6]
-	str r5, [sp]
-	movs r0, 0x9
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0x14
-	bl InitMenu
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089CC8: .4byte gUnknown_0202FFA9
-_08089CCC: .4byte gPokemonMenuActions
-_08089CD0: .4byte gUnknown_0202FFAA
-	thumb_func_end sub_8089C7C
-
-	thumb_func_start sub_8089CD4
-sub_8089CD4: @ 8089CD4
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08089D00 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _08089D84
-	adds r0, r4, 0
-	bl sub_806BD80
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	beq _08089D04
-	cmp r0, 0x2
-	beq _08089D60
-	b _08089D84
-	.align 2, 0
-_08089D00: .4byte gPaletteFade
-_08089D04:
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r4, 0
-	bl sub_806CA38
-	ldr r1, _08089D48 @ =gLastFieldPokeMenuOpened
-	strb r0, [r1]
-	ldrb r1, [r1]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08089D4C @ =gPlayerParty
-	adds r0, r1
-	ldr r1, _08089D50 @ =gStringVar1
-	bl GetMonNickname
-	bl sub_8089A8C
-	ldr r0, _08089D54 @ =gUnknown_0202FFA8
-	strb r5, [r0]
-	movs r0, 0
-	bl sub_8089C7C
-	ldr r1, _08089D58 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _08089D5C @ =sub_8089D94
-	str r1, [r0]
-	adds r0, r4, 0
-	bl sub_808B5B4
-	b _08089D84
-	.align 2, 0
-_08089D48: .4byte gLastFieldPokeMenuOpened
-_08089D4C: .4byte gPlayerParty
-_08089D50: .4byte gStringVar1
-_08089D54: .4byte gUnknown_0202FFA8
-_08089D58: .4byte gTasks
-_08089D5C: .4byte sub_8089D94
-_08089D60:
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	str r5, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _08089D8C @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _08089D90 @ =sub_8089E4C
-	str r1, [r0]
-_08089D84:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089D8C: .4byte gTasks
-_08089D90: .4byte sub_8089E4C
-	thumb_func_end sub_8089CD4
-
-	thumb_func_start sub_8089D94
-sub_8089D94: @ 8089D94
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	ldr r0, _08089DC8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08089E44
-	ldr r2, _08089DCC @ =gMain
-	ldrh r0, [r2, 0x30]
-	movs r1, 0xF0
-	ands r1, r0
-	cmp r1, 0x40
-	bne _08089DD4
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	bl MoveMenuCursor
-	ldr r1, _08089DD0 @ =gUnknown_0202FFA8
-	strb r0, [r1]
-	b _08089E1A
-	.align 2, 0
-_08089DC8: .4byte gPaletteFade
-_08089DCC: .4byte gMain
-_08089DD0: .4byte gUnknown_0202FFA8
-_08089DD4:
-	cmp r1, 0x80
-	bne _08089DF0
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	bl MoveMenuCursor
-	ldr r1, _08089DEC @ =gUnknown_0202FFA8
-	strb r0, [r1]
-	b _08089E1A
-	.align 2, 0
-_08089DEC: .4byte gUnknown_0202FFA8
-_08089DF0:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08089E30
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _08089E24 @ =gPokemonMenuActions
-	ldr r2, _08089E28 @ =gUnknown_0202FFAA
-	ldr r0, _08089E2C @ =gUnknown_0202FFA8
-	ldrb r0, [r0]
-	adds r0, r2
-	ldrb r0, [r0]
-	lsls r0, 3
-	adds r1, 0x4
-	adds r0, r1
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-_08089E1A:
-	adds r0, r4, 0
-	bl sub_808B5B4
-	b _08089E44
-	.align 2, 0
-_08089E24: .4byte gPokemonMenuActions
-_08089E28: .4byte gUnknown_0202FFAA
-_08089E2C: .4byte gUnknown_0202FFA8
-_08089E30:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08089E44
-	adds r0, r5, 0
-	bl PokemonMenu_Cancel
-	adds r0, r5, 0
-	bl sub_808B5B4
-_08089E44:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8089D94
-
-	thumb_func_start sub_8089E4C
-sub_8089E4C: @ 8089E4C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _08089E78 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _08089E72
-	ldr r0, _08089E7C @ =gLastFieldPokeMenuOpened
-	strb r1, [r0]
-	ldr r0, _08089E80 @ =sub_805469C
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_08089E72:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089E78: .4byte gPaletteFade
-_08089E7C: .4byte gLastFieldPokeMenuOpened
-_08089E80: .4byte sub_805469C
-	thumb_func_end sub_8089E4C
-
-	thumb_func_start sub_8089E84
-sub_8089E84: @ 8089E84
-	push {lr}
-	ldr r0, _08089EAC @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08089EB0 @ =gPlayerParty
-	adds r0, r1
-	ldr r1, _08089EB4 @ =gStringVar1
-	bl GetMonNickname
-	bl sub_8089A8C
-	ldr r1, _08089EB8 @ =gUnknown_0202FFA8
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0
-	bl sub_8089C7C
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089EAC: .4byte gLastFieldPokeMenuOpened
-_08089EB0: .4byte gPlayerParty
-_08089EB4: .4byte gStringVar1
-_08089EB8: .4byte gUnknown_0202FFA8
-	thumb_func_end sub_8089E84
-
-	thumb_func_start sub_8089EBC
-sub_8089EBC: @ 8089EBC
-	push {r4,r5,lr}
-	ldr r4, _08089EC4 @ =0x0201b260
-	ldr r5, _08089EC8 @ =gUnknown_020384F0
-	b _08089ED8
-	.align 2, 0
-_08089EC4: .4byte 0x0201b260
-_08089EC8: .4byte gUnknown_020384F0
-_08089ECC:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08089F04
-_08089ED8:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08089ECC
-	ldrb r0, [r4]
-	ldrb r1, [r5]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r1, _08089F0C @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r5]
-	strb r0, [r1]
-	bl sub_8089E84
-	ldr r0, _08089F10 @ =sub_806AEDC
-	bl SetMainCallback2
-_08089F04:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089F0C: .4byte gLastFieldPokeMenuOpened
-_08089F10: .4byte sub_806AEDC
-	thumb_func_end sub_8089EBC
-
-	thumb_func_start sub_8089F14
-sub_8089F14: @ 8089F14
-	push {lr}
-	ldr r2, _08089F38 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r2, _08089F3C @ =sub_8089D94
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0x5
-	bl sub_806AF4C
-	ldr r0, _08089F40 @ =sub_8089EBC
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089F38: .4byte gPaletteFade
-_08089F3C: .4byte sub_8089D94
-_08089F40: .4byte sub_8089EBC
-	thumb_func_end sub_8089F14
-
-	thumb_func_start sub_8089F44
-sub_8089F44: @ 8089F44
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, _08089FAC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _08089FA2
-	ldr r2, _08089FB0 @ =gSprites
-	ldr r1, _08089FB4 @ =gTasks
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0xE]
-	lsls r1, 16
-	asrs r1, 24
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r4, [r0, 0x2E]
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r3, 0
-	bl DestroyTask
-	ldr r0, _08089FB8 @ =0x0201b000
-	ldr r1, _08089FBC @ =0x00000262
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, _08089FC0 @ =gPlayerParty
-	ldr r1, _08089FC4 @ =gPlayerPartyCount
-	ldrb r2, [r1]
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r3, _08089FC8 @ =sub_8089F14
-	str r5, [sp]
-	adds r1, r4, 0
-	bl ShowPokemonSummaryScreen
-_08089FA2:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089FAC: .4byte gPaletteFade
-_08089FB0: .4byte gSprites
-_08089FB4: .4byte gTasks
-_08089FB8: .4byte 0x0201b000
-_08089FBC: .4byte 0x00000262
-_08089FC0: .4byte gPlayerParty
-_08089FC4: .4byte gPlayerPartyCount
-_08089FC8: .4byte sub_8089F14
-	thumb_func_end sub_8089F44
-
-	thumb_func_start PokemonMenu_Summary
-PokemonMenu_Summary: @ 8089FCC
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _08089FFC @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A000 @ =sub_8089F44
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089FFC: .4byte gTasks
-_0808A000: .4byte sub_8089F44
-	thumb_func_end PokemonMenu_Summary
-
-	thumb_func_start sub_808A004
-sub_808A004: @ 808A004
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0808A024 @ =sub_806CA60
-	ldr r2, _0808A028 @ =sub_8089CD4
-	bl SetTaskFuncWithFollowupFunc
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A024: .4byte sub_806CA60
-_0808A028: .4byte sub_8089CD4
-	thumb_func_end sub_808A004
-
-	thumb_func_start PokemonMenu_Switch
-PokemonMenu_Switch: @ 808A02C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	ldr r0, _0808A054 @ =0x02001000
-	ldr r1, _0808A058 @ =sub_806CD5C
-	str r1, [r0, 0xC]
-	ldr r1, _0808A05C @ =0x0001a272
-	adds r0, r1
-	movs r1, 0x1
-	strh r1, [r0]
-	adds r0, r4, 0
-	bl sub_808A004
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A054: .4byte 0x02001000
-_0808A058: .4byte sub_806CD5C
-_0808A05C: .4byte 0x0001a272
-	thumb_func_end PokemonMenu_Switch
-
-	thumb_func_start sub_808A060
-sub_808A060: @ 808A060
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0808A0D0 @ =gMain
-	ldrh r0, [r0, 0x2E]
-	cmp r0, 0x40
-	bne _0808A086
-	ldr r4, _0808A0D4 @ =gUnknown_0202FFA8
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0808A086
-	movs r0, 0x1
-	negs r0, r0
-	bl MoveMenuCursor
-	strb r0, [r4]
-	movs r0, 0x5
-	bl PlaySE
-_0808A086:
-	ldr r0, _0808A0D0 @ =gMain
-	ldrh r0, [r0, 0x2E]
-	cmp r0, 0x80
-	bne _0808A0A4
-	ldr r4, _0808A0D4 @ =gUnknown_0202FFA8
-	ldrb r0, [r4]
-	cmp r0, 0x2
-	beq _0808A0A4
-	movs r0, 0x1
-	bl MoveMenuCursor
-	strb r0, [r4]
-	movs r0, 0x5
-	bl PlaySE
-_0808A0A4:
-	ldr r0, _0808A0D0 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0808A0E0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _0808A0D8 @ =gUnknown_0839F578
-	ldr r2, _0808A0DC @ =gPokemonMenuActions
-	ldr r0, _0808A0D4 @ =gUnknown_0202FFA8
-	ldrb r3, [r0]
-	movs r0, 0
-	bl PartyMenuGetPopupMenuFunc
-	adds r1, r0, 0
-	adds r0, r5, 0
-	bl _call_via_r1
-	b _0808A0F6
-	.align 2, 0
-_0808A0D0: .4byte gMain
-_0808A0D4: .4byte gUnknown_0202FFA8
-_0808A0D8: .4byte gUnknown_0839F578
-_0808A0DC: .4byte gPokemonMenuActions
-_0808A0E0:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0808A0F6
-	ldr r1, _0808A0FC @ =gUnknown_0839F578
-	movs r0, 0
-	bl sub_806E7D0
-	adds r0, r5, 0
-	bl PokemonMenu_CancelSubmenu
-_0808A0F6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A0FC: .4byte gUnknown_0839F578
-	thumb_func_end sub_808A060
-
-	thumb_func_start sub_808A100
-sub_808A100: @ 808A100
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _0808A130 @ =gUnknown_0839F578
-	ldr r2, _0808A134 @ =gPokemonMenuActions
-	movs r0, 0
-	movs r3, 0
-	bl sub_806E750
-	movs r0, 0xD
-	movs r1, 0x2
-	bl sub_806D538
-	ldr r1, _0808A138 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A13C @ =sub_808A060
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A130: .4byte gUnknown_0839F578
-_0808A134: .4byte gPokemonMenuActions
-_0808A138: .4byte gTasks
-_0808A13C: .4byte sub_808A060
-	thumb_func_end sub_808A100
-
-	thumb_func_start PokemonMenu_Item
-PokemonMenu_Item: @ 808A140
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	ldr r1, _0808A174 @ =gUnknown_0202FFA8
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	ldr r1, _0808A178 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A17C @ =sub_808A100
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A174: .4byte gUnknown_0202FFA8
-_0808A178: .4byte gTasks
-_0808A17C: .4byte sub_808A100
-	thumb_func_end PokemonMenu_Item
-
-	thumb_func_start sub_808A180
-sub_808A180: @ 808A180
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0808A1D0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808A1CA
-	adds r0, r5, 0
-	bl sub_806CA38
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0808A1D4 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x40
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	bl DestroyTask
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, _0808A1D8 @ =gSaveBlock1 + 0x2B4C
-	adds r1, r0
-	ldr r2, _0808A1DC @ =sub_808A520
-	movs r0, 0x4
-	movs r3, 0x3
-	bl sub_80E62A0
-_0808A1CA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A1D0: .4byte gPaletteFade
-_0808A1D4: .4byte gPlayerParty
-_0808A1D8: .4byte gSaveBlock1 + 0x2B4C
-_0808A1DC: .4byte sub_808A520
-	thumb_func_end sub_808A180
-
-	thumb_func_start sub_808A1E0
-sub_808A1E0: @ 808A1E0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808A21C @ =gUnknown_0202E8F6
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0808A216
-	adds r0, r4, 0
-	bl sub_806CA38
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl SetHeldItemIconVisibility
-	movs r0, 0
-	movs r1, 0
-	bl sub_806D538
-	ldr r1, _0808A220 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A224 @ =sub_8089CD4
-	str r1, [r0]
-_0808A216:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A21C: .4byte gUnknown_0202E8F6
-_0808A220: .4byte gTasks
-_0808A224: .4byte sub_8089CD4
-	thumb_func_end sub_808A1E0
-
-	thumb_func_start sub_808A228
-sub_808A228: @ 808A228
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808A268 @ =gScriptItemId
-	ldrh r0, [r0]
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A278
-	ldr r0, _0808A26C @ =gUnknown_0202E8F4
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0808A278
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808A270 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A274 @ =sub_808A180
-	str r1, [r0]
-	b _0808A29A
-	.align 2, 0
-_0808A268: .4byte gScriptItemId
-_0808A26C: .4byte gUnknown_0202E8F4
-_0808A270: .4byte gTasks
-_0808A274: .4byte sub_808A180
-_0808A278:
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	movs r0, 0
-	movs r1, 0
-	bl sub_806D538
-	ldr r0, _0808A2A4 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _0808A2A8 @ =sub_8089CD4
-	str r0, [r1]
-_0808A29A:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A2A4: .4byte gTasks
-_0808A2A8: .4byte sub_8089CD4
-	thumb_func_end sub_808A228
-
-	thumb_func_start sub_808A2AC
-sub_808A2AC: @ 808A2AC
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r0, _0808A2D0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808A2CA
-	ldr r0, _0808A2D4 @ =gScriptItemId
-	ldrh r1, [r0]
-	ldr r2, _0808A2D8 @ =sub_808A228
-	adds r0, r3, 0
-	bl PartyMenuTryGiveMonHeldItem
-_0808A2CA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A2D0: .4byte gPaletteFade
-_0808A2D4: .4byte gScriptItemId
-_0808A2D8: .4byte sub_808A228
-	thumb_func_end sub_808A2AC
-
-	thumb_func_start sub_808A2DC
-sub_808A2DC: @ 808A2DC
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	adds r0, r5, 0
-	bl sub_806CA38
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0808A324 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x40
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	bl DestroyTask
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, _0808A328 @ =gSaveBlock1 + 0x2B4C
-	adds r1, r0
-	ldr r2, _0808A32C @ =sub_808A520
-	movs r0, 0x4
-	movs r3, 0x3
-	bl sub_80E62A0
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A324: .4byte gPlayerParty
-_0808A328: .4byte gSaveBlock1 + 0x2B4C
-_0808A32C: .4byte sub_808A520
-	thumb_func_end sub_808A2DC
-
-	thumb_func_start sub_808A330
-sub_808A330: @ 808A330
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0808A344 @ =gScriptItemId
-	ldrh r1, [r1]
-	ldr r2, _0808A348 @ =sub_808A2DC
-	bl PartyMenuTryGiveMonHeldItem
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A344: .4byte gScriptItemId
-_0808A348: .4byte sub_808A2DC
-	thumb_func_end sub_808A330
-
-	thumb_func_start sub_808A34C
-sub_808A34C: @ 808A34C
-	push {lr}
-	bl RunTasks
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808A34C
-
-	thumb_func_start sub_808A358
-sub_808A358: @ 808A358
-	push {r4,lr}
-	ldr r4, _0808A360 @ =0x0201b260
-	b _0808A370
-	.align 2, 0
-_0808A360: .4byte 0x0201b260
-_0808A364:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808A394
-_0808A370:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808A364
-	ldrb r0, [r4]
-	ldr r1, _0808A39C @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808A3A0 @ =sub_806AEDC
-	bl SetMainCallback2
-_0808A394:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A39C: .4byte gLastFieldPokeMenuOpened
-_0808A3A0: .4byte sub_806AEDC
-	thumb_func_end sub_808A358
-
-	thumb_func_start sub_808A3A4
-sub_808A3A4: @ 808A3A4
-	push {r4,r5,lr}
-	ldr r4, _0808A3D8 @ =0x0201b260
-	adds r5, r4, 0x2
-_0808A3AA:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808A3E4
-	ldrb r0, [r4]
-	ldr r1, _0808A3DC @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	movs r0, 0x3
-	strb r0, [r5]
-	bl sub_8089E84
-	ldr r0, _0808A3E0 @ =sub_806AEDC
-	bl SetMainCallback2
-	b _0808A3F0
-	.align 2, 0
-_0808A3D8: .4byte 0x0201b260
-_0808A3DC: .4byte gLastFieldPokeMenuOpened
-_0808A3E0: .4byte sub_806AEDC
-_0808A3E4:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808A3AA
-_0808A3F0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808A3A4
-
-	thumb_func_start sub_808A3F8
-sub_808A3F8: @ 808A3F8
-	push {r4,lr}
-	ldr r0, _0808A460 @ =gScriptItemId
-	ldrh r0, [r0]
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A47E
-	ldr r0, _0808A464 @ =sub_808A330
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r2, _0808A468 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_806BD58
-	ldr r0, _0808A46C @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	adds r0, r4, 0
-	bl sub_806C994
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_806BF74
-	adds r0, r4, 0
-	bl sub_806CA38
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0808A470 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808A478
-	ldr r0, _0808A474 @ =sub_808A34C
-	bl SetMainCallback2
-	b _0808A4C6
-	.align 2, 0
-_0808A460: .4byte gScriptItemId
-_0808A464: .4byte sub_808A330
-_0808A468: .4byte gPaletteFade
-_0808A46C: .4byte gLastFieldPokeMenuOpened
-_0808A470: .4byte gPlayerParty
-_0808A474: .4byte sub_808A34C
-_0808A478:
-	adds r0, r4, 0
-	bl DestroyTask
-_0808A47E:
-	ldr r2, _0808A4A4 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r0, _0808A4A8 @ =gScriptItemId
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _0808A4B4
-	ldr r2, _0808A4AC @ =sub_808A2AC
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0xFF
-	bl sub_806AF4C
-	ldr r0, _0808A4B0 @ =sub_808A358
-	bl SetMainCallback2
-	b _0808A4C6
-	.align 2, 0
-_0808A4A4: .4byte gPaletteFade
-_0808A4A8: .4byte gScriptItemId
-_0808A4AC: .4byte sub_808A2AC
-_0808A4B0: .4byte sub_808A358
-_0808A4B4:
-	ldr r2, _0808A4CC @ =sub_8089D94
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0x5
-	bl sub_806AF4C
-	ldr r0, _0808A4D0 @ =sub_808A3A4
-	bl SetMainCallback2
-_0808A4C6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A4CC: .4byte sub_8089D94
-_0808A4D0: .4byte sub_808A3A4
-	thumb_func_end sub_808A3F8
-
-	thumb_func_start sub_808A4D4
-sub_808A4D4: @ 808A4D4
-	push {r4,lr}
-	ldr r4, _0808A4DC @ =0x0201b260
-	b _0808A4EC
-	.align 2, 0
-_0808A4DC: .4byte 0x0201b260
-_0808A4E0:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808A510
-_0808A4EC:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808A4E0
-	ldrb r0, [r4]
-	ldr r1, _0808A518 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808A51C @ =sub_806AEDC
-	bl SetMainCallback2
-_0808A510:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A518: .4byte gLastFieldPokeMenuOpened
-_0808A51C: .4byte sub_806AEDC
-	thumb_func_end sub_808A4D4
-
-	thumb_func_start sub_808A520
-sub_808A520: @ 808A520
-	push {r4-r7,lr}
-	ldr r2, _0808A584 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r0, _0808A588 @ =gScriptResult
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _0808A59C
-	ldr r7, _0808A58C @ =gUnknown_0202E8F8
-	ldrh r0, [r7]
-	cmp r0, 0
-	beq _0808A542
-	movs r1, 0x1
-	bl RemoveBagItem
-_0808A542:
-	ldr r6, _0808A590 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r6]
-	movs r5, 0x64
-	muls r0, r5
-	ldr r4, _0808A594 @ =gPlayerParty
-	adds r0, r4
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	bl AddBagItem
-	ldrb r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	bl TakeMailFromMon
-	ldrb r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	movs r1, 0xC
-	adds r2, r7, 0
-	bl SetMonData
-	ldr r2, _0808A598 @ =sub_8089CD4
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0
-	bl sub_806AF4C
-	b _0808A5A8
-	.align 2, 0
-_0808A584: .4byte gPaletteFade
-_0808A588: .4byte gScriptResult
-_0808A58C: .4byte gUnknown_0202E8F8
-_0808A590: .4byte gLastFieldPokeMenuOpened
-_0808A594: .4byte gPlayerParty
-_0808A598: .4byte sub_8089CD4
-_0808A59C:
-	ldr r2, _0808A5B4 @ =sub_808A5BC
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0xFF
-	bl sub_806AF4C
-_0808A5A8:
-	ldr r0, _0808A5B8 @ =sub_808A4D4
-	bl SetMainCallback2
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A5B4: .4byte sub_808A5BC
-_0808A5B8: .4byte sub_808A4D4
-	thumb_func_end sub_808A520
-
-	thumb_func_start sub_808A5BC
-sub_808A5BC: @ 808A5BC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808A5F0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808A5EA
-	ldr r0, _0808A5F4 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r0]
-	ldr r1, _0808A5F8 @ =gScriptItemId
-	ldrh r1, [r1]
-	movs r2, 0
-	bl DisplayGiveHeldItemMessage
-	ldr r1, _0808A5FC @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A600 @ =sub_808A1E0
-	str r1, [r0]
-_0808A5EA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A5F0: .4byte gPaletteFade
-_0808A5F4: .4byte gLastFieldPokeMenuOpened
-_0808A5F8: .4byte gScriptItemId
-_0808A5FC: .4byte gTasks
-_0808A600: .4byte sub_808A1E0
-	thumb_func_end sub_808A5BC
-
-	thumb_func_start sub_808A604
-sub_808A604: @ 808A604
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808A628 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808A622
-	ldr r0, _0808A62C @ =sub_80A61D0
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_0808A622:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A628: .4byte gPaletteFade
-_0808A62C: .4byte sub_80A61D0
-	thumb_func_end sub_808A604
-
-	thumb_func_start PokemonMenu_GiveItem
-PokemonMenu_GiveItem: @ 808A630
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl sub_806CA38
-	ldr r1, _0808A66C @ =gUnknown_0202E8F5
-	strb r0, [r1]
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808A670 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A674 @ =sub_808A604
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A66C: .4byte gUnknown_0202E8F5
-_0808A670: .4byte gTasks
-_0808A674: .4byte sub_808A604
-	thumb_func_end PokemonMenu_GiveItem
-
-	thumb_func_start sub_808A678
-sub_808A678: @ 808A678
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_808A8D4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808A678
-
-	thumb_func_start PokemonMenu_TakeItem
-PokemonMenu_TakeItem: @ 808A688
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	bl sub_806D5A4
-	ldr r1, _0808A6B4 @ =sub_808A678
-	adds r0, r4, 0
-	bl PartyMenuTryGiveMonHeldItem_806ECE8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A6B4: .4byte sub_808A678
-	thumb_func_end PokemonMenu_TakeItem
-
-	thumb_func_start PokemonMenu_TakeMail
-PokemonMenu_TakeMail: @ 808A6B8
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	bl sub_806D5A4
-	ldr r1, _0808A6E4 @ =sub_808A678
-	adds r0, r4, 0
-	bl DoTakeMail
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A6E4: .4byte sub_808A678
-	thumb_func_end PokemonMenu_TakeMail
-
-	thumb_func_start PokemonMenu_Mail
-PokemonMenu_Mail: @ 808A6E8
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	ldr r1, _0808A728 @ =gUnknown_0202FFA8
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	ldr r1, _0808A72C @ =gUnknown_0839F584
-	ldr r2, _0808A730 @ =gPokemonMenuActions
-	movs r0, 0
-	movs r3, 0
-	bl sub_806E750
-	ldr r1, _0808A734 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A738 @ =sub_808A73C
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A728: .4byte gUnknown_0202FFA8
-_0808A72C: .4byte gUnknown_0839F584
-_0808A730: .4byte gPokemonMenuActions
-_0808A734: .4byte gTasks
-_0808A738: .4byte sub_808A73C
-	thumb_func_end PokemonMenu_Mail
-
-	thumb_func_start sub_808A73C
-sub_808A73C: @ 808A73C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0808A764 @ =gMain
-	ldrh r0, [r0, 0x30]
-	cmp r0, 0x40
-	bne _0808A77A
-	movs r0, 0x5
-	bl PlaySE
-	ldr r4, _0808A768 @ =gUnknown_0202FFA8
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _0808A770
-	ldr r0, _0808A76C @ =gUnknown_0839F584
-	ldrb r0, [r0]
-	subs r0, 0x1
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A774
-	.align 2, 0
-_0808A764: .4byte gMain
-_0808A768: .4byte gUnknown_0202FFA8
-_0808A76C: .4byte gUnknown_0839F584
-_0808A770:
-	movs r0, 0x1
-	negs r0, r0
-_0808A774:
-	bl MoveMenuCursor
-	strb r0, [r4]
-_0808A77A:
-	ldr r0, _0808A7A0 @ =gMain
-	ldrh r0, [r0, 0x30]
-	cmp r0, 0x80
-	bne _0808A7B4
-	movs r0, 0x5
-	bl PlaySE
-	ldr r4, _0808A7A4 @ =gUnknown_0202FFA8
-	ldrb r0, [r4]
-	ldr r1, _0808A7A8 @ =gUnknown_0839F584
-	ldrb r2, [r1]
-	subs r1, r2, 0x1
-	cmp r0, r1
-	bne _0808A7AC
-	movs r0, 0x1
-	subs r0, r2
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A7AE
-	.align 2, 0
-_0808A7A0: .4byte gMain
-_0808A7A4: .4byte gUnknown_0202FFA8
-_0808A7A8: .4byte gUnknown_0839F584
-_0808A7AC:
-	movs r0, 0x1
-_0808A7AE:
-	bl MoveMenuCursor
-	strb r0, [r4]
-_0808A7B4:
-	ldr r0, _0808A7E0 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0808A7F0
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _0808A7E4 @ =gUnknown_0839F584
-	ldr r2, _0808A7E8 @ =gPokemonMenuActions
-	ldr r0, _0808A7EC @ =gUnknown_0202FFA8
-	ldrb r3, [r0]
-	movs r0, 0
-	bl PartyMenuGetPopupMenuFunc
-	adds r1, r0, 0
-	adds r0, r5, 0
-	bl _call_via_r1
-	b _0808A806
-	.align 2, 0
-_0808A7E0: .4byte gMain
-_0808A7E4: .4byte gUnknown_0839F584
-_0808A7E8: .4byte gPokemonMenuActions
-_0808A7EC: .4byte gUnknown_0202FFA8
-_0808A7F0:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0808A806
-	ldr r1, _0808A80C @ =gUnknown_0839F584
-	movs r0, 0
-	bl sub_806E7D0
-	adds r0, r5, 0
-	bl PokemonMenu_Cancel
-_0808A806:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A80C: .4byte gUnknown_0839F584
-	thumb_func_end sub_808A73C
-
-	thumb_func_start PokemonMenu_ReadMail
-PokemonMenu_ReadMail: @ 808A810
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808A840 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A844 @ =sub_808A848
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A840: .4byte gTasks
-_0808A844: .4byte sub_808A848
-	thumb_func_end PokemonMenu_ReadMail
-
-	thumb_func_start sub_808A848
-sub_808A848: @ 808A848
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0808A898 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808A890
-	adds r0, r5, 0
-	bl sub_806CA38
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r0, r1
-	ldr r1, _0808A89C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x40
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	bl DestroyTask
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _0808A8A0 @ =gSaveBlock1 + 0x2B4C
-	adds r0, r1
-	ldr r1, _0808A8A4 @ =sub_808A8A8
-	movs r2, 0x1
-	bl HandleReadMail
-_0808A890:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A898: .4byte gPaletteFade
-_0808A89C: .4byte gPlayerParty
-_0808A8A0: .4byte gSaveBlock1 + 0x2B4C
-_0808A8A4: .4byte sub_808A8A8
-	thumb_func_end sub_808A848
-
-	thumb_func_start sub_808A8A8
-sub_808A8A8: @ 808A8A8
-	push {lr}
-	ldr r1, _0808A8C4 @ =gUnknown_020384F0
-	ldr r0, _0808A8C8 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r0]
-	strb r0, [r1]
-	ldr r0, _0808A8CC @ =0x0201b000
-	ldr r1, _0808A8D0 @ =0x00000262
-	adds r0, r1
-	movs r1, 0x4
-	strb r1, [r0]
-	bl sub_8089F14
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A8C4: .4byte gUnknown_020384F0
-_0808A8C8: .4byte gLastFieldPokeMenuOpened
-_0808A8CC: .4byte 0x0201b000
-_0808A8D0: .4byte 0x00000262
-	thumb_func_end sub_808A8A8
-
-	thumb_func_start sub_808A8D4
-sub_808A8D4: @ 808A8D4
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _0808A90C @ =gUnknown_0202FFA8
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	movs r0, 0
-	movs r1, 0
-	bl sub_806D538
-	ldr r1, _0808A910 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A914 @ =sub_8089CD4
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A90C: .4byte gUnknown_0202FFA8
-_0808A910: .4byte gTasks
-_0808A914: .4byte sub_8089CD4
-	thumb_func_end sub_808A8D4
-
-	thumb_func_start PokemonMenu_Cancel
-PokemonMenu_Cancel: @ 808A918
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r4, 0
-	bl sub_808A8D4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PokemonMenu_Cancel
-
-	thumb_func_start PokemonMenu_CancelSubmenu
-PokemonMenu_CancelSubmenu: @ 808A938
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl HandleDestroyMenuCursors
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	bl sub_806D5A4
-	ldr r0, _0808A978 @ =gUnknown_0202FFA8
-	ldrb r0, [r0]
-	bl sub_8089C7C
-	ldr r1, _0808A97C @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808A980 @ =sub_8089D94
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808A978: .4byte gUnknown_0202FFA8
-_0808A97C: .4byte gTasks
-_0808A980: .4byte sub_8089D94
-	thumb_func_end PokemonMenu_CancelSubmenu
-
-	thumb_func_start PokemonMenu_FieldMove
-PokemonMenu_FieldMove: @ 808A984
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r6, r0, 3
-	ldr r7, _0808A9D0 @ =gTasks + 0x8
-	adds r4, r6, r7
-	bl HandleDestroyMenuCursors
-	ldr r1, _0808A9D4 @ =gUnknown_0202FFAA
-	ldr r0, _0808A9D8 @ =gUnknown_0202FFA8
-	ldrb r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	subs r0, 0xA
-	strh r0, [r4, 0x16]
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808A9DC
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	ldrh r0, [r4, 0x16]
-	subs r0, 0xB
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bhi _0808AABA
-	movs r0, 0x9
-	b _0808AAB2
-	.align 2, 0
-_0808A9D0: .4byte gTasks + 0x8
-_0808A9D4: .4byte gUnknown_0202FFAA
-_0808A9D8: .4byte gUnknown_0202FFA8
-_0808A9DC:
-	ldrh r1, [r4, 0x16]
-	movs r2, 0x16
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x7
-	bgt _0808AA2C
-	ldr r2, _0808AA20 @ =0x00000807
-	adds r0, r1, r2
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808AA2C
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	bl sub_806D5A4
-	ldr r0, _0808AA24 @ =gOtherText_CantBeUsedBadge
-	movs r1, 0x1
-	bl sub_806E834
-	adds r0, r7, 0
-	subs r0, 0x8
-	adds r0, r6, r0
-	ldr r1, _0808AA28 @ =sub_808AAF0
-	str r1, [r0]
-	b _0808AADA
-	.align 2, 0
-_0808AA20: .4byte 0x00000807
-_0808AA24: .4byte gOtherText_CantBeUsedBadge
-_0808AA28: .4byte sub_808AAF0
-_0808AA2C:
-	ldr r1, _0808AA78 @ =gFieldMoveFuncs
-	movs r2, 0x16
-	ldrsh r0, [r4, r2]
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AA90
-	ldr r1, _0808AA7C @ =gUnknown_0202FFA8
-	movs r0, 0
-	strb r0, [r1]
-	ldrh r0, [r4, 0x16]
-	subs r0, 0xB
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	bls _0808AA88
-	ldr r1, _0808AA80 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808AA84 @ =sub_808AB34
-	str r1, [r0]
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _0808AADA
-	.align 2, 0
-_0808AA78: .4byte gFieldMoveFuncs
-_0808AA7C: .4byte gUnknown_0202FFA8
-_0808AA80: .4byte gTasks
-_0808AA84: .4byte sub_808AB34
-_0808AA88:
-	adds r0, r5, 0
-	bl sub_8133D28
-	b _0808AADA
-_0808AA90:
-	movs r0, 0x13
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	movs r1, 0x16
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x4
-	bne _0808AABA
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808AABA
-	movs r0, 0x8
-_0808AAB2:
-	movs r1, 0
-	bl sub_806D538
-	b _0808AACC
-_0808AABA:
-	ldr r0, _0808AAE4 @ =gFieldMoveFuncs
-	movs r2, 0x16
-	ldrsh r1, [r4, r2]
-	lsls r1, 3
-	adds r1, r0
-	ldrb r0, [r1, 0x4]
-	movs r1, 0
-	bl sub_806D538
-_0808AACC:
-	ldr r0, _0808AAE8 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _0808AAEC @ =sub_808ABF4
-	str r0, [r1]
-_0808AADA:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AAE4: .4byte gFieldMoveFuncs
-_0808AAE8: .4byte gTasks
-_0808AAEC: .4byte sub_808ABF4
-	thumb_func_end PokemonMenu_FieldMove
-
-	thumb_func_start sub_808AAF0
-sub_808AAF0: @ 808AAF0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808AB2C @ =gUnknown_0202E8F6
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0808AB24
-	ldr r0, _0808AB30 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0808AB12
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0808AB24
-_0808AB12:
-	movs r0, 0
-	movs r1, 0xE
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	adds r0, r4, 0
-	bl PokemonMenu_Cancel
-_0808AB24:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AB2C: .4byte gUnknown_0202E8F6
-_0808AB30: .4byte gMain
-	thumb_func_end sub_808AAF0
-
-	thumb_func_start sub_808AB34
-sub_808AB34: @ 808AB34
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808AB6C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808AB84
-	ldr r0, _0808AB70 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	movs r2, 0x1E
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x5
-	bne _0808AB62
-	bl ShouldDoBrailleFlyEffect
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808AB78
-_0808AB62:
-	ldr r0, _0808AB74 @ =c2_exit_to_overworld_2_switch
-	bl SetMainCallback2
-	b _0808AB7E
-	.align 2, 0
-_0808AB6C: .4byte gPaletteFade
-_0808AB70: .4byte gTasks
-_0808AB74: .4byte c2_exit_to_overworld_2_switch
-_0808AB78:
-	ldr r0, _0808AB8C @ =CB2_InitFlyRegionMap
-	bl SetMainCallback2
-_0808AB7E:
-	adds r0, r4, 0
-	bl DestroyTask
-_0808AB84:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AB8C: .4byte CB2_InitFlyRegionMap
-	thumb_func_end sub_808AB34
-
-	thumb_func_start sub_808AB90
-sub_808AB90: @ 808AB90
-	push {lr}
-	bl pal_fill_black
-	ldr r0, _0808ABA4 @ =sub_808ABA8
-	movs r1, 0x8
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808ABA4: .4byte sub_808ABA8
-	thumb_func_end sub_808AB90
-
-	thumb_func_start sub_808ABA8
-sub_808ABA8: @ 808ABA8
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_807D770
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808ABDE
-	ldr r0, _0808ABE4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0808ABE8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	ldr r1, _0808ABEC @ =gUnknown_0202FF84
-	str r0, [r1]
-	ldr r0, _0808ABF0 @ =gUnknown_03005CE4
-	ldr r0, [r0]
-	bl _call_via_r0
-	adds r0, r4, 0
-	bl DestroyTask
-_0808ABDE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808ABE4: .4byte gLastFieldPokeMenuOpened
-_0808ABE8: .4byte gPlayerParty
-_0808ABEC: .4byte gUnknown_0202FF84
-_0808ABF0: .4byte gUnknown_03005CE4
-	thumb_func_end sub_808ABA8
-
-	thumb_func_start sub_808ABF4
-sub_808ABF4: @ 808ABF4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808AC28 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0808AC0E
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0808AC20
-_0808AC0E:
-	movs r0, 0x1
-	movs r1, 0x11
-	movs r2, 0x1C
-	movs r3, 0x12
-	bl MenuZeroFillWindowRect
-	adds r0, r4, 0
-	bl PokemonMenu_Cancel
-_0808AC20:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AC28: .4byte gMain
-	thumb_func_end sub_808ABF4
-
-	thumb_func_start sub_808AC2C
-sub_808AC2C: @ 808AC2C
-	push {lr}
-	ldr r0, _0808AC40 @ =gUnknown_0202FF84
-	ldr r1, _0808AC44 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	str r1, [r0]
-	movs r0, 0x9
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AC40: .4byte gUnknown_0202FF84
-_0808AC44: .4byte gLastFieldPokeMenuOpened
-	thumb_func_end sub_808AC2C
-
-	thumb_func_start SetUpFieldMove_Surf
-SetUpFieldMove_Surf: @ 808AC48
-	push {lr}
-	bl PartyHasMonWithSurf
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AC84
-	bl IsPlayerFacingSurfableFishableWater
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AC84
-	ldr r1, _0808AC74 @ =gFieldCallback
-	ldr r0, _0808AC78 @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _0808AC7C @ =gUnknown_03005CE4
-	ldr r0, _0808AC80 @ =sub_808AC2C
-	str r0, [r1]
-	movs r0, 0x1
-	b _0808AC86
-	.align 2, 0
-_0808AC74: .4byte gFieldCallback
-_0808AC78: .4byte sub_808AB90
-_0808AC7C: .4byte gUnknown_03005CE4
-_0808AC80: .4byte sub_808AC2C
-_0808AC84:
-	movs r0, 0
-_0808AC86:
-	pop {r1}
-	bx r1
-	thumb_func_end SetUpFieldMove_Surf
-
-	thumb_func_start sub_808AC8C
-sub_808AC8C: @ 808AC8C
-	push {lr}
-	ldr r0, _0808ACA0 @ =gUnknown_0202FF84
-	ldr r1, _0808ACA4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	str r1, [r0]
-	movs r0, 0x1F
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808ACA0: .4byte gUnknown_0202FF84
-_0808ACA4: .4byte gLastFieldPokeMenuOpened
-	thumb_func_end sub_808AC8C
-
-	thumb_func_start SetUpFieldMove_Fly
-SetUpFieldMove_Fly: @ 808ACA8
-	push {lr}
-	bl ShouldDoBrailleFlyEffect
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808ACD0
-	ldr r1, _0808ACC0 @ =gFieldCallback
-	ldr r0, _0808ACC4 @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _0808ACC8 @ =gUnknown_03005CE4
-	ldr r0, _0808ACCC @ =DoBrailleFlyEffect
-	b _0808ACF2
-	.align 2, 0
-_0808ACC0: .4byte gFieldCallback
-_0808ACC4: .4byte sub_808AB90
-_0808ACC8: .4byte gUnknown_03005CE4
-_0808ACCC: .4byte DoBrailleFlyEffect
-_0808ACD0:
-	ldr r0, _0808ACE4 @ =gMapHeader
-	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_or_6
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808ACE8
-	movs r0, 0
-	b _0808ACF6
-	.align 2, 0
-_0808ACE4: .4byte gMapHeader
-_0808ACE8:
-	ldr r1, _0808ACFC @ =gFieldCallback
-	ldr r0, _0808AD00 @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _0808AD04 @ =gUnknown_03005CE4
-	ldr r0, _0808AD08 @ =sub_808AC8C
-_0808ACF2:
-	str r0, [r1]
-	movs r0, 0x1
-_0808ACF6:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808ACFC: .4byte gFieldCallback
-_0808AD00: .4byte sub_808AB90
-_0808AD04: .4byte gUnknown_03005CE4
-_0808AD08: .4byte sub_808AC8C
-	thumb_func_end SetUpFieldMove_Fly
-
-	thumb_func_start sub_808AD0C
-sub_808AD0C: @ 808AD0C
-	push {r4,lr}
-	ldr r4, _0808AD14 @ =0x0201b260
-	b _0808AD24
-	.align 2, 0
-_0808AD14: .4byte 0x0201b260
-_0808AD18:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808AD48
-_0808AD24:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AD18
-	ldrb r0, [r4]
-	ldr r1, _0808AD50 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808AD54 @ =sub_806AEDC
-	bl SetMainCallback2
-_0808AD48:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AD50: .4byte gLastFieldPokeMenuOpened
-_0808AD54: .4byte sub_806AEDC
-	thumb_func_end sub_808AD0C
-
-	thumb_func_start sub_808AD58
-sub_808AD58: @ 808AD58
-	push {lr}
-	ldr r2, _0808AD7C @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r2, _0808AD80 @ =sub_8089CD4
-	movs r0, 0
-	movs r1, 0xFF
-	movs r3, 0
-	bl sub_806AF4C
-	ldr r0, _0808AD84 @ =sub_808AD0C
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AD7C: .4byte gPaletteFade
-_0808AD80: .4byte sub_8089CD4
-_0808AD84: .4byte sub_808AD0C
-	thumb_func_end sub_808AD58
-
-	thumb_func_start unref_sub_808AD88
-unref_sub_808AD88: @ 808AD88
-	push {lr}
-	ldr r0, _0808ADA4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0808ADA8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808ADA4: .4byte gLastFieldPokeMenuOpened
-_0808ADA8: .4byte gPlayerParty
-	thumb_func_end unref_sub_808AD88
-
-	thumb_func_start sub_808ADAC
-sub_808ADAC: @ 808ADAC
-	push {lr}
-	ldr r0, _0808ADC0 @ =gUnknown_0202FF84
-	ldr r1, _0808ADC4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	str r1, [r0]
-	movs r0, 0x2C
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808ADC0: .4byte gUnknown_0202FF84
-_0808ADC4: .4byte gLastFieldPokeMenuOpened
-	thumb_func_end sub_808ADAC
-
-	thumb_func_start SetUpFieldMove_Dive
-SetUpFieldMove_Dive: @ 808ADC8
-	push {lr}
-	bl sub_8068F18
-	ldr r1, _0808ADE0 @ =gUnknown_0202FF84
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1, 0x4]
-	cmp r0, 0
-	bne _0808ADE4
-	movs r0, 0
-	b _0808ADF2
-	.align 2, 0
-_0808ADE0: .4byte gUnknown_0202FF84
-_0808ADE4:
-	ldr r1, _0808ADF8 @ =gFieldCallback
-	ldr r0, _0808ADFC @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _0808AE00 @ =gUnknown_03005CE4
-	ldr r0, _0808AE04 @ =sub_808ADAC
-	str r0, [r1]
-	movs r0, 0x1
-_0808ADF2:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808ADF8: .4byte gFieldCallback
-_0808ADFC: .4byte sub_808AB90
-_0808AE00: .4byte gUnknown_03005CE4
-_0808AE04: .4byte sub_808ADAC
-	thumb_func_end SetUpFieldMove_Dive
-
-	thumb_func_start sub_808AE08
-sub_808AE08: @ 808AE08
-	push {lr}
-	ldr r0, _0808AE1C @ =gUnknown_0202FF84
-	ldr r1, _0808AE20 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	str r1, [r0]
-	movs r0, 0x2B
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AE1C: .4byte gUnknown_0202FF84
-_0808AE20: .4byte gLastFieldPokeMenuOpened
-	thumb_func_end sub_808AE08
-
-	thumb_func_start SetUpFieldMove_Waterfall
-SetUpFieldMove_Waterfall: @ 808AE24
-	push {r4,lr}
-	sub sp, 0x4
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWaterfall
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AE80
-	bl IsPlayerSurfingNorth
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AE80
-	ldr r1, _0808AE70 @ =gFieldCallback
-	ldr r0, _0808AE74 @ =sub_808AB90
-	str r0, [r1]
-	ldr r1, _0808AE78 @ =gUnknown_03005CE4
-	ldr r0, _0808AE7C @ =sub_808AE08
-	str r0, [r1]
-	movs r0, 0x1
-	b _0808AE82
-	.align 2, 0
-_0808AE70: .4byte gFieldCallback
-_0808AE74: .4byte sub_808AB90
-_0808AE78: .4byte gUnknown_03005CE4
-_0808AE7C: .4byte sub_808AE08
-_0808AE80:
-	movs r0, 0
-_0808AE82:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end SetUpFieldMove_Waterfall
-
-	thumb_func_start sub_808AE8C
-sub_808AE8C: @ 808AE8C
-	push {r4-r6,lr}
-	ldr r0, _0808AED8 @ =gScriptItemId
-	ldrb r0, [r0]
-	subs r0, 0x21
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-_0808AE9A:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, _0808AEDC @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	beq _0808AF10
-	adds r0, r5, 0
-	bl sub_806D668
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0808AECE
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl CanMonLearnTMHM
-	cmp r0, 0
-	bne _0808AEE0
-_0808AECE:
-	adds r0, r5, 0
-	movs r1, 0x9A
-	bl sub_806BC3C
-	b _0808AF10
-	.align 2, 0
-_0808AED8: .4byte gScriptItemId
-_0808AEDC: .4byte gPlayerParty
-_0808AEE0:
-	ldr r0, _0808AF04 @ =gScriptItemId
-	ldrh r0, [r0]
-	bl ItemIdToBattleMoveId
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl pokemon_has_move
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808AF08
-	adds r0, r5, 0
-	movs r1, 0xA8
-	bl sub_806BC3C
-	b _0808AF10
-	.align 2, 0
-_0808AF04: .4byte gScriptItemId
-_0808AF08:
-	adds r0, r5, 0
-	movs r1, 0x8C
-	bl sub_806BC3C
-_0808AF10:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x5
-	bls _0808AE9A
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808AE8C
-
-	thumb_func_start sub_808AF20
-sub_808AF20: @ 808AF20
-	push {r4,r5,lr}
-	movs r5, 0
-_0808AF24:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, _0808AF78 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	beq _0808AF66
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0808AF58
-	ldr r0, _0808AF7C @ =gScriptItemId
-	ldrh r2, [r0]
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetEvolutionTargetSpecies
-	lsls r0, 16
-	cmp r0, 0
-	bne _0808AF66
-_0808AF58:
-	adds r0, r5, 0
-	bl sub_806D668
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_806BC3C
-_0808AF66:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x5
-	bls _0808AF24
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808AF78: .4byte gPlayerParty
-_0808AF7C: .4byte gScriptItemId
-	thumb_func_end sub_808AF20
-
-	thumb_func_start sub_808AF80
-sub_808AF80: @ 808AF80
-	push {r4,r5,lr}
-	ldr r5, _0808AFB0 @ =0x0201b260
-_0808AF84:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808B00C
-	ldr r0, _0808AFB4 @ =gUnknown_02038561
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0808AFC6
-	ldr r0, _0808AFB8 @ =gScriptItemId
-	ldrh r0, [r0]
-	bl CheckIfItemIsTMHMOrEvolutionStone
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808AFBC
-	cmp r0, 0x2
-	beq _0808AFC2
-	b _0808AFC6
-	.align 2, 0
-_0808AFB0: .4byte 0x0201b260
-_0808AFB4: .4byte gUnknown_02038561
-_0808AFB8: .4byte gScriptItemId
-_0808AFBC:
-	bl sub_808AE8C
-	b _0808AFC6
-_0808AFC2:
-	bl sub_808AF20
-_0808AFC6:
-	ldr r4, _0808B000 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r4]
-	cmp r0, 0x5
-	bhi _0808AFE2
-	adds r1, r0, 0
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0808B004 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	bne _0808AFE6
-_0808AFE2:
-	movs r0, 0
-	strb r0, [r4]
-_0808AFE6:
-	ldrb r0, [r5]
-	ldr r1, _0808B000 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r5]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808B008 @ =sub_806AEDC
-	bl SetMainCallback2
-	b _0808B018
-	.align 2, 0
-_0808B000: .4byte gLastFieldPokeMenuOpened
-_0808B004: .4byte gPlayerParty
-_0808B008: .4byte sub_806AEDC
-_0808B00C:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808AF84
-_0808B018:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808AF80
-
-	thumb_func_start sub_808B020
-sub_808B020: @ 808B020
-	push {lr}
-	ldr r2, _0808B040 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r0, _0808B044 @ =gUnknown_02038561
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0808B0A0
-	cmp r0, 0x1
-	bgt _0808B048
-	cmp r0, 0
-	beq _0808B052
-	b _0808B0AC
-	.align 2, 0
-_0808B040: .4byte gPaletteFade
-_0808B044: .4byte gUnknown_02038561
-_0808B048:
-	cmp r0, 0x3
-	beq _0808B0A0
-	cmp r0, 0x4
-	beq _0808B08C
-	b _0808B0AC
-_0808B052:
-	ldr r0, _0808B070 @ =gScriptItemId
-	ldrh r0, [r0]
-	bl CheckIfItemIsTMHMOrEvolutionStone
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808B078
-	ldr r2, _0808B074 @ =sub_808B0C0
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0x14
-	bl sub_806AF4C
-	b _0808B0AC
-	.align 2, 0
-_0808B070: .4byte gScriptItemId
-_0808B074: .4byte sub_808B0C0
-_0808B078:
-	ldr r2, _0808B088 @ =sub_808B0C0
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0x3
-	bl sub_806AF4C
-	b _0808B0AC
-	.align 2, 0
-_0808B088: .4byte sub_808B0C0
-_0808B08C:
-	ldr r2, _0808B09C @ =sub_808B1EC
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0xFF
-	bl sub_806AF4C
-	b _0808B0AC
-	.align 2, 0
-_0808B09C: .4byte sub_808B1EC
-_0808B0A0:
-	ldr r2, _0808B0B8 @ =sub_808B0C0
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0x4
-	bl sub_806AF4C
-_0808B0AC:
-	ldr r0, _0808B0BC @ =sub_808AF80
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B0B8: .4byte sub_808B0C0
-_0808B0BC: .4byte sub_808AF80
-	thumb_func_end sub_808B020
-
-	thumb_func_start sub_808B0C0
-sub_808B0C0: @ 808B0C0
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B0EC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0808B1CE
-	adds r0, r4, 0
-	bl sub_806BD80
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	beq _0808B0F0
-	cmp r0, 0x2
-	beq _0808B184
-	b _0808B1CE
-	.align 2, 0
-_0808B0EC: .4byte gPaletteFade
-_0808B0F0:
-	adds r0, r4, 0
-	bl sub_806CA38
-	ldr r1, _0808B118 @ =gLastFieldPokeMenuOpened
-	strb r0, [r1]
-	ldrb r1, [r1]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0808B11C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	beq _0808B120
-	movs r0, 0x20
-	bl PlaySE
-	b _0808B1CE
-	.align 2, 0
-_0808B118: .4byte gLastFieldPokeMenuOpened
-_0808B11C: .4byte gPlayerParty
-_0808B120:
-	bl sub_806D5A4
-	ldr r5, _0808B16C @ =gUnknown_02038561
-	ldrb r0, [r5]
-	cmp r0, 0
-	bne _0808B13C
-	ldr r3, _0808B170 @ =gUnknown_03004AE4
-	ldr r0, _0808B174 @ =gScriptItemId
-	ldrh r1, [r0]
-	ldr r2, _0808B178 @ =sub_808B224
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-_0808B13C:
-	ldrb r0, [r5]
-	cmp r0, 0x1
-	bne _0808B154
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _0808B174 @ =gScriptItemId
-	ldrh r1, [r0]
-	ldr r2, _0808B17C @ =sub_808B2EC
-	adds r0, r4, 0
-	bl PartyMenuTryGiveMonHeldItem
-_0808B154:
-	ldrb r0, [r5]
-	cmp r0, 0x3
-	bne _0808B1CE
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _0808B180 @ =sub_808B2B4
-	adds r0, r4, 0
-	bl PartyMenuTryGiveMonMail
-	b _0808B1CE
-	.align 2, 0
-_0808B16C: .4byte gUnknown_02038561
-_0808B170: .4byte gUnknown_03004AE4
-_0808B174: .4byte gScriptItemId
-_0808B178: .4byte sub_808B224
-_0808B17C: .4byte sub_808B2EC
-_0808B180: .4byte sub_808B2B4
-_0808B184:
-	adds r0, r4, 0
-	bl sub_806CA38
-	ldr r1, _0808B1D8 @ =gLastFieldPokeMenuOpened
-	strb r0, [r1]
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x1
-	negs r0, r0
-	str r5, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r2, _0808B1DC @ =gUnknown_02038561
-	ldrb r0, [r2]
-	cmp r0, 0x1
-	bhi _0808B1BA
-	ldr r0, _0808B1E0 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _0808B1E4 @ =sub_808B25C
-	str r0, [r1]
-_0808B1BA:
-	ldrb r0, [r2]
-	cmp r0, 0x3
-	bne _0808B1CE
-	ldr r0, _0808B1E0 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _0808B1E8 @ =sub_808B2B4
-	str r0, [r1]
-_0808B1CE:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B1D8: .4byte gLastFieldPokeMenuOpened
-_0808B1DC: .4byte gUnknown_02038561
-_0808B1E0: .4byte gTasks
-_0808B1E4: .4byte sub_808B25C
-_0808B1E8: .4byte sub_808B2B4
-	thumb_func_end sub_808B0C0
-
-	thumb_func_start sub_808B1EC
-sub_808B1EC: @ 808B1EC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B214 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808B20E
-	ldr r3, _0808B218 @ =gUnknown_03004AE4
-	ldr r0, _0808B21C @ =gScriptItemId
-	ldrh r1, [r0]
-	ldr r2, _0808B220 @ =sub_808B224
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-_0808B20E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B214: .4byte gPaletteFade
-_0808B218: .4byte gUnknown_03004AE4
-_0808B21C: .4byte gScriptItemId
-_0808B220: .4byte sub_808B224
-	thumb_func_end sub_808B1EC
-
-	thumb_func_start sub_808B224
-sub_808B224: @ 808B224
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808B254 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808B258 @ =sub_808B25C
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B254: .4byte gTasks
-_0808B258: .4byte sub_808B25C
-	thumb_func_end sub_808B224
-
-	thumb_func_start sub_808B25C
-sub_808B25C: @ 808B25C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B280 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808B27A
-	ldr r0, _0808B284 @ =sub_80A5B40
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_0808B27A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B280: .4byte gPaletteFade
-_0808B284: .4byte sub_80A5B40
-	thumb_func_end sub_808B25C
-
-	thumb_func_start sub_808B288
-sub_808B288: @ 808B288
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B2AC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808B2A6
-	ldr r0, _0808B2B0 @ =Mailbox_ReturnToMailListAfterDeposit
-	bl SetMainCallback2
-	adds r0, r4, 0
-	bl DestroyTask
-_0808B2A6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B2AC: .4byte gPaletteFade
-_0808B2B0: .4byte Mailbox_ReturnToMailListAfterDeposit
-	thumb_func_end sub_808B288
-
-	thumb_func_start sub_808B2B4
-sub_808B2B4: @ 808B2B4
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808B2E4 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808B2E8 @ =sub_808B288
-	str r1, [r0]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B2E4: .4byte gTasks
-_0808B2E8: .4byte sub_808B288
-	thumb_func_end sub_808B2B4
-
-	thumb_func_start sub_808B2EC
-sub_808B2EC: @ 808B2EC
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B31C @ =gUnknown_0202E8F4
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0808B328
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, _0808B320 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808B324 @ =sub_808B338
-	str r1, [r0]
-	b _0808B32E
-	.align 2, 0
-_0808B31C: .4byte gUnknown_0202E8F4
-_0808B320: .4byte gTasks
-_0808B324: .4byte sub_808B338
-_0808B328:
-	adds r0, r4, 0
-	bl sub_808B224
-_0808B32E:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B2EC
-
-	thumb_func_start sub_808B338
-sub_808B338: @ 808B338
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0808B38C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808B384
-	adds r0, r5, 0
-	bl sub_806CA38
-	ldr r1, _0808B390 @ =gLastFieldPokeMenuOpened
-	strb r0, [r1]
-	ldrb r1, [r1]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0808B394 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x40
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	bl DestroyTask
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, _0808B398 @ =gSaveBlock1 + 0x2B4C
-	adds r1, r0
-	ldr r2, _0808B39C @ =sub_808B3EC
-	movs r0, 0x4
-	movs r3, 0x3
-	bl sub_80E62A0
-_0808B384:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B38C: .4byte gPaletteFade
-_0808B390: .4byte gLastFieldPokeMenuOpened
-_0808B394: .4byte gPlayerParty
-_0808B398: .4byte gSaveBlock1 + 0x2B4C
-_0808B39C: .4byte sub_808B3EC
-	thumb_func_end sub_808B338
-
-	thumb_func_start sub_808B3A0
-sub_808B3A0: @ 808B3A0
-	push {r4,lr}
-	ldr r4, _0808B3A8 @ =0x0201b260
-	b _0808B3B8
-	.align 2, 0
-_0808B3A8: .4byte 0x0201b260
-_0808B3AC:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808B3DC
-_0808B3B8:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808B3AC
-	ldrb r0, [r4]
-	ldr r1, _0808B3E4 @ =gLastFieldPokeMenuOpened
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808B3E8 @ =sub_806AEDC
-	bl SetMainCallback2
-_0808B3DC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B3E4: .4byte gLastFieldPokeMenuOpened
-_0808B3E8: .4byte sub_806AEDC
-	thumb_func_end sub_808B3A0
-
-	thumb_func_start sub_808B3EC
-sub_808B3EC: @ 808B3EC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r0, _0808B464 @ =gPaletteFade
-	mov r8, r0
-	ldrb r0, [r0, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	mov r1, r8
-	strb r0, [r1, 0x8]
-	ldr r0, _0808B468 @ =gScriptResult
-	ldrh r0, [r0]
-	cmp r0, 0
-	bne _0808B480
-	ldr r7, _0808B46C @ =gUnknown_0202E8F8
-	ldrh r0, [r7]
-	cmp r0, 0
-	beq _0808B416
-	movs r1, 0x1
-	bl RemoveBagItem
-_0808B416:
-	ldr r6, _0808B470 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r6]
-	movs r5, 0x64
-	muls r0, r5
-	ldr r4, _0808B474 @ =gPlayerParty
-	adds r0, r4
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	bl AddBagItem
-	ldrb r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	bl TakeMailFromMon
-	ldrb r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	movs r1, 0xC
-	adds r2, r7, 0
-	bl SetMonData
-	ldr r0, _0808B478 @ =sub_808B25C
-	movs r1, 0x5
-	bl CreateTask
-	mov r0, r8
-	ldrb r1, [r0, 0x8]
-	movs r0, 0x7F
-	ands r0, r1
-	mov r1, r8
-	strb r0, [r1, 0x8]
-	ldr r0, _0808B47C @ =sub_806AEDC
-	b _0808B48E
-	.align 2, 0
-_0808B464: .4byte gPaletteFade
-_0808B468: .4byte gScriptResult
-_0808B46C: .4byte gUnknown_0202E8F8
-_0808B470: .4byte gLastFieldPokeMenuOpened
-_0808B474: .4byte gPlayerParty
-_0808B478: .4byte sub_808B25C
-_0808B47C: .4byte sub_806AEDC
-_0808B480:
-	ldr r2, _0808B49C @ =sub_808B4A4
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0xFF
-	bl sub_806AF4C
-	ldr r0, _0808B4A0 @ =sub_808B3A0
-_0808B48E:
-	bl SetMainCallback2
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B49C: .4byte sub_808B4A4
-_0808B4A0: .4byte sub_808B3A0
-	thumb_func_end sub_808B3EC
-
-	thumb_func_start sub_808B4A4
-sub_808B4A4: @ 808B4A4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _0808B4D8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808B4D2
-	ldr r0, _0808B4DC @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r0]
-	ldr r1, _0808B4E0 @ =gScriptItemId
-	ldrh r1, [r1]
-	movs r2, 0x1
-	bl DisplayGiveHeldItemMessage
-	ldr r1, _0808B4E4 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808B4E8 @ =sub_808B4EC
-	str r1, [r0]
-_0808B4D2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B4D8: .4byte gPaletteFade
-_0808B4DC: .4byte gLastFieldPokeMenuOpened
-_0808B4E0: .4byte gScriptItemId
-_0808B4E4: .4byte gTasks
-_0808B4E8: .4byte sub_808B4EC
-	thumb_func_end sub_808B4A4
-
-	thumb_func_start sub_808B4EC
-sub_808B4EC: @ 808B4EC
-	push {lr}
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r0, _0808B504 @ =gUnknown_0202E8F6
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0808B500
-	adds r0, r1, 0
-	bl sub_808B224
-_0808B500:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B504: .4byte gUnknown_0202E8F6
-	thumb_func_end sub_808B4EC
-
-	thumb_func_start sub_808B508
-sub_808B508: @ 808B508
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_808B224
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808B508
-
-	thumb_func_start sub_808B518
-sub_808B518: @ 808B518
-	push {r4,lr}
-	ldr r4, _0808B520 @ =0x0201b260
-	b _0808B530
-	.align 2, 0
-_0808B520: .4byte 0x0201b260
-_0808B524:
-	bl sub_80F9344
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808B554
-_0808B530:
-	bl sub_806B124
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808B524
-	ldrb r0, [r4]
-	ldr r1, _0808B55C @ =gUnknown_020384F0
-	ldrb r1, [r1]
-	bl sub_806C994
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_806BF74
-	ldr r0, _0808B560 @ =sub_806AEDC
-	bl SetMainCallback2
-_0808B554:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B55C: .4byte gUnknown_020384F0
-_0808B560: .4byte sub_806AEDC
-	thumb_func_end sub_808B518
-
-	thumb_func_start sub_808B564
-sub_808B564: @ 808B564
-	push {lr}
-	ldr r2, _0808B58C @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	bl sub_809FA30
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x4
-	beq _0808B594
-	ldr r2, _0808B590 @ =TaughtMove
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0xFF
-	bl sub_806AF4C
-	b _0808B5A0
-	.align 2, 0
-_0808B58C: .4byte gPaletteFade
-_0808B590: .4byte TaughtMove
-_0808B594:
-	ldr r2, _0808B5AC @ =StopTryingToTeachMove_806F588
-	movs r0, 0
-	movs r1, 0
-	movs r3, 0xFF
-	bl sub_806AF4C
-_0808B5A0:
-	ldr r0, _0808B5B0 @ =sub_808B518
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B5AC: .4byte StopTryingToTeachMove_806F588
-_0808B5B0: .4byte sub_808B518
-	thumb_func_end sub_808B564
-
-	thumb_func_start sub_808B5B4
-sub_808B5B4: @ 808B5B4
-	push {lr}
-	ldr r3, _0808B5D8 @ =gUnknown_03005CF0
-	ldr r2, _0808B5DC @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, [r1]
-	str r2, [r3]
-	ldr r2, _0808B5E0 @ =sub_808B5E4
-	str r2, [r1]
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B5D8: .4byte gUnknown_03005CF0
-_0808B5DC: .4byte gTasks
-_0808B5E0: .4byte sub_808B5E4
-	thumb_func_end sub_808B5B4
-
-	thumb_func_start sub_808B5E4
-sub_808B5E4: @ 808B5E4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8055870
-	cmp r0, 0x1
-	beq _0808B602
-	ldr r1, _0808B608 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0808B60C @ =gUnknown_03005CF0
-	ldr r1, [r1]
-	str r1, [r0]
-_0808B602:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808B608: .4byte gTasks
-_0808B60C: .4byte gUnknown_03005CF0
-	thumb_func_end sub_808B5E4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokenav.s b/asm/pokenav.s
index cb6a40450..1062abc48 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -22370,7 +22370,7 @@ _080F6C3A:
 	adds r6, r0, r1
 	ldrh r7, [r6]
 	adds r0, r7, 0
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F6CA0
@@ -22402,7 +22402,7 @@ _080F6C3A:
 	strb r1, [r0]
 	ldrh r0, [r6, 0xA]
 	ldrh r1, [r6, 0xC]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrh r1, [r5]
 	lsls r1, 3
 	adds r4, r1
@@ -22431,7 +22431,7 @@ _080F6CB4:
 	adds r5, r0, r1
 	ldrh r4, [r5]
 	adds r0, r4, 0
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F6D0E
diff --git a/asm/trade.s b/asm/trade.s
index 223f62474..b07a3b632 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10512,7 +10512,7 @@ _0804D4CC:
 	ldrb r0, [r0]
 	movs r1, 0
 	bl sub_804BA94
-	ldr r1, _0804D514 @ =gUnknown_03005E94
+	ldr r1, _0804D514 @ =gCB2_AfterEvolution
 	ldr r0, _0804D518 @ =sub_804BBCC
 	str r0, [r1]
 	ldr r7, _0804D51C @ =gUnknown_020297D8
@@ -10541,7 +10541,7 @@ _0804D4CC:
 	b _0804D538
 	.align 2, 0
 _0804D510: .4byte gSpecialVar_0x8005
-_0804D514: .4byte gUnknown_03005E94
+_0804D514: .4byte gCB2_AfterEvolution
 _0804D518: .4byte sub_804BBCC
 _0804D51C: .4byte gUnknown_020297D8
 _0804D520: .4byte gPlayerParty
@@ -10623,7 +10623,7 @@ _0804D5A8:
 	.align 2, 0
 _0804D5B4: .4byte gSoftResetDisabled
 _0804D5B8:
-	ldr r0, _0804D5F4 @ =gUnknown_03005E94
+	ldr r0, _0804D5F4 @ =gCB2_AfterEvolution
 	ldr r1, _0804D5F8 @ =sub_804DC88
 	mov r8, r1
 	str r1, [r0]
@@ -10652,7 +10652,7 @@ _0804D5B8:
 	bl TradeEvolutionScene
 	b _0804D60E
 	.align 2, 0
-_0804D5F4: .4byte gUnknown_03005E94
+_0804D5F4: .4byte gCB2_AfterEvolution
 _0804D5F8: .4byte sub_804DC88
 _0804D5FC: .4byte gUnknown_020297D8
 _0804D600: .4byte gPlayerParty
diff --git a/common_syms/evolution_scene.txt b/common_syms/evolution_scene.txt
new file mode 100644
index 000000000..137cd3e05
--- /dev/null
+++ b/common_syms/evolution_scene.txt
@@ -0,0 +1 @@
+gCB2_AfterEvolution
diff --git a/common_syms/rom4.txt b/common_syms/overworld.txt
index ecdb190b2..ecdb190b2 100644
--- a/common_syms/rom4.txt
+++ b/common_syms/overworld.txt
diff --git a/common_syms/pokemon_menu.txt b/common_syms/pokemon_menu.txt
new file mode 100644
index 000000000..98a1bf53b
--- /dev/null
+++ b/common_syms/pokemon_menu.txt
@@ -0,0 +1,2 @@
+gLastFieldPokeMenuOpened
+gUnknown_03005CE4
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 4d809241c..114bc4d97 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -919,20 +919,20 @@ Std_5:
 @ 819F805
 	return
 
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
-	special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+S_DoSaveDialog:: @ 819F806
+	special ScrSpecial_DoSaveDialog
 	waitstate
 	return
 
 gUnknown_0819F80B:: @ 819F80B
 	lock
 	special PlayTrainerEncounterMusic
-	special sub_80847C8
+	special ScrSpecial_EndTrainerApproach
 	waitstate
 	jump EventScript_19F8F2
 
@@ -941,7 +941,7 @@ gUnknown_0819F818:: @ 819F818
 	faceplayer
 	move LAST_TALKED, Movement_19F8F0
 	waitmove 0
-	specialval RESULT, sub_8082564
+	specialval RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
 	jumpif 5, EventScript_19F83F
 	special PlayTrainerEncounterMusic
@@ -955,7 +955,7 @@ gUnknown_0819F840:: @ 819F840
 	lock
 	faceplayer
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082564
+	specialval RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
 	jumpif 5, EventScript_19F877
 	special CheckForAlivePartyMons
@@ -966,7 +966,7 @@ gUnknown_0819F840:: @ 819F840
 	jump EventScript_19F8F2
 
 EventScript_19F870:
-	special sub_8082718
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waittext
 	waitbutton
 	release
@@ -984,15 +984,15 @@ gUnknown_0819F878:: @ 819F878
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082C9C
+	specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
 	jumpeq EventScript_19F8AD
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	special sub_80826B0
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -1001,7 +1001,7 @@ EventScript_19F8AD:
 	endtrainerbattle
 
 gUnknown_0819F8AE:: @ 819F8AE
-	specialval RESULT, sub_8082C9C
+	specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
 	jumpeq EventScript_19F8DD
 	special CheckForAlivePartyMons
@@ -1009,10 +1009,10 @@ gUnknown_0819F8AE:: @ 819F8AE
 	jumpif 5, EventScript_19F8DE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	special sub_80826B0
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -1021,7 +1021,7 @@ EventScript_19F8DD:
 	endtrainerbattle
 
 EventScript_19F8DE:
-	special sub_8082718
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waittext
 	waitbutton
 	release
@@ -1037,11 +1037,11 @@ Movement_19F8F0::
 	step_end
 
 EventScript_19F8F2:
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
 	reptrainerbattle
-	specialval RESULT, sub_8082558
+	specialval RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	jumpeq EventScript_19F934
 	compare RESULT, 2
@@ -1325,7 +1325,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
 	setflag 2141
 	return
 
-EventScript_LeagueWhiteOut:: @ 819FC74
+S_WhiteOut:: @ 819FC74
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
 	call EventScript_19FC84
 	jump gUnknown_0819FC9F
@@ -1438,7 +1438,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 	lock
 	faceplayer
-	msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
+	msgbox gText_NurseJoy_Welcome, 5
 	compare RESULT, 1
 	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
 	compare RESULT, 0
@@ -1447,7 +1447,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 
 OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	inccounter GAME_STAT_USED_POKECENTER
-	message OldaleTown_PokemonCenter_1F_Text_1A1245
+	message gText_NurseJoy_OkayIllTakeYourPokemon
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmove 0
@@ -1455,23 +1455,23 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	checkanimation 25
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmove 0
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	checkflag 273
 	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
-	message OldaleTown_PokemonCenter_1F_Text_1A0B14
+	message gText_NurseJoy_ThankYouForWaiting
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
 	waitmove 0
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
@@ -1484,7 +1484,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
-	message OldaleTown_PokemonCenter_1F_Text_1A1275
+	message gText_NurseJoy_Pokerus
 	waittext
 	setflag 273
 	return
@@ -1689,7 +1689,7 @@ gUnknown_081A0009:: @ 81A0009
 EventScript_1A0023:
 	message gPCText_WhichPCShouldBeAccessed
 	waittext
-	special TryCreatePCMenu
+	special ScrSpecial_CreatePCMenu
 	waitstate
 	jump EventScript_1A0033
 	end
@@ -2112,7 +2112,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
 	fanfare 368
 	waitfanfare
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	fadescreen 0
 	return
 
@@ -2986,16 +2986,16 @@ UnknownString_81A0A54: @ 81A0A54
 UnknownString_81A0A66: @ 81A0A66
 	.string "Verbindung zu LANETTES PC hergestellt.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
 	.string "Willkommen im POKéMON-CENTER!\p"
 	.string "Wir heilen deine POKéMON und\n"
 	.string "machen sie wieder fit.\p"
 	.string "O.K. Wir benötigen deine POKéMON.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
 	.string "Komm jederzeit wieder vorbei!$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
 	.string "Danke!\p"
 	.string "Deine POKéMON sind wieder topfit!$"
 
@@ -3214,11 +3214,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
 	.string "nehmen und dir unter der Hand tolle\l"
 	.string "Sachen verkaufen.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
 	.string "Okay, ich nehme deine POKéMON für einen\n"
 	.string "Moment in meine Obhut.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
 	.string "Dein POKéMON scheint von dem\n"
 	.string "POKéRUS befallen zu sein.\p"
 	.string "Über den POKéRUS ist bisher wenig be-\n"
@@ -3965,7 +3965,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	hidebox 0, 0, 15, 10
@@ -4000,7 +4000,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	hidebox 0, 0, 15, 10
@@ -4035,7 +4035,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	hidebox 0, 0, 15, 10
@@ -4070,7 +4070,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	hidebox 0, 0, 15, 10
@@ -4105,7 +4105,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	hidebox 0, 0, 15, 10
@@ -4140,7 +4140,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	hidebox 0, 0, 15, 10
@@ -4175,7 +4175,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	hidebox 0, 0, 15, 10
@@ -4210,7 +4210,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	hidebox 0, 0, 15, 10
@@ -4245,7 +4245,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	hidebox 0, 0, 15, 10
@@ -4280,7 +4280,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	hidebox 0, 0, 15, 10
@@ -4309,7 +4309,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
 	setvar 0x8005, 0
 	special sub_813556C
 	waitstate
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	release
 	end
 
@@ -4771,16 +4771,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 
 	.include "data/scripts/gabby_and_ty.inc"
 
-	.include "data/scripts/bard.inc"
-	.include "data/scripts/hipster.inc"
-	.include "data/text/trader.inc"
-	.include "data/scripts/trader.inc"
-	.include "data/text/storyteller.inc"
-	.include "data/scripts/storyteller.inc"
-	.include "data/text/giddy.inc"
-	.include "data/scripts/giddy.inc"
-	.include "data/text/bard.inc"
-	.include "data/text/hipster.inc"
+	.include "data/scripts/mauville_man.inc"
 
 	.include "data/field_move_scripts.inc"
 	.include "data/item_ball_scripts.inc"
@@ -4810,7 +4801,7 @@ gUnknown_081B694A:: @ 81B694A
 
 	.include "data/scripts/players_house.inc"
 
-Event_RunningShoesManual:: @ 81B6E5A
+S_RunningShoesManual:: @ 81B6E5A
 	msgbox UnknownString_81728E3, 3
 	end
 
@@ -4819,7 +4810,7 @@ Event_RunningShoesManual:: @ 81B6E5A
 
 	.include "data/text/trainers.inc"
 
-Event_RepelWoreOff:: @ 81C33E6
+S_RepelWoreOff:: @ 81C33E6
 	msgbox Text_RepelWoreOff, 3
 	end
 
@@ -4899,7 +4890,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
-	map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
+	map_script_2 0x4022, 0, S_FallDownHole
 	.2byte 0
 
 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
@@ -4909,7 +4900,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
 	copyvar 0x4022, 0x1
 	end
 
-GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
+S_FallDownHole:: @ 81C6BC5
 	lockall
 	pause 20
 	move 255, GraniteCave_B1F_Movement_1C6BF7
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 91c3dcca8..017198c2d 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,4 +1,4 @@
-CuttableTreeScript:: @ 81B0DCC
+S_CuttableTree:: @ 81B0DCC
 	lockall
 	checkflag 2055
 	jumpif 0, CannotUseCut
@@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC
 	jump DoTreeCutMovement
 	end
 
-UseCutScript:: @ 81B0E16
+S_UseCut:: @ 81B0E16
 	lockall
 	doanimation 2
 	waitstate
@@ -59,7 +59,7 @@ CannotUseCutText: @ 81B0E8E
 	.string "Der ZERSCHNEIDER kann hier eingesetzt\n"
 	.string "werden.$"
 
-BreakableRockScript:: @ 81B0EB7
+S_BreakableRock:: @ 81B0EB7
 	lockall
 	checkflag 2057
 	jumpif 0, CannotUseRockSmash
@@ -79,7 +79,7 @@ BreakableRockScript:: @ 81B0EB7
 	jump DoRockSmashMovement
 	end
 
-UseRockSmashScript:: @ 81B0F01
+S_UseRockSmash:: @ 81B0F01
 	lockall
 	doanimation 37
 	waitstate
@@ -93,7 +93,7 @@ DoRockSmashMovement: @ 81B0F0C
 	specialval RESULT, sub_810F5BC
 	compare RESULT, 1
 	jumpeq DoRockSmashMovement_Done
-	special RockSmashWildEncounter
+	special ScrSpecial_RockSmashWildEncounter
 	compare RESULT, 0
 	jumpeq DoRockSmashMovement_Done
 	waitstate
@@ -126,7 +126,7 @@ CannotUseRockSmashText: @ 81B0F90
 	.string "Ein großer Felsen. Ein POKéMON könnte\n"
 	.string "ihn vielleicht zertrümmern.$"
 
-PushableBoulderScript:: @ 81B0FCB
+S_PushableBoulder:: @ 81B0FCB
 	lockall
 	checkflag 2058
 	jumpif 0, CannotUseStrength
@@ -145,7 +145,7 @@ PushableBoulderScript:: @ 81B0FCB
 	jump UsedStrength
 	end
 
-UseStrengthScript:: @ 81B100E
+S_UseStrength:: @ 81B100E
 	lockall
 	doanimation 40
 	waitstate
@@ -191,7 +191,7 @@ AlreadyUsedStrengthText: @ 81B1127
 	.string "STÄRKE ermöglicht es, Felsen zu\n"
 	.string "bewegen.$"
 
-UseWaterfallScript:: @ 81B115A
+S_UseWaterfall:: @ 81B115A
 	lockall
 	checkattack MOVE_WATERFALL
 	compare RESULT, 6
@@ -205,7 +205,7 @@ UseWaterfallScript:: @ 81B115A
 	doanimation 43
 	jump Waterfall_Done
 
-CannotUseWaterfallScript:: @ 81B1194
+S_CannotUseWaterfall:: @ 81B1194
 	lockall
 Waterfall_NoMonKnows: @ 81B1195
 	msgbox CannotUseWaterfallText, 4
@@ -247,7 +247,7 @@ Dive_Done: @ 81B1267
 	releaseall
 	end
 
-UnderwaterUseDiveScript:: @ 81B1269
+S_UseDiveUnderwater:: @ 81B1269
 	lockall
 	checkattack MOVE_DIVE
 	compare RESULT, 6
diff --git a/data-de/text/bard.inc b/data-de/text/bard.inc
index 089741d00..dbfb7d400 100644
--- a/data-de/text/bard.inc
+++ b/data-de/text/bard.inc
@@ -1,20 +1,20 @@
-UnknownString_81B0A83: @ 81B0A83
+gTextBard_BardTesting: @ 81B0A83
 	.string "BARDEN Test.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91
+gTextBard_HiImTheBard:: @ 81B0A91
 	.string "Hallo, ich bin der BARDE.\n"
 	.string "Möchtest du meinem Lied lauschen?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3
+gTextBard_OhYouveLeftMe:: @ 81B0AC3
 	.string "Oh...\n"
 	.string "Du überlässt mich meinem Blues?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED
+gTextBard_OhWhatAMovingSong:: @ 81B0AED
 	.string "Hach, was für ein bewegendes Lied...\n"
 	.string "Ich wünschte, ich könnte es für\l"
 	.string "andere spielen...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
+gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C
 	.string "So?\n"
 	.string "Wie fandest du mein Lied?\p"
 	.string "Ich bin noch nicht ganz zufrieden mit\n"
@@ -22,17 +22,17 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
 	.string "Hast du nicht Lust, den Text für mich\n"
 	.string "neu zu schreiben?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6
+gTextBard_OhYouveLeftMe2:: @ 81B0BA6
 	.string "Oh... Und wieder werde ich meinem\n"
 	.string "Blues überlassen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0
+gTextBard_ThankYouKindly:: @ 81B0BD0
 	.string "Vielen herzlichen Dank!\n"
 	.string "Ich möchte für dich singen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA
+gTextBard_WasThatHowYouWanted:: @ 81B0BFA
 	.string "Hast du dir dein Lied so vorgestellt?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23
+gTextBard_OkayThatsIt:: @ 81B0C23
 	.string "Okay! Das ist es! Dieses Lied werde\n"
 	.string "ich nun für eine Weile singen.$"
diff --git a/data-de/text/giddy.inc b/data-de/text/giddy.inc
index 6e1a46883..8bc5bebda 100644
--- a/data-de/text/giddy.inc
+++ b/data-de/text/giddy.inc
@@ -1,16 +1,16 @@
-MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A
+gTextGiddy_Introduction:: @ 81B092A
 	.string "Ich bin MÄRCHEN-MAN! Ich habe eine sehr\n"
 	.string "geistreiche Geschichte für dich!\p"
 	.string "Soll ich sie dir erzählen?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C
+gTextGiddy_YouveDeflatedMe:: @ 81B097C
 	.string "Oh...\n"
 	.string "Du hast mir die Luft rausgelassen...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998
+gTextGiddy_AlsoIWasThinking:: @ 81B0998
 	.string "Und ich war in Gedanken vertieft...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0
+gTextGiddy_ByeBye:: @ 81B09B0
 	.string "Das wäre alles, glaube ich...\p"
 	.string "Wir sollten bald wieder ein Schwätzchen\n"
 	.string "halten! Tschüss!$"
diff --git a/data-de/text/hipster.inc b/data-de/text/hipster.inc
index c315b523d..8801b05fd 100644
--- a/data-de/text/hipster.inc
+++ b/data-de/text/hipster.inc
@@ -1,18 +1,18 @@
-MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B
+gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B
 	.string "Hey, yo! Man nennt mich TRENDWIG. Ich\n"
 	.string "zeige dir, was hip ist und abgeht.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7
+gTextHipster_TaughtYouAlready:: @ 81B0CA7
 	.string "Aber, hey, ich habe dir doch schon ge-\n"
 	.string "zeigt, was hip ist und abgeht.\p"
 	.string "Ich will das auch anderen mitteilen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11
+gTextHipster_YouAlreadyKnowALot:: @ 81B0D11
 	.string "Aber, hey, ich habe dir doch schon ge-\n"
 	.string "zeigt, was hip ist und abgeht.\p"
 	.string "Ich habe nichts mehr in petto.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
+gTextHipster_HaveYouHeardAbout:: @ 81B0D75
 	.string "Hast du schon von\n"
 	.string "“{STR_VAR_1}” gehört?\p"
 	.string "Was das heißt? Ähäm...\n"
diff --git a/data-de/text/storyteller.inc b/data-de/text/storyteller.inc
index ee2068766..abcc8a4a8 100644
--- a/data-de/text/storyteller.inc
+++ b/data-de/text/storyteller.inc
@@ -1,25 +1,25 @@
-MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6
+gTextStoryteller_Introduction:: @ 81AECC6
 	.string "Ich bin der GESCHICHTENERZÄHLER.\n"
 	.string "Ich erzähle dir die Geschichten von\l"
 	.string "legendären TRAINERN.\p"
 	.string "Soll ich dir etwas erzählen?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
 	.string "Oh...\n"
 	.string "Keiner mag mich...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
 	.string "Ich kenne viele dieser Legenden.\n"
 	.string "Welche möchtest du hören?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
 	.string "Aber ich weiß nichts über legendäre\n"
 	.string "TRAINER. Also habe ich keine Ge-\l"
 	.string "schichte auf Lager.\p"
 	.string "Wo findet man wohl einen TRAINER, der\n"
 	.string "einer lebenden Legende gleicht?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
 	.string "Was ist?\n"
 	.string "Du... Du...\p"
 	.string "{STR_VAR_2}\n"
@@ -27,39 +27,39 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
 	.string "Das ist einfach großartig!\n"
 	.string "Die Geburt einer neuen Legende!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
 	.string "Ich überlege, ob es nicht noch andere\n"
 	.string "TRAINER gibt, die mir beeindruckende\l"
 	.string "Geschichten erzählen können.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
 	.string "Bist du ein TRAINER?\p"
 	.string "Dann sag mir, ob du Geschichten\n"
 	.string "für mich hast, die legendär sind?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
 	.string "Übrigens... Möchtest du eine weitere\n"
 	.string "legendäre Geschichte hören?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
 	.string "Hmm...\n"
 	.string "Ich bin nicht zufrieden...\p"
 	.string "Ich wünschte, du würdest mir Neuig-\n"
 	.string "keiten erzählen, die den Titel Legende\l"
 	.string "verdienen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
 	.string "Ich wollte, mehr Leute würden sich für\n"
 	.string "meine epischen Geschichten über\l"
 	.string "legendäre TRAINER interessieren.$"
 
-UnknownString_81AEFFC:: @ 81AEFFC
+gTextStoryteller_Story1Title:: @ 81AEFFC
 	.string "Der speicherfreudige TRAINER$"
 
-UnknownString_81AF013:: @ 81AF013
+gTextStoryteller_Story1Action:: @ 81AF013
 	.string "Hast das Spiel gespeichert?$"
 
-UnknownString_81AF022:: @ 81AF022
+gTextStoryteller_Story1Text:: @ 81AF022
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat das Spiel\n"
@@ -67,13 +67,13 @@ UnknownString_81AF022:: @ 81AF022
 	.string "Einen vorsichtigeren TRAINER als\n"
 	.string "{STR_VAR_3} wird man nicht finden!$"
 
-UnknownString_81AF0A3:: @ 81AF0A3
+gTextStoryteller_Story2Title:: @ 81AF0A3
 	.string "Der TRAINER als Trendsetter$"
 
-UnknownString_81AF0BB:: @ 81AF0BB
+gTextStoryteller_Story2Action:: @ 81AF0BB
 	.string "Hast Trends gesetzt?$"
 
-UnknownString_81AF0CA:: @ 81AF0CA
+gTextStoryteller_Story2Text:: @ 81AF0CA
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -81,13 +81,13 @@ UnknownString_81AF0CA:: @ 81AF0CA
 	.string "{STR_VAR_3} setzt den Trend für alle - in\n"
 	.string "der ganzen HOENN-Region!$"
 
-UnknownString_81AF149:: @ 81AF149
+gTextStoryteller_Story3Title:: @ 81AF149
 	.string "Der BEEREN pflanzende TRAINER$"
 
-UnknownString_81AF164:: @ 81AF164
+gTextStoryteller_Story3Action:: @ 81AF164
 	.string "Hast BEEREN gepflanzt?$"
 
-UnknownString_81AF174:: @ 81AF174
+gTextStoryteller_Story3Text:: @ 81AF174
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -95,13 +95,13 @@ UnknownString_81AF174:: @ 81AF174
 	.string "{STR_VAR_3} ist ein legendärer Lieb-\n"
 	.string "haber von BEEREN!$"
 
-UnknownString_81AF1E5:: @ 81AF1E5
+gTextStoryteller_Story4Title:: @ 81AF1E5
 	.string "Der RAD verrückte TRAINER$"
 
-UnknownString_81AF1FD:: @ 81AF1FD
+gTextStoryteller_Story4Action:: @ 81AF1FD
 	.string "Hast RÄDER getauscht?$"
 
-UnknownString_81AF20A:: @ 81AF20A
+gTextStoryteller_Story4Text:: @ 81AF20A
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -109,13 +109,13 @@ UnknownString_81AF20A:: @ 81AF20A
 	.string "{STR_VAR_3} ist ein TRAINER, dessen\n"
 	.string "Passion das RADfahren ist!$"
 
-UnknownString_81AF281:: @ 81AF281
+gTextStoryteller_Story5Title:: @ 81AF281
 	.string "Der Interviews gebende TRAINER$"
 
-UnknownString_81AF299:: @ 81AF299
+gTextStoryteller_Story5Action:: @ 81AF299
 	.string "Hast Interviews gegeben?$"
 
-UnknownString_81AF2A9:: @ 81AF2A9
+gTextStoryteller_Story5Text:: @ 81AF2A9
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -123,13 +123,13 @@ UnknownString_81AF2A9:: @ 81AF2A9
 	.string "{STR_VAR_3} ist ein TRAINER, der überall\n"
 	.string "Aufmerksamkeit erregt!$"
 
-UnknownString_81AF32C:: @ 81AF32C
+gTextStoryteller_Story6Title:: @ 81AF32C
 	.string "Der kampfliebende TRAINER$"
 
-UnknownString_81AF345:: @ 81AF345
+gTextStoryteller_Story6Action:: @ 81AF345
 	.string "Hast oft gekämpft?$"
 
-UnknownString_81AF34D:: @ 81AF34D
+gTextStoryteller_Story6Text:: @ 81AF34D
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -137,13 +137,13 @@ UnknownString_81AF34D:: @ 81AF34D
 	.string "{STR_VAR_3} ist ein TRAINER, der zu\n"
 	.string "einem Kampf nicht nein sagt!$"
 
-UnknownString_81AF3D0:: @ 81AF3D0
+gTextStoryteller_Story7Title:: @ 81AF3D0
 	.string "Der POKéMON fangende TRAINER$"
 
-UnknownString_81AF3ED:: @ 81AF3ED
+gTextStoryteller_Story7Action:: @ 81AF3ED
 	.string "Hast POKéMON gefangen?$"
 
-UnknownString_81AF3FC:: @ 81AF3FC
+gTextStoryteller_Story7Text:: @ 81AF3FC
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -151,13 +151,13 @@ UnknownString_81AF3FC:: @ 81AF3FC
 	.string "{STR_VAR_3} ist ein legendärer Fänger\n"
 	.string "von POKéMON!$"
 
-UnknownString_81AF46D:: @ 81AF46D
+gTextStoryteller_Story8Title:: @ 81AF46D
 	.string "Der angelnde TRAINER$"
 
-UnknownString_81AF481:: @ 81AF481
+gTextStoryteller_Story8Action:: @ 81AF481
 	.string "Hast POKéMON mit einer ANGEL gefangen?$"
 
-UnknownString_81AF49B:: @ 81AF49B
+gTextStoryteller_Story8Text:: @ 81AF49B
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -165,13 +165,13 @@ UnknownString_81AF49B:: @ 81AF49B
 	.string "{STR_VAR_3} ist ein legendärer Angel-\n"
 	.string "experte!$"
 
-UnknownString_81AF511:: @ 81AF511
+gTextStoryteller_Story9Title:: @ 81AF511
 	.string "Der EIER wärmende TRAINER$"
 
-UnknownString_81AF529:: @ 81AF529
+gTextStoryteller_Story9Action:: @ 81AF529
 	.string "Hast EIER ausgebrütet?$"
 
-UnknownString_81AF536:: @ 81AF536
+gTextStoryteller_Story9Text:: @ 81AF536
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Es passierte {STR_VAR_1}-mal, dass der TRAINER\n"
@@ -179,13 +179,13 @@ UnknownString_81AF536:: @ 81AF536
 	.string "{STR_VAR_3} ist ein legendärer Pfleger\n"
 	.string "von EIERN!$"
 
-UnknownString_81AF5A9:: @ 81AF5A9
+gTextStoryteller_Story10Title:: @ 81AF5A9
 	.string "Der TRAINER der Entwicklungen$"
 
-UnknownString_81AF5BD:: @ 81AF5BD
+gTextStoryteller_Story10Action:: @ 81AF5BD
 	.string "Hast POKéMON sich entwickeln lassen?$"
 
-UnknownString_81AF5CD:: @ 81AF5CD
+gTextStoryteller_Story10Text:: @ 81AF5CD
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -193,13 +193,13 @@ UnknownString_81AF5CD:: @ 81AF5CD
 	.string "{STR_VAR_3} ist der ultimative Ent-\n"
 	.string "wickler von POKéMON!$"
 
-UnknownString_81AF63F:: @ 81AF63F
+gTextStoryteller_Story11Title:: @ 81AF63F
 	.string "Der PKMN-CENTER liebende TRAINER$"
 
-UnknownString_81AF661:: @ 81AF661
+gTextStoryteller_Story11Action:: @ 81AF661
 	.string "Gingst in ein POKéMON-CENTER?$"
 
-UnknownString_81AF676:: @ 81AF676
+gTextStoryteller_Story11Text:: @ 81AF676
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat POKéMON\n"
@@ -208,13 +208,13 @@ UnknownString_81AF676:: @ 81AF676
 	.string "Es gibt keinen größeren Fan der\n"
 	.string "POKéMON-CENTER als {STR_VAR_3}!$"
 
-UnknownString_81AF711:: @ 81AF711
+gTextStoryteller_Story12Title:: @ 81AF711
 	.string "Der gastfreundliche TRAINER$"
 
-UnknownString_81AF726:: @ 81AF726
+gTextStoryteller_Story12Action:: @ 81AF726
 	.string "POKéMON haben sich bei dir erholt?$"
 
-UnknownString_81AF73D:: @ 81AF73D
+gTextStoryteller_Story12Text:: @ 81AF73D
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat POKéMON\n"
@@ -223,13 +223,13 @@ UnknownString_81AF73D:: @ 81AF73D
 	.string "Kein TRAINER ist so gastfreundlich\n"
 	.string "wie {STR_VAR_3}!$"
 
-UnknownString_81AF7BF:: @ 81AF7BF
+gTextStoryteller_Story13Title:: @ 81AF7BF
 	.string "Der SAFARI liebende TRAINER$"
 
-UnknownString_81AF7D9:: @ 81AF7D9
+gTextStoryteller_Story13Action:: @ 81AF7D9
 	.string "Bist in die SAFARI-ZONE gegangen?$"
 
-UnknownString_81AF7F1:: @ 81AF7F1
+gTextStoryteller_Story13Text:: @ 81AF7F1
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER ist {STR_VAR_1}-mal in die\n"
@@ -238,13 +238,13 @@ UnknownString_81AF7F1:: @ 81AF7F1
 	.string "wilde Seite in der SAFARI-ZONE zum\l"
 	.string "Vorschein kommt!$"
 
-UnknownString_81AF88A:: @ 81AF88A
+gTextStoryteller_Story14Title:: @ 81AF88A
 	.string "Der TRAINER als ZERSCHNEIDER$"
 
-UnknownString_81AF8A1:: @ 81AF8A1
+gTextStoryteller_Story14Action:: @ 81AF8A1
 	.string "Hast ZERSCHNEIDER eingesetzt?$"
 
-UnknownString_81AF8AA:: @ 81AF8AA
+gTextStoryteller_Story14Text:: @ 81AF8AA
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -252,13 +252,13 @@ UnknownString_81AF8AA:: @ 81AF8AA
 	.string "{STR_VAR_3} ist ein TRAINER, der es\n"
 	.string "liebt, etwas zu ZERSCHNEIDEN.$"
 
-UnknownString_81AF91B:: @ 81AF91B
+gTextStoryteller_Story15Title:: @ 81AF91B
 	.string "Der TRAINER als ZERTRÜMMERER$"
 
-UnknownString_81AF935:: @ 81AF935
+gTextStoryteller_Story15Action:: @ 81AF935
 	.string "Hast Felsen ZERTRÜMMERT?$"
 
-UnknownString_81AF943:: @ 81AF943
+gTextStoryteller_Story15Text:: @ 81AF943
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -266,13 +266,13 @@ UnknownString_81AF943:: @ 81AF943
 	.string "{STR_VAR_3} ist ein TRAINER, der keinen\n"
 	.string "Felsen unbeschädigt lassen kann.$"
 
-UnknownString_81AF9C8:: @ 81AF9C8
+gTextStoryteller_Story16Title:: @ 81AF9C8
 	.string "Der Umzüge liebende TRAINER$"
 
-UnknownString_81AF9E0:: @ 81AF9E0
+gTextStoryteller_Story16Action:: @ 81AF9E0
 	.string "Bist du mit der GEHEIMBASIS umgezogen?$"
 
-UnknownString_81AF9F6:: @ 81AF9F6
+gTextStoryteller_Story16Text:: @ 81AF9F6
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER ist {STR_VAR_1}-mal mit\n"
@@ -280,13 +280,13 @@ UnknownString_81AF9F6:: @ 81AF9F6
 	.string "{STR_VAR_3} ist ein TRAINER, der es\n"
 	.string "liebt, sich ein neues Haus einzurichten.$"
 
-UnknownString_81AFA79:: @ 81AFA79
+gTextStoryteller_Story17Title:: @ 81AFA79
 	.string "Der PLATSCHER des TRAINERS$"
 
-UnknownString_81AFA92:: @ 81AFA92
+gTextStoryteller_Story17Action:: @ 81AFA92
 	.string "Hast PLATSCHER eingesetzt?$"
 
-UnknownString_81AFA9E:: @ 81AFA9E
+gTextStoryteller_Story17Text:: @ 81AFA9E
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -294,13 +294,13 @@ UnknownString_81AFA9E:: @ 81AFA9E
 	.string "{STR_VAR_3} ist ein TRAINER, der es\n"
 	.string "liebt, zu PLATSCHEN.$"
 
-UnknownString_81AFB17:: @ 81AFB17
+gTextStoryteller_Story18Title:: @ 81AFB17
 	.string "Der verbissene TRAINER$"
 
-UnknownString_81AFB2D:: @ 81AFB2D
+gTextStoryteller_Story18Action:: @ 81AFB2D
 	.string "Hast VERZWEIFLER angewendet?$"
 
-UnknownString_81AFB48:: @ 81AFB48
+gTextStoryteller_Story18Text:: @ 81AFB48
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat sich {STR_VAR_1}-mal\n"
@@ -308,13 +308,13 @@ UnknownString_81AFB48:: @ 81AFB48
 	.string "{STR_VAR_3}... Ein verbissener TRAINER,\n"
 	.string "der auch in der Not nicht aufgibt.$"
 
-UnknownString_81AFBD8:: @ 81AFBD8
+gTextStoryteller_Story19Title:: @ 81AFBD8
 	.string "Der König der EINARMIGEN BANDITEN$"
 
-UnknownString_81AFBE7:: @ 81AFBE7
+gTextStoryteller_Story19Action:: @ 81AFBE7
 	.string "Hast den EINARMIGEN BANDITEN besiegt?$"
 
-UnknownString_81AFC04:: @ 81AFC04
+gTextStoryteller_Story19Text:: @ 81AFC04
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -322,13 +322,13 @@ UnknownString_81AFC04:: @ 81AFC04
 	.string "{STR_VAR_3}... Ein TRAINER, der am\n"
 	.string "EINARMIGEN BANDITEN Glück hat.$"
 
-UnknownString_81AFC8A:: @ 81AFC8A
+gTextStoryteller_Story20Title:: @ 81AFC8A
 	.string "Der König des ROULETTES$"
 
-UnknownString_81AFC9D:: @ 81AFC9D
+gTextStoryteller_Story20Action:: @ 81AFC9D
 	.string "Hast in Folge beim ROULETTE gewonnen,$"
 
-UnknownString_81AFCBE:: @ 81AFCBE
+gTextStoryteller_Story20Text:: @ 81AFCBE
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal in Folge\n"
@@ -336,13 +336,13 @@ UnknownString_81AFCBE:: @ 81AFCBE
 	.string "{STR_VAR_3}... Ein TRAINER, dem die Kugel\n"
 	.string "beim ROULETTE gehorcht.$"
 
-UnknownString_81AFD44:: @ 81AFD44
+gTextStoryteller_Story21Title:: @ 81AFD44
 	.string "Der Herausforderer im DUELLTURM$"
 
-UnknownString_81AFD60:: @ 81AFD60
+gTextStoryteller_Story21Action:: @ 81AFD60
 	.string "Hast Gegner im DUELLTURM gefordert?$"
 
-UnknownString_81AFD80:: @ 81AFD80
+gTextStoryteller_Story21Text:: @ 81AFD80
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal Gegner\n"
@@ -350,13 +350,13 @@ UnknownString_81AFD80:: @ 81AFD80
 	.string "{STR_VAR_3}... Ein TRAINER, der im DUELL-\n"
 	.string "TURM nach Perfektion strebt.$"
 
-UnknownString_81AFE1D:: @ 81AFE1D
+gTextStoryteller_Story22Title:: @ 81AFE1D
 	.string "Der mixende TRAINER$"
 
-UnknownString_81AFE36:: @ 81AFE36
+gTextStoryteller_Story22Action:: @ 81AFE36
 	.string "Hast {POKEBLOCK} hergestellt?$"
 
-UnknownString_81AFE42:: @ 81AFE42
+gTextStoryteller_Story22Text:: @ 81AFE42
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -364,13 +364,13 @@ UnknownString_81AFE42:: @ 81AFE42
 	.string "Niemand bedient den BEERENMIXER\n"
 	.string "besser als {STR_VAR_3}.$"
 
-UnknownString_81AFEC2:: @ 81AFEC2
+gTextStoryteller_Story23Title:: @ 81AFEC2
 	.string "Der Fan der WETTBEWERBE$"
 
-UnknownString_81AFEDD:: @ 81AFEDD
+gTextStoryteller_Story23Action:: @ 81AFEDD
 	.string "Hast an WETTBEWERBEN teilgenommen?$"
 
-UnknownString_81AFEEE:: @ 81AFEEE
+gTextStoryteller_Story23Text:: @ 81AFEEE
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -378,13 +378,13 @@ UnknownString_81AFEEE:: @ 81AFEEE
 	.string "{STR_VAR_3} liebt es, anderen seine\n"
 	.string "POKéMON zu zeigen.$"
 
-UnknownString_81AFF68:: @ 81AFF68
+gTextStoryteller_Story24Title:: @ 81AFF68
 	.string "Der Meister der WETTBEWERBE$"
 
-UnknownString_81AFF7B:: @ 81AFF7B
+gTextStoryteller_Story24Action:: @ 81AFF7B
 	.string "Hast WETTBEWERBE gewonnen?$"
 
-UnknownString_81AFF88:: @ 81AFF88
+gTextStoryteller_Story24Text:: @ 81AFF88
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -392,26 +392,26 @@ UnknownString_81AFF88:: @ 81AFF88
 	.string "{STR_VAR_3} ist ein unvergleichlicher\n"
 	.string "Meister der WETTBEWERBE.$"
 
-UnknownString_81AFFFB:: @ 81AFFFB
+gTextStoryteller_Story25Title:: @ 81AFFFB
 	.string "Der glückliche Einkäufer$"
 
-UnknownString_81B000D:: @ 81B000D
+gTextStoryteller_Story25Action:: @ 81B000D
 	.string "Bist einkaufen gegangen?$"
 
-UnknownString_81B0015:: @ 81B0015
+gTextStoryteller_Story25Text:: @ 81B0015
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
 	.string "in einem Geschäft Items gekauft!\p"
 	.string "{STR_VAR_3} ein geborener Einkäufer.$"
 
-UnknownString_81B009D:: @ 81B009D
+gTextStoryteller_Story26Title:: @ 81B009D
 	.string "Der TRAINER, der Items findet$"
 
-UnknownString_81B00B6:: @ 81B00B6
+gTextStoryteller_Story26Action:: @ 81B00B6
 	.string "Hast den DETEKTOR eingesetzt?$"
 
-UnknownString_81B00C9:: @ 81B00C9
+gTextStoryteller_Story26Text:: @ 81B00C9
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -419,13 +419,13 @@ UnknownString_81B00C9:: @ 81B00C9
 	.string "{STR_VAR_3} liebt es, den Boden nach\n"
 	.string "verborgenen Items abzusuchen.$"
 
-UnknownString_81B014D:: @ 81B014D
+gTextStoryteller_Story27Title:: @ 81B014D
 	.string "Der regennasse TRAINER$"
 
-UnknownString_81B0165:: @ 81B0165
+gTextStoryteller_Story27Action:: @ 81B0165
 	.string "Wurdest nass geregnet?$"
 
-UnknownString_81B0173:: @ 81B0173
+gTextStoryteller_Story27Text:: @ 81B0173
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER wurde {STR_VAR_1}-mal\n"
@@ -433,13 +433,13 @@ UnknownString_81B0173:: @ 81B0173
 	.string "Das Charisma von {STR_VAR_3} zieht\n"
 	.string "sogar den Regen an.$"
 
-UnknownString_81B01E9:: @ 81B01E9
+gTextStoryteller_Story28Title:: @ 81B01E9
 	.string "Der passionierte POKéDEX-Leser$"
 
-UnknownString_81B0201:: @ 81B0201
+gTextStoryteller_Story28Action:: @ 81B0201
 	.string "Hast im POKéDEX nachgeschlagen?$"
 
-UnknownString_81B0213:: @ 81B0213
+gTextStoryteller_Story28Text:: @ 81B0213
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -447,13 +447,13 @@ UnknownString_81B0213:: @ 81B0213
 	.string "{STR_VAR_3} liebt es, alles über\n"
 	.string "POKéMON im POKéDEX nachzulesen.$"
 
-UnknownString_81B0290:: @ 81B0290
+gTextStoryteller_Story29Title:: @ 81B0290
 	.string "Der Sammler der BÄNDER$"
 
-UnknownString_81B02A5:: @ 81B02A5
+gTextStoryteller_Story29Action:: @ 81B02A5
 	.string "Hast BÄNDER erhalten?$"
 
-UnknownString_81B02B6:: @ 81B02B6
+gTextStoryteller_Story29Text:: @ 81B02B6
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}\n"
@@ -461,13 +461,13 @@ UnknownString_81B02B6:: @ 81B02B6
 	.string "{STR_VAR_3} ist ein TRAINER, der es\n"
 	.string "liebt, BÄNDER zu sammeln.$"
 
-UnknownString_81B0337:: @ 81B0337
+gTextStoryteller_Story30Title:: @ 81B0337
 	.string "Der springende TRAINER$"
 
-UnknownString_81B0351:: @ 81B0351
+gTextStoryteller_Story30Action:: @ 81B0351
 	.string "Bist Absätze heruntergesprungen?$"
 
-UnknownString_81B0364:: @ 81B0364
+gTextStoryteller_Story30Text:: @ 81B0364
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -476,26 +476,26 @@ UnknownString_81B0364:: @ 81B0364
 	.string "TRAINER {STR_VAR_3} einfach hinab-\l"
 	.string "springen.$"
 
-UnknownString_81B03E9:: @ 81B03E9
+gTextStoryteller_Story31Title:: @ 81B03E9
 	.string "Der legendäre Fernsehzuschauer$"
 
-UnknownString_81B0401:: @ 81B0401
+gTextStoryteller_Story31Action:: @ 81B0401
 	.string "Hast ferngeschaut?$"
 
-UnknownString_81B040C:: @ 81B040C
+gTextStoryteller_Story31Text:: @ 81B040C
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
 	.string "Fernsehen geschaut!\p"
 	.string "{STR_VAR_3} liebt es, fernzusehen.$"
 
-UnknownString_81B046E:: @ 81B046E
+gTextStoryteller_Story32Title:: @ 81B046E
 	.string "Der zeitbewusste TRAINER$"
 
-UnknownString_81B0489:: @ 81B0489
+gTextStoryteller_Story32Action:: @ 81B0489
 	.string "Hast nach der Uhrzeit gesehen?$"
 
-UnknownString_81B049A:: @ 81B049A
+gTextStoryteller_Story32Text:: @ 81B049A
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -503,13 +503,13 @@ UnknownString_81B049A:: @ 81B049A
 	.string "{STR_VAR_3} ist ein pünktlicher\n"
 	.string "TRAINER, der sich der Zeit bewusst ist.$"
 
-UnknownString_81B0523:: @ 81B0523
+gTextStoryteller_Story33Title:: @ 81B0523
 	.string "Der Zauberer der POKéMON-LOTTERIE$"
 
-UnknownString_81B053E:: @ 81B053E
+gTextStoryteller_Story33Action:: @ 81B053E
 	.string "Hast in der LOTTERIE gewonnen?$"
 
-UnknownString_81B0554:: @ 81B0554
+gTextStoryteller_Story33Text:: @ 81B0554
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -517,13 +517,13 @@ UnknownString_81B0554:: @ 81B0554
 	.string "TRAINER {STR_VAR_3} hat viele Freunde,\n"
 	.string "die mit ihm POKéMON tauschen.$"
 
-UnknownString_81B05D8:: @ 81B05D8
+gTextStoryteller_Story34Title:: @ 81B05D8
 	.string "Der TRAINER und die PENSION$"
 
-UnknownString_81B05F3:: @ 81B05F3
+gTextStoryteller_Story34Action:: @ 81B05F3
 	.string "Hast POKéMON in die PENSION gebracht?$"
 
-UnknownString_81B0610:: @ 81B0610
+gTextStoryteller_Story34Text:: @ 81B0610
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
@@ -532,13 +532,13 @@ UnknownString_81B0610:: @ 81B0610
 	.string "alles für die Entwicklung seiner\l"
 	.string "POKéMON tut.$"
 
-UnknownString_81B06A9:: @ 81B06A9
+gTextStoryteller_Story35Title:: @ 81B06A9
 	.string "Der SEILBAHN verrückte TRAINER$"
 
-UnknownString_81B06C6:: @ 81B06C6
+gTextStoryteller_Story35Action:: @ 81B06C6
 	.string "Bist mit der SEILBAHN gefahren?$"
 
-UnknownString_81B06D9:: @ 81B06D9
+gTextStoryteller_Story35Text:: @ 81B06D9
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER ist {STR_VAR_1}-mal\n"
@@ -547,13 +547,13 @@ UnknownString_81B06D9:: @ 81B06D9
 	.string "TRAINER, der ständig rauf und runter\l"
 	.string "fährt.$"
 
-UnknownString_81B0763:: @ 81B0763
+gTextStoryteller_Story36Title:: @ 81B0763
 	.string "Der Liebhaber der Heißen Quellen$"
 
-UnknownString_81B0781:: @ 81B0781
+gTextStoryteller_Story36Action:: @ 81B0781
 	.string "Hast in den Heißen Quellen gebadet?$"
 
-UnknownString_81B0797:: @ 81B0797
+gTextStoryteller_Story36Text:: @ 81B0797
 	.string "Dies ist die Geschichte eines TRAINERS\n"
 	.string "namens {STR_VAR_3}.\p"
 	.string "Dieser TRAINER hat {STR_VAR_1}-mal\n"
diff --git a/data-de/text/trader.inc b/data-de/text/trader.inc
index adf5d3aeb..dae453e8b 100644
--- a/data-de/text/trader.inc
+++ b/data-de/text/trader.inc
@@ -1,58 +1,58 @@
-MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F
+gTextTrader_Introduction:: @ 81AE88F
 	.string "Hallo! Ich bin der HÄNDLER. Möchtest\n"
 	.string "du Dekorationen mit mir tauschen?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6
+gTextTrader_FeelUnwanted1:: @ 81AE8C6
 	.string "Oh...\n"
 	.string "Ich fühle mich überflüssig...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF
+gTextTrader_TradedAlready:: @ 81AE8DF
 	.string "Aber wir beide haben doch bereits\n"
 	.string "Dekorationen ausgetauscht.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910
+gTextTrader_MenuPrompt:: @ 81AE910
 	.string "Wenn du etwas Dekoratives siehst, das\n"
 	.string "du haben möchtest, lass es mich wissen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950
+gTextTrader_DontWantAnything:: @ 81AE950
 	.string "Du möchtest nichts haben?\n"
 	.string "Ich fühle mich so überflüssig...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C
+gTextTrader_ItemOnceBelongedTo:: @ 81AE97C
 	.string "Das dekorative Item gehörte einst\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Möchtest du es haben?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6
+gTextTrader_YouDontHaveDecorations:: @ 81AE9B6
 	.string "Äh... Warte eine Sekunde. Du hast über-\n"
 	.string "haupt kein dekoratives Item!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8
+gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8
 	.string "Okay, wähle die Dekoration aus, die du\n"
 	.string "mit mir tauschen willst.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B
+gTextTrader_FeelUnwanted2:: @ 81AEA2B
 	.string "Du willst nicht mit mir tauschen?\n"
 	.string "Ich fühle mich überflüssig...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57
+gTextTrader_NoRoomForThis:: @ 81AEA57
 	.string "Du hast keinen Platz mehr für eine/n\n"
 	.string "{STR_VAR_2}.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B
+gTextTrader_SoWellTrade:: @ 81AEA9B
 	.string "Okay, dann lass uns tauschen:\n"
 	.string "{STR_VAR_3} gegen\l"
 	.string "{STR_VAR_2}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3
+gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3
 	.string "Dieses Dekorationsstück ist im Ge-\n"
 	.string "brauch. Das kannst du nicht tauschen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB
+gTextTrader_ThenWellTrade:: @ 81AEAFB
 	.string "Dann lass uns tauschen! Ich werde meine\n"
 	.string "Dekorationen auf deinen PC senden.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31
+gTextTrader_ICantTradeThatOneAway:: @ 81AEB31
 	.string "Huups! Tut mir Leid!\n"
 	.string "Das ist ein ganz seltenes Stück!\l"
 	.string "Das kann ich nicht tauschen!\p"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d6702745a..0a8390a8f 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -918,20 +918,15 @@ Std_5:
 @ 819F805
 	return
 
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
-	special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+	special ScrSpecial_DoSaveDialog
 	waitstate
 	return
 
 gUnknown_0819F80B:: @ 819F80B
 	lock
 	special PlayTrainerEncounterMusic
-	special sub_80847C8
+	special ScrSpecial_EndTrainerApproach
 	waitstate
 	jump EventScript_19F8F2
 
@@ -940,7 +935,7 @@ gUnknown_0819F818:: @ 819F818
 	faceplayer
 	move LAST_TALKED, Movement_19F8F0
 	waitmove 0
-	specialval RESULT, sub_8082564
+	specialval RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
 	jumpif 5, EventScript_19F83F
 	special PlayTrainerEncounterMusic
@@ -954,7 +949,7 @@ gUnknown_0819F840:: @ 819F840
 	lock
 	faceplayer
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082564
+	specialval RESULT, ScrSpecial_HasTrainerBeenFought
 	compare RESULT, 0
 	jumpif 5, EventScript_19F877
 	special CheckForAlivePartyMons
@@ -965,7 +960,7 @@ gUnknown_0819F840:: @ 819F840
 	jump EventScript_19F8F2
 
 EventScript_19F870:
-	special sub_8082718
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waittext
 	waitbutton
 	release
@@ -983,15 +978,15 @@ gUnknown_0819F878:: @ 819F878
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
-	specialval RESULT, sub_8082C9C
+	specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
 	jumpeq EventScript_19F8AD
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	special sub_80826B0
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -1000,7 +995,7 @@ EventScript_19F8AD:
 	endtrainerbattle
 
 gUnknown_0819F8AE:: @ 819F8AE
-	specialval RESULT, sub_8082C9C
+	specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare RESULT, 0
 	jumpeq EventScript_19F8DD
 	special CheckForAlivePartyMons
@@ -1008,10 +1003,10 @@ gUnknown_0819F8AE:: @ 819F8AE
 	jumpif 5, EventScript_19F8DE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	special sub_80826B0
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -1020,7 +1015,7 @@ EventScript_19F8DD:
 	endtrainerbattle
 
 EventScript_19F8DE:
-	special sub_8082718
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waittext
 	waitbutton
 	release
@@ -1036,11 +1031,11 @@ Movement_19F8F0::
 	step_end
 
 EventScript_19F8F2:
-	special sub_80826D8
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
 	reptrainerbattle
-	specialval RESULT, sub_8082558
+	specialval RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	jumpeq EventScript_19F934
 	compare RESULT, 2
@@ -1324,7 +1319,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
 	setflag 2141
 	return
 
-EventScript_LeagueWhiteOut:: @ 819FC74
+S_WhiteOut:: @ 819FC74
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
 	call EventScript_19FC84
 	jump gUnknown_0819FC9F
@@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 	lock
 	faceplayer
-	msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
+	msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
 	compare RESULT, 1
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
+	jumpeq do_heal_party
 	compare RESULT, 0
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
+	jumpeq dont_heal_party
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
+do_heal_party:: @ 819FD7C
 	inccounter GAME_STAT_USED_POKECENTER
-	message OldaleTown_PokemonCenter_1F_Text_1A1245
+	message gText_NurseJoy_OkayIllTakeYourPokemon
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmove 0
@@ -1454,23 +1449,23 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	checkanimation 25
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmove 0
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	checkflag 273
 	jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
 	jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
-	message OldaleTown_PokemonCenter_1F_Text_1A0B14
+	message gText_NurseJoy_ThankYouForWaiting
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
 	waitmove 0
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+dont_heal_party:: @ 819FDC7
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
@@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
-	message OldaleTown_PokemonCenter_1F_Text_1A1275
+	message gText_NurseJoy_Pokerus
 	waittext
 	setflag 273
 	return
@@ -1688,7 +1683,7 @@ gUnknown_081A0009:: @ 81A0009
 EventScript_1A0023:
 	message gPCText_WhichPCShouldBeAccessed
 	waittext
-	special TryCreatePCMenu
+	special ScrSpecial_CreatePCMenu
 	waitstate
 	jump EventScript_1A0033
 	end
@@ -2111,7 +2106,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
 	fanfare 368
 	waitfanfare
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	fadescreen 0
 	return
 
@@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54
 UnknownString_81A0A66: @ 81A0A66
 	.string "Accessed LANETTE’s PC.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
 	.string "Hello, and welcome to the POKéMON\n"
 	.string "CENTER.\p"
 	.string "We restore your tired POKéMON to\n"
 	.string "full health.\p"
 	.string "Would you like to rest your POKéMON?$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
 	.string "We hope to see you again!$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
 	.string "Thank you for waiting.\p"
 	.string "We’ve restored your POKéMON to\n"
 	.string "full health.$"
@@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
 	.string "We’ll accept you as a member and sell\n"
 	.string "you good stuff in secrecy.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
 	.string "Okay, I’ll take your POKéMON for a\n"
 	.string "few seconds.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
 	.string "Your POKéMON may be infected with\n"
 	.string "POKéRUS.\p"
 	.string "Little is known about the POKéRUS\n"
@@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	hidebox 0, 0, 15, 10
@@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	hidebox 0, 0, 15, 10
@@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	hidebox 0, 0, 15, 10
@@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	hidebox 0, 0, 15, 10
@@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	hidebox 0, 0, 15, 10
@@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	hidebox 0, 0, 15, 10
@@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	hidebox 0, 0, 15, 10
@@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	hidebox 0, 0, 15, 10
@@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	hidebox 0, 0, 15, 10
@@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	hidebox 0, 0, 15, 10
@@ -4293,7 +4288,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
 	setvar 0x8005, 0
 	special sub_813556C
 	waitstate
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	release
 	end
 
@@ -4744,16 +4739,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 
 	.include "data/scripts/gabby_and_ty.inc"
 
-	.include "data/scripts/bard.inc"
-	.include "data/scripts/hipster.inc"
-	.include "data/text/trader.inc"
-	.include "data/scripts/trader.inc"
-	.include "data/text/storyteller.inc"
-	.include "data/scripts/storyteller.inc"
-	.include "data/text/giddy.inc"
-	.include "data/scripts/giddy.inc"
-	.include "data/text/bard.inc"
-	.include "data/text/hipster.inc"
+	.include "data/scripts/mauville_man.inc"
 
 	.include "data/field_move_scripts.inc"
 	.include "data/item_ball_scripts.inc"
@@ -4783,7 +4769,7 @@ gUnknown_081B694A:: @ 81B694A
 
 	.include "data/scripts/players_house.inc"
 
-Event_RunningShoesManual:: @ 81B6E5A
+S_RunningShoesManual:: @ 81B6E5A
 	msgbox UnknownString_81728E3, 3
 	end
 
@@ -4792,7 +4778,7 @@ Event_RunningShoesManual:: @ 81B6E5A
 
 	.include "data/text/trainers.inc"
 
-Event_RepelWoreOff:: @ 81C33E6
+S_RepelWoreOff:: @ 81C33E6
 	msgbox Text_RepelWoreOff, 3
 	end
 
@@ -4872,7 +4858,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
-	map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5
+	map_script_2 0x4022, 0, S_FallDownHole
 	.2byte 0
 
 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
@@ -4882,7 +4868,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
 	copyvar 0x4022, 0x1
 	end
 
-GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
+S_FallDownHole:: @ 81C6BC5
 	lockall
 	pause 20
 	move 255, GraniteCave_B1F_Movement_1C6BF7
diff --git a/data/evolution_scene.s b/data/evolution_scene.s
deleted file mode 100644
index 24744a196..000000000
--- a/data/evolution_scene.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_083F868C:: @ 83F868C
-	.string "ヌケニン$"
-
-	.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}$"
-	.string "▶\n $"
-	.string "       \n▶$"
-	.string "       \n $"
-
-	.space 9
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
deleted file mode 100644
index d3dbceedb..000000000
--- a/data/field_ground_effect.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_08376040:: @ 8376040
-	.4byte MetatileBehavior_IsJumpSouth
-	.4byte MetatileBehavior_IsJumpNorth
-	.4byte MetatileBehavior_IsJumpWest
-	.4byte MetatileBehavior_IsJumpEast
-
-gUnknown_08376050:: @ 8376050
-	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
-
-@ Each byte corresponds to a sprite priority for a field object.
-@ This is directly the inverse of gFieldObjectPriorities_08376070.
-gFieldObjectPriorities_08376060:: @ 8376060
-	.byte 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
-
-@ Each byte corresponds to a sprite priority for a field object.
-@ This is the inverse of gFieldObjectPriorities_08376060.
-@ 1 = Above player sprite
-@ 2 = Below player sprite
-gFieldObjectPriorities_08376070:: @ 8376070
-	.byte 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1
-
-	.align 2
-gUnknown_08376080:: @ 8376080
-	.4byte nullsub_50
-	.4byte DoTracksGroundEffect_Footprints
-	.4byte DoTracksGroundEffect_BikeTireTracks
-
-@ First byte is a Field Effect script id. (gFieldEffectScriptPointers)
-@ Last three bytes are unknown.
-gSandFootprints_FieldEffectData:: @ 837608C
-	.byte 0xD, 0x0, 0x18, 0x0
-
-@ Specifies which bike track shape to show next.
-@ For example, when the bike turns from up to right, it will show
-@ a track that curves to the right.
-@ Each 4-byte row corresponds to the initial direction of the bike, and
-@ each byte in that row is for the next direction of the bike in the order
-@ of down, up, left, right.
-gBikeTireTracks_Transitions:: @ 8376090
-	.byte 1, 2, 7, 8
-	.byte 1, 2, 6, 5
-	.byte 5, 8, 3, 4
-	.byte 6, 7, 3, 4
-
-	.align 2
-gUnknown_083760A0:: @ 83760A0
-	.4byte GroundEffect_SpawnOnTallGrass
-	.4byte sub_8063E94
-	.4byte sub_8063EE0
-	.4byte sub_8063F2C
-	.4byte GroundEffect_WaterReflection
-	.4byte GroundEffect_IceReflection
-	.4byte GroundEffect_FlowingWater
-	.4byte sub_8063FA0
-	.4byte sub_8063FCC
-	.4byte GroundEffect_Ripple
-	.4byte GroundEffect_StepOnPuddle
-	.4byte GroundEffect_SandPile
-	.4byte GroundEffect_JumpOnTallGrass
-	.4byte GroundEffect_JumpOnLongGrass
-	.4byte GroundEffect_JumpOnShallowWater
-	.4byte GroundEffect_JumpOnWater
-	.4byte GroundEffect_JumpLandingDust
-	.4byte GroundEffect_ShortGrass
-	.4byte GroundEffect_HotSprings
-	.4byte GroundEffect_Seaweed
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index 315217055..9911dca3a 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -1,4 +1,4 @@
-CuttableTreeScript:: @ 81B0DCC
+S_CuttableTree:: @ 81B0DCC
 	lockall
 	checkflag 2055
 	jumpif 0, CannotUseCut
@@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC
 	jump DoTreeCutMovement
 	end
 
-UseCutScript:: @ 81B0E16
+S_UseCut:: @ 81B0E16
 	lockall
 	doanimation 2
 	waitstate
@@ -56,7 +56,7 @@ UsedCutRockSmashText: @ 81B0E82
 CannotUseCutText: @ 81B0E8E
 	.string "This tree looks like it can be CUT down.$"
 
-BreakableRockScript:: @ 81B0EB7
+S_BreakableRock:: @ 81B0EB7
 	lockall
 	checkflag 2057
 	jumpif 0, CannotUseRockSmash
@@ -76,7 +76,7 @@ BreakableRockScript:: @ 81B0EB7
 	jump DoRockSmashMovement
 	end
 
-UseRockSmashScript:: @ 81B0F01
+S_UseRockSmash:: @ 81B0F01
 	lockall
 	doanimation 37
 	waitstate
@@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C
 	specialval RESULT, sub_810F5BC
 	compare RESULT, 1
 	jumpeq DoRockSmashMovement_Done
-	special RockSmashWildEncounter
+	special ScrSpecial_RockSmashWildEncounter
 	compare RESULT, 0
 	jumpeq DoRockSmashMovement_Done
 	waitstate
@@ -123,7 +123,7 @@ CannotUseRockSmashText: @ 81B0F90
 	.string "It’s a rugged rock, but a POKéMON\n"
 	.string "may be able to smash it.$"
 
-PushableBoulderScript:: @ 81B0FCB
+S_PushableBoulder:: @ 81B0FCB
 	lockall
 	checkflag 2058
 	jumpif 0, CannotUseStrength
@@ -142,7 +142,7 @@ PushableBoulderScript:: @ 81B0FCB
 	jump UsedStrength
 	end
 
-UseStrengthScript:: @ 81B100E
+S_UseStrength:: @ 81B100E
 	lockall
 	doanimation 40
 	waitstate
@@ -188,7 +188,7 @@ AlreadyUsedStrengthText: @ 81B1127
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
-UseWaterfallScript:: @ 81B115A
+S_UseWaterfall:: @ 81B115A
 	lockall
 	checkattack MOVE_WATERFALL
 	compare RESULT, 6
@@ -202,7 +202,7 @@ UseWaterfallScript:: @ 81B115A
 	doanimation 43
 	jump Waterfall_Done
 
-CannotUseWaterfallScript:: @ 81B1194
+S_CannotUseWaterfall:: @ 81B1194
 	lockall
 Waterfall_NoMonKnows: @ 81B1195
 	msgbox CannotUseWaterfallText, 4
@@ -244,7 +244,7 @@ Dive_Done: @ 81B1267
 	releaseall
 	end
 
-UnderwaterUseDiveScript:: @ 81B1269
+S_UseDiveUnderwater:: @ 81B1269
 	lockall
 	checkattack MOVE_DIVE
 	compare RESULT, 6
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
index 01b7b3efe..a4ac688d8 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/events/FieryPath.inc
@@ -1,11 +1,11 @@
 FieryPath_MapObjects:: @ 838C718
 	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
 	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0
 
 FieryPath_MapWarps:: @ 838C7D8
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
index 49c0bace0..158577482 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/events/GraniteCave_B2F.inc
@@ -1,13 +1,13 @@
 GraniteCave_B2F_MapObjects:: @ 838BFEC
 	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0
 	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 23, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
+	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0
 
 GraniteCave_B2F_MapWarps:: @ 838C0C4
 	warp_def 29, 13, 3, 2, GraniteCave_B1F
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index 0ec69c1a2..cb0ff7ca1 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -1,6 +1,6 @@
 PetalburgWoods_MapObjects:: @ 838C14C
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
+	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
 	object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0
 	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0
 	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
index 9cf97de4b..7ffa0e191 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/events/Route102.inc
@@ -5,8 +5,8 @@ Route102_MapObjects:: @ 83811FC
 	object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, BerryTreeScript, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
 
 Route102_MapBGEvents:: @ 83812D4
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
index 01640eb65..462fe1a3b 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/events/Route103.inc
@@ -5,15 +5,15 @@ Route103_MapObjects:: @ 8381300
 	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, BerryTreeScript, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
+	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0
 	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
 
 Route103_MapBGEvents:: @ 8381468
 	bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
index da4b5ffc1..b4c8a2834 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/events/Route104.inc
@@ -8,17 +8,17 @@ Route104_MapObjects:: @ 8381488
 	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0
 	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0
 	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, BerryTreeScript, 0, 0, 0
+	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
+	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
+	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0
+	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0
+	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0
+	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, BerryTreeScript, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, BerryTreeScript, 0, 0, 0
+	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0
+	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
+	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
+	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
 	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0
 	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0
 	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
@@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488
 	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0
 	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
 	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
+	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
 	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0
 	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
 
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 4ece25549..3db4ce8e8 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -14,9 +14,9 @@ Route110_MapObjects:: @ 8381D58
 	object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, BerryTreeScript, 0, 0, 0
+	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
+	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
+	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
 	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0
 	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0
 	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 7e282f0e8..3660e3c3f 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
@@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C
 	object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 23, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 22, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 21, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 25, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 26, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 28, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 27, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 29, 0, 0
-	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 30, 0, 0
+	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
+	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
+	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0
+	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0
+	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0
+	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0
+	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0
+	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0
+	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0
 	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 31, 0, 0
+	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0
 
 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
 	warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
index b7a902a54..abccae1d4 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
@@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C
 	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
 	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0
 	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
+	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
 
 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
 	warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
index ac3e152a2..ef450800d 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
@@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC
 	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
-	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0
-	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
+	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
+	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
+	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
+	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
+	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
+	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
 
 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
 	warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
index 9eeed5ede..e36cd7e74 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/events/Route111.inc
@@ -4,8 +4,8 @@ Route111_MapObjects:: @ 83821A0
 	object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0
 	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0
 	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, BerryTreeScript, 0, 0, 0
+	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
@@ -13,19 +13,19 @@ Route111_MapObjects:: @ 83821A0
 	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0
 	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
+	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
+	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
 	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, BerryTreeScript, 0, 0, 0
+	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
+	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
 	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0
 	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0
 	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0
 	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0
 	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0
 	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
+	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
 	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
 	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
 	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
index f6dfcfbe5..a4991a907 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/events/Route112.inc
@@ -5,10 +5,10 @@ Route112_MapObjects:: @ 8382818
 	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
 	object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, BerryTreeScript, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
+	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
+	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0
 
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
index a2d948d33..1f4d761e3 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/events/Route114.inc
@@ -1,25 +1,25 @@
 Route114_MapObjects:: @ 8382C48
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, BerryTreeScript, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0
 	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
 	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
+	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
+	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
+	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
+	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
 	object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
 	object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
 
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
index cba3c3e7d..ddca08fad 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/events/Route115.inc
@@ -2,18 +2,18 @@ Route115_MapObjects:: @ 8382F2C
 	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, BerryTreeScript, 0, 0, 0
+	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0
+	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0
+	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0
 	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0
 	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
+	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
+	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
+	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
 	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0
 
 Route115_MapWarps:: @ 83830AC
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index 18717be4e..b5f922524 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -1,18 +1,18 @@
 Route116_MapObjects:: @ 8383170
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
 	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
+	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
 	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0
 	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, BerryTreeScript, 0, 0, 0
+	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
+	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
 	object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
+	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
 	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0
 	object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
 	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
index b53e3de57..bf6aeb5d0 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/events/Route117.inc
@@ -9,11 +9,11 @@ Route117_MapObjects:: @ 8383440
 	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, BerryTreeScript, 0, 0, 0
+	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
+	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
+	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
 	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0
 	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index f912b6fbd..df887ba1e 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -1,7 +1,7 @@
 Route118_MapObjects:: @ 8383684
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0
 	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0
@@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684
 	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0
 	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0
 	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
+	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
 	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
 	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index 966ae6058..08e6e3649 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -1,7 +1,7 @@
 Route119_MapObjects:: @ 8383914
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0
 	object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0
@@ -25,10 +25,10 @@ Route119_MapObjects:: @ 8383914
 	object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0
 	object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0
 	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, BerryTreeScript, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, BerryTreeScript, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, BerryTreeScript, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, BerryTreeScript, 0, 0, 0
+	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
+	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
+	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
+	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
 	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
 	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0
 	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index 43a67ee99..81fa21c7f 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -1,14 +1,14 @@
 Route120_MapObjects:: @ 8383F30
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0
+	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0
+	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0
+	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0
+	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0
+	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0
 	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
@@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30
 	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0
 	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0
 	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
+	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
 	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0
 	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
 	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
@@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30
 	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0
 	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0
 	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
+	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0
+	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
 	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
 	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
 	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index 514f51349..9961344a8 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -1,26 +1,26 @@
 Route121_MapObjects:: @ 8384504
 	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, BerryTreeScript, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0
+	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0
+	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0
+	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0
+	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0
+	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
 	object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
 	object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
 	object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
 	object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
+	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
 	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
 	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
 	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
 	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
 	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
+	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
 
 Route121_MapWarps:: @ 8384714
 	warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
index 6b97bafe5..dc5ac0fb4 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/events/Route123.inc
@@ -1,30 +1,30 @@
 Route123_MapObjects:: @ 83847F8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, BerryTreeScript, 0, 0, 0
+	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0
+	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0
+	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0
+	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0
+	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0
+	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0
 	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, BerryTreeScript, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0
+	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0
+	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0
+	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0
+	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0
+	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0
+	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
+	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
+	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
+	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0
+	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0
+	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0
 	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0
 	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0
 	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, BerryTreeScript, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, BerryTreeScript, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, BerryTreeScript, 0, 0, 0
+	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
+	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
+	object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0
 	object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0
 	object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0
 	object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
index f2c72ef2d..009604d4b 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/events/Route130.inc
@@ -1,7 +1,7 @@
 Route130_MapObjects:: @ 838523C
 	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, BerryTreeScript, 17, 0, 0
+	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0
 
 Route130_MapEvents:: @ 8385284
 	map_events Route130_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index 490afda7b..ef1559687 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -1,12 +1,12 @@
 RusturfTunnel_MapObjects:: @ 838BD2C
 	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 931, 0, 0
+	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0
 	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0
 	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0
 	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0
 	object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0
 	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, BreakableRockScript, 932, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0
 	object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
 	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0
 
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
index 30921f095..cea87fb14 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/events/SafariZone_Northeast.inc
@@ -1,12 +1,12 @@
 SafariZone_Northeast_MapObjects:: @ 8391A2C
 	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
 	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
+	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
 	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0
 
 SafariZone_Northeast_MapEvents:: @ 8391B04
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
index 1e791f884..093934481 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/events/SeafloorCavern_Room1.inc
@@ -1,7 +1,7 @@
 SeafloorCavern_Room1_MapObjects:: @ 838D0B8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0
 	object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0
 	object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0
 
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
index 3dbe5e8a7..86a0354e4 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/events/SeafloorCavern_Room2.inc
@@ -1,13 +1,13 @@
 SeafloorCavern_Room2_MapObjects:: @ 838D15C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 24, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
+	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
 
 SeafloorCavern_Room2_MapWarps:: @ 838D234
 	warp_def 12, 19, 3, 2, SeafloorCavern_Room1
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
index 98e6066f2..5c5c9c219 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/events/SeafloorCavern_Room3.inc
@@ -1,13 +1,13 @@
 SeafloorCavern_Room3_MapObjects:: @ 838D268
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
 	object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0
 
 SeafloorCavern_Room3_MapWarps:: @ 838D358
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
index 0ebd46a56..37a501512 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/events/SeafloorCavern_Room5.inc
@@ -1,10 +1,10 @@
 SeafloorCavern_Room5_MapObjects:: @ 838D3D0
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0
+	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
 
 SeafloorCavern_Room5_MapWarps:: @ 838D460
 	warp_def 4, 1, 3, 1, SeafloorCavern_Room1
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
index 610937753..2d7329aec 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/events/SeafloorCavern_Room8.inc
@@ -1,16 +1,16 @@
 SeafloorCavern_Room8_MapObjects:: @ 838D4DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 28, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
+	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0
+	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0
+	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0
+	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0
+	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0
 
 SeafloorCavern_Room8_MapWarps:: @ 838D5FC
 	warp_def 5, 2, 3, 0, SeafloorCavern_Room9
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index a1770b5bb..858f919e0 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
 	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
 
 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
index a4f778c4d..b00074990 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/events/VictoryRoad_B1F.inc
@@ -1,21 +1,21 @@
 VictoryRoad_B1F_MapObjects:: @ 838DA04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 30, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 26, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 27, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 28, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 29, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 31, 0, 0
+	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0
+	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0
+	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0
+	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0
+	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0
+	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0
+	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0
+	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0
+	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0
+	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0
+	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0
+	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0
+	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0
 	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
 	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 32, 0, 0
+	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0
 	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0
 	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0
 
diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s
deleted file mode 100644
index 5c4bd47b9..000000000
--- a/data/mauville_old_man.s
+++ /dev/null
@@ -1,101 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 1
-gUnknown_083E537C:: @ 83E537C
-.ifdef ENGLISH
-	ec_word SISTER
-	ec_word EATS
-	ec_word SWEETS
-	ec_word VORACIOUS
-	ec_word AND
-	ec_word DROOLING
-.else
-	ec_word SISTER
-	ec_word MUST_BE
-	ec_word SWEETS
-	ec_word VORACIOUS
-	ec_word DROOLING
-	ec_word THICK
-.endif
-
-
-	.align 2
-gUnknown_083E5388:: @ 83E5388
-	.4byte OtherText_SoPretty
-	.4byte OtherText_SoDarling
-	.4byte OtherText_SoRelaxed
-	.4byte OtherText_SoSunny
-	.4byte OtherText_SoDesirable
-	.4byte OtherText_SoExciting
-	.4byte OtherText_SoAmusing
-	.4byte OtherText_SoMagical
-
-	.align 2
-gUnknown_083E53A8:: @ 83E53A8
-	.4byte OtherText_WantVacationNicePlace
-	.4byte OtherText_BoughtCrayonsIsNice
-	.4byte OtherText_IfWeCouldFloat
-	.4byte OtherText_SandWashesAwayMakeSad
-	.4byte OtherText_WhatsBottomSeaLike
-	.4byte OtherText_SeeSettingSun
-	.4byte OtherText_LyingInGreenGrass
-	.4byte OtherText_SecretBasesWonderful
-
-	.align 1
-gUnknown_083E53C8:: @ 83E53C8
-	.2byte  0x0, 0
-	.2byte  0xC, 0
-	.2byte  0xD, 0
-	.2byte 0x12, 0
-	.2byte 0x13, 0
-	.2byte 0x15, 0
-
-	.align 2
-gUnknown_083E53E0:: @ 83E53E0
-	.4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022
-	.4byte 0x102, UnknownString_81AF0A3, UnknownString_81AF0BB, UnknownString_81AF0CA
-	.4byte 0x103, UnknownString_81AF149, UnknownString_81AF164, UnknownString_81AF174
-	.4byte 0x104, UnknownString_81AF1E5, UnknownString_81AF1FD, UnknownString_81AF20A
-	.4byte 0x106, UnknownString_81AF281, UnknownString_81AF299, UnknownString_81AF2A9
-	.4byte 0x109, UnknownString_81AF32C, UnknownString_81AF345, UnknownString_81AF34D
-	.4byte 0x10b, UnknownString_81AF3D0, UnknownString_81AF3ED, UnknownString_81AF3FC
-	.4byte 0x10c, UnknownString_81AF46D, UnknownString_81AF481, UnknownString_81AF49B
-	.4byte 0x10d, UnknownString_81AF511, UnknownString_81AF529, UnknownString_81AF536
-	.4byte 0x10e, UnknownString_81AF5A9, UnknownString_81AF5BD, UnknownString_81AF5CD
-	.4byte 0x10f, UnknownString_81AF63F, UnknownString_81AF661, UnknownString_81AF676
-	.4byte 0x110, UnknownString_81AF711, UnknownString_81AF726, UnknownString_81AF73D
-	.4byte 0x111, UnknownString_81AF7BF, UnknownString_81AF7D9, UnknownString_81AF7F1
-	.4byte 0x112, UnknownString_81AF88A, UnknownString_81AF8A1, UnknownString_81AF8AA
-	.4byte 0x113, UnknownString_81AF91B, UnknownString_81AF935, UnknownString_81AF943
-	.4byte 0x114, UnknownString_81AF9C8, UnknownString_81AF9E0, UnknownString_81AF9F6
-	.4byte 0x11a, UnknownString_81AFA79, UnknownString_81AFA92, UnknownString_81AFA9E
-	.4byte 0x11b, UnknownString_81AFB17, UnknownString_81AFB2D, UnknownString_81AFB48
-	.4byte 0x11c, UnknownString_81AFBD8, UnknownString_81AFBE7, UnknownString_81AFC04
-	.4byte 0x21d, UnknownString_81AFC8A, UnknownString_81AFC9D, UnknownString_81AFCBE
-	.4byte 0x11e, UnknownString_81AFD44, UnknownString_81AFD60, UnknownString_81AFD80
-	.4byte 0x121, UnknownString_81AFE1D, UnknownString_81AFE36, UnknownString_81AFE42
-	.4byte 0x124, UnknownString_81AFEC2, UnknownString_81AFEDD, UnknownString_81AFEEE
-	.4byte 0x125, UnknownString_81AFF68, UnknownString_81AFF7B, UnknownString_81AFF88
-	.4byte 0x126, UnknownString_81AFFFB, UnknownString_81B000D, UnknownString_81B0015
-	.4byte 0x127, UnknownString_81B009D, UnknownString_81B00B6, UnknownString_81B00C9
-	.4byte 0x128, UnknownString_81B014D, UnknownString_81B0165, UnknownString_81B0173
-	.4byte 0x129, UnknownString_81B01E9, UnknownString_81B0201, UnknownString_81B0213
-	.4byte 0x12a, UnknownString_81B0290, UnknownString_81B02A5, UnknownString_81B02B6
-	.4byte 0x12b, UnknownString_81B0337, UnknownString_81B0351, UnknownString_81B0364
-	.4byte 0x12c, UnknownString_81B03E9, UnknownString_81B0401, UnknownString_81B040C
-	.4byte 0x12d, UnknownString_81B046E, UnknownString_81B0489, UnknownString_81B049A
-	.4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554
-	.4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610
-	.4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9
-
-gUnknown_083E5610:: @ 83E5610
-	.4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797
-
-	.align 2
-gUnknown_083E5620:: @ 83E5620
-	.4byte 0x24
-	.4byte gSaveBlock1 + 0x2D94
-	.4byte 0xC
diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s
deleted file mode 100644
index 9e2ce2864..000000000
--- a/data/pokemon_menu.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gPokemonMenuActions:: @ 839F494
-	.4byte OtherText_Summary, PokemonMenu_Summary
-	.4byte OtherText_Switch2, PokemonMenu_Switch
-	.4byte OtherText_Item, PokemonMenu_Item
-	.4byte gOtherText_CancelNoTerminator, PokemonMenu_Cancel
-	.4byte OtherText_Give2, PokemonMenu_GiveItem
-	.4byte OtherText_Take2, PokemonMenu_TakeItem
-	.4byte OtherText_Take, PokemonMenu_TakeMail
-	.4byte OtherText_Mail, PokemonMenu_Mail
-	.4byte OtherText_Read2, PokemonMenu_ReadMail
-	.4byte gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu
-	.4byte gMoveNames + 13 * MOVE_CUT, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_FLASH, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_ROCK_SMASH, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_STRENGTH, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_SURF, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_FLY, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_DIVE, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_WATERFALL, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_TELEPORT, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_DIG, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_SECRET_POWER, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_MILK_DRINK, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove
-	.4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove
-
-	.align 1
-gUnknown_0839F554:: @ 839F554
-	.2byte MOVE_CUT
-	.2byte MOVE_FLASH
-	.2byte MOVE_ROCK_SMASH
-	.2byte MOVE_STRENGTH
-	.2byte MOVE_SURF
-	.2byte MOVE_FLY
-	.2byte MOVE_DIVE
-	.2byte MOVE_WATERFALL
-	.2byte MOVE_TELEPORT
-	.2byte MOVE_DIG
-	.2byte MOVE_SECRET_POWER
-	.2byte MOVE_MILK_DRINK
-	.2byte MOVE_SOFT_BOILED
-	.2byte MOVE_SWEET_SCENT
-	.2byte 0xFF
-
-Unknown_39F572: @ 839F572
-	.byte 4, 5, 9, 0
-
-	.align 2
-gUnknown_0839F578:: @ 839F578
-	.byte 3, 6, 0, 0
-	.4byte Unknown_39F572
-
-Unknown_39F580: @ 839F580
-	.byte 8, 6, 9, 0
-
-	.align 2
-gUnknown_0839F584:: @ 839F584
-	.byte 3, 9, 0, 0
-	.4byte Unknown_39F580
-
-	.align 2
-gFieldMoveFuncs:: @ 839F58C
-	.4byte SetUpFieldMove_Cut, 0x6
-	.4byte SetUpFieldMove_Flash, 0x9
-	.4byte SetUpFieldMove_RockSmash, 0x9
-	.4byte SetUpFieldMove_Strength, 0x9
-	.4byte SetUpFieldMove_Surf, 0x7
-	.4byte SetUpFieldMove_Fly, 0x9
-	.4byte SetUpFieldMove_Dive, 0x9
-	.4byte SetUpFieldMove_Waterfall, 0x9
-	.4byte SetUpFieldMove_Teleport, 0x9
-	.4byte SetUpFieldMove_Dig, 0x9
-	.4byte SetUpFieldMove_SecretPower, 0x9
-	.4byte SetUpFieldMove_SoftBoiled, 0x10
-	.4byte SetUpFieldMove_SoftBoiled, 0x10
-	.4byte SetUpFieldMove_SweetScent, 0x9
diff --git a/data/rom4.s b/data/rom4.s
deleted file mode 100644
index 6f883c64c..000000000
--- a/data/rom4.s
+++ /dev/null
@@ -1,66 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gDummyWarpData:: @ 8216624
-	.byte -1
-	.byte -1
-	.byte -1
-	.space 1
-	.2byte -1
-	.2byte -1
-
-@ unused, unknown data
-	.byte 0xB0, 0x04, 0x00, 0x00
-	.byte 0x10, 0x0E, 0x00, 0x00
-	.byte 0xB0, 0x04, 0x00, 0x00
-	.byte 0x60, 0x09, 0x00, 0x00
-	.byte 0x32, 0x00, 0x00, 0x00
-	.byte 0x50, 0x00, 0x00, 0x00
-	.byte 0xD4, 0xFF, 0xFF, 0xFF
-	.byte 0x2C, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0821664C:: @ 821664C
-	.4byte  0,  0
-	.4byte  0,  1
-	.4byte  0, -1
-	.4byte -1,  0
-	.4byte  1,  0
-	.4byte -1,  1
-	.4byte  1,  1
-	.4byte -1, -1
-	.4byte  1, -1
-
-	.align 2
-gUnknown_08216694:: @ 8216694
-	.4byte REG_WIN0H
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 2
-gUnknown_082166A0:: @ 82166A0
-	.4byte sub_8055C68
-	.4byte sub_8055C88
-	.4byte sub_8055C8C
-
-	.align 2
-gUnknown_082166AC:: @ 82166AC
-	.4byte sub_8055CAC
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CB0
-	.4byte sub_8055CAC
-	.4byte sub_8055CAC
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-	.4byte sub_8055D18
-
-	.align 2
-gUnknown_082166D8:: @ 82166D8
-	.4byte sub_8055D30
-	.4byte sub_8055D38
diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc
deleted file mode 100644
index 3f25b100f..000000000
--- a/data/scripts/bard.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
-	special sub_80F7B14
-	switch RESULT
-	case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784
-	case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845
-	case 2, MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB
-	case 3, MauvilleCity_PokemonCenter_1F_EventScript_1B0816
-	case 4, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0A91, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5
-	setvar 0x8004, 0
-	special sub_80F7C54
-	pause 60
-	special sub_80F7B2C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8:: @ 81AE7C8
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AC3, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2:: @ 81AE7D2
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0B2C, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1
-	setvar 0x8004, 6
-	call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
-	lock
-	faceplayer
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4
-	setvar 0x8004, 1
-	special sub_80F7C54
-	pause 60
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
-	special sub_80F7B40
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE83B:: @ 81AE83B
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BA6, 4
-	release
-	end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1bbe7d355..f4707d8cb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,4 +1,4 @@
-BerryTreeScript:: @ 81A14DD
+S_BerryTree:: @ 81A14DD
 	special FieldObjectInteractionGetBerryTreeData
 	switch 0x8004
 	case 255, Route102_EventScript_1A1533
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 4a919c597..6507677e0 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
 	case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
@@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	special SavePlayerParty
 	special LoadPlayerBag
 	copyvar 0x4087, 0x8004
@@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
 	call OldaleTown_PokemonCenter_2F_EventScript_1A41BB
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index b5b3d4670..dcc4b44e7 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	release
 	end
 
-Event_EggHatch:: @ 81B25BC
+S_EggHatch:: @ 81B25BC
 	lockall
 	msgbox UnknownString_81B2C68, 4
 	special EggHatch
diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc
deleted file mode 100644
index 263589fe9..000000000
--- a/data/scripts/giddy.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C
-	special sub_80F7CC8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26
-	special sub_80F7CC8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E
-	special sub_80F7CF4
-	special ShowFieldMessageStringVar4
-	waittext
-	yesnobox 20, 8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4
-	release
-	end
diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc
deleted file mode 100644
index 3e24e4868..000000000
--- a/data/scripts/hipster.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845
-	lock
-	faceplayer
-	setflag 2054
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4
-	special sub_80F7C70
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A
-	special sub_80F7C90
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4
-	special sub_80F7C84
-	release
-	end
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 7ba7540c4..bfc5b6a79 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
 	setflag 937
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 176d8e8e8..2f0fb97b9 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
 	msgbox 0x20234cc, 4
 	waittext
 	closebutton
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 0
 	setvar 0x8005, 0
 	special sub_813556C
@@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
 	special sub_8135A14
 	fanfare 368
 	waitfanfare
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 
 BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
 	msgbox BattleTower_BattleRoom_Text_19AD09, 5
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 8cd3639a5..a1570ac13 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	special LoadPlayerParty
 	closebutton
 	pause 2
-	call BattleTower_Lobby_EventScript_19F806
+	call S_DoSaveDialog
 	setvar 0x4000, 5
 	hidebox 0, 0, 15, 10
 	compare RESULT, 0
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 023892d36..5517a9c7e 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	pause 40
 	waitpokecry
 	setflag 2145
-	special StartBattle_GroudonKyogre
+	special ScrSpecial_StartGroudonKyogreBattle
 	waitstate
 	clearflag 2145
 	specialval RESULT, sub_810E300
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index df40fc126..97a22bae3 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
 	setflag 935
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index b16f386d8..2f8ba2121 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
 	setflag 2133
 	end
 
-gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19
+S_OpenRegiceChamber:: @ 815EF19
 	setmaptile 7, 19, 554, 1
 	setmaptile 8, 19, 555, 1
 	setmaptile 9, 19, 556, 1
@@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
 	setflag 936
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 3c8cc5bdf..6bdcf55e2 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	msgbox LilycoveCity_ContestLobby_Text_188521, 5
 	compare RESULT, 0
 	jumpeq LilycoveCity_ContestLobby_EventScript_158C35
-	call LilycoveCity_ContestLobby_EventScript_19F806
+	call S_DoSaveDialog
 	hidebox 0, 0, 15, 9
 	compare RESULT, 0
 	jumpeq LilycoveCity_ContestLobby_EventScript_158C35
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index dcf74b77c..09d19c1c5 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
 	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
 	waittext
 	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
-	special sub_810D6A4
+	special ScrSpecial_ShowDiploma
 	waitstate
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index f8ff8f9f3..aca6b16d4 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	callif 1, LilycoveCity_Harbor_EventScript_1599CE
 	pause 30
 	spriteinvisible 255, 0, 0
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 2
 	call LilycoveCity_Harbor_EventScript_1A040E
 	warp SouthernIsland_Exterior, 255, 13, 22
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index 6adea2eb2..2786c930c 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
 	special sub_80FA148
 	compare RESULT, 1
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71
-	special sub_80F9F3C
+	special ScrSpecial_CountPokemonMoves
 	compare RESULT, 1
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
@@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
 	fadescreen 0
 	compare 0x8005, 4
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	special sub_80F9F84
+	special ScrSpecial_GetPokemonNicknameAndMoveName
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5
 	switch RESULT
 	case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53
@@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
-	special sub_80F9F84
+	special ScrSpecial_GetPokemonNicknameAndMoveName
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
 	releaseall
 	end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 14836f3e0..59669596a 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	compare RESULT, 0
 	callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	special LoadPlayerParty
-	call MossdeepCity_GameCorner_1F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	hidebox 0, 0, 15, 10
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a5a013d5f..c7d1201fd 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	compare RESULT, 2
 	callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
 	closebutton
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
 	waitmove 0
 	special LoadPlayerParty
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index dc5efe243..123b099fe 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
 	move 255, PetalburgCity_Movement_14B7CC
 	waitmove 0
 	msgbox PetalburgCity_Text_16D361, 4
-	special StartBattle_WallyTutorial
+	special ScrSpecial_StartWallyTutorialBattle
 	waitstate
 	msgbox PetalburgCity_Text_16D3DE, 4
 	movecoords 2, PetalburgCity_Movement_1A083F, 0, 0
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 8462603a6..d945aadfc 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -224,12 +224,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	movesprite 255, 6, 13
 	move 255, Route101_Movement_1A083F
 	waitmove 0
-	special ChooseStarter
+	special ScrSpecial_ChooseStarter
 	waitstate
 	move 2, Route101_Movement_14EAD7
 	waitmove 0
 	msgbox Route101_Text_16D191, 4
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setflag 720
 	clearflag 721
 	setflag 700
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index d8c19d92c..a77feaa0f 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933
 	.2byte 0
 
 Route110_EventScript_14F93D:: @ 814F93D
-	special BeginCyclingRoadChallenge
+	special ScrSpecial_BeginCyclingRoadChallenge
 	setvar 0x40a9, 2
 	return
 
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 23db6a8ea..d659a23c1 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
 	waitpokecry
 	setflag 773
 	setflag 2145
-	special StartBattle_Rayquaza
+	special ScrSpecial_StartRayquazaBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 48eb5c1df..e156f8948 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	specialval RESULT, LeadMonHasEffortRibbon
 	compare RESULT, 1
 	callif 1, SlateportCity_EventScript_14BB35
-	specialval RESULT, GetLeadMonEVCount
+	specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
 	compare RESULT, 0
 	callif 1, SlateportCity_EventScript_14BB2B
 	msgbox SlateportCity_Text_164691, 4
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 3adf3545f..e5eaadab5 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
 	setflag 911
 	setflag 2145
-	special StartBattle_SouthernIsland
+	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
 	clearflag 2145
 	releaseall
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
new file mode 100644
index 000000000..997b5a31c
--- /dev/null
+++ b/data/scripts/mauville_man.inc
@@ -0,0 +1,357 @@
+@ From mauville_old_man.h
+@ TODO: Put these in a header
+
+MAUVILLE_MAN_BARD        = 0
+MAUVILLE_MAN_HIPSTER     = 1
+MAUVILLE_MAN_TRADER      = 2
+MAUVILLE_MAN_STORYTELLER = 3
+MAUVILLE_MAN_GIDDY       = 4
+
+MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
+	special ScrSpecial_GetCurrentMauvilleMan
+	switch RESULT
+	case MAUVILLE_MAN_BARD,        SpeakToBard
+	case MAUVILLE_MAN_HIPSTER,     SpeakToHipster
+	case MAUVILLE_MAN_TRADER,      SpeakToTrader
+	case MAUVILLE_MAN_STORYTELLER, SpeakToStoryteller
+	case MAUVILLE_MAN_GIDDY,       SpeakToGiddy
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Bard
+@-------------------------------------------------------------------------------
+
+SpeakToBard:
+	lock
+	faceplayer
+	msgbox gTextBard_HiImTheBard, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq yes_hear_song
+	compare RESULT, NO
+	jumpeq dont_hear_song
+	end
+
+yes_hear_song:
+	setvar 0x8004, 0
+	@ Give the player ear rape
+	special ScrSpecial_PlayBardSong
+	pause 60
+	special ScrSpecial_HasBardSongBeenChanged
+	compare RESULT, FALSE
+	@ Prompt new lyrics only if song hasn't been changed
+	jumpeq prompt_write_lyrics
+	msgbox gTextBard_OhWhatAMovingSong, 4
+	release
+	end
+
+dont_hear_song:
+	msgbox gTextBard_OhYouveLeftMe, 4
+	release
+	end
+
+prompt_write_lyrics:
+	msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq write_lyrics
+	compare RESULT, NO
+	jumpeq dont_write_lyrics
+	end
+
+write_lyrics:
+	setvar 0x8004, 6
+	call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
+	lock
+	faceplayer
+	compare RESULT, NO
+	jumpeq dont_write_lyrics
+	msgbox gTextBard_ThankYouKindly, 4
+	setvar 0x8004, 1
+	@ Give the player ear rape again
+	special ScrSpecial_PlayBardSong
+	pause 60
+	msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq write_lyrics		@ Keep looping until player responds YES
+	special ScrSpecial_SaveBardSongLyrics
+	msgbox gTextBard_OkayThatsIt, 4
+	release
+	end
+
+dont_write_lyrics:
+	msgbox gTextBard_OhYouveLeftMe2, 4
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Hipster
+@-------------------------------------------------------------------------------
+
+SpeakToHipster:
+	lock
+	faceplayer
+	setflag 2054
+	msgbox gTextHipster_TheyCallMeTheHipster, 4
+	special ScrSpecial_GetHipsterSpokenFlag
+	compare RESULT, FALSE
+	jumpeq hipster_first_time
+	msgbox gTextHipster_TaughtYouAlready, 4
+	release
+	end
+
+hipster_first_time:
+	special ScrSpecial_HipsterTeachWord
+	compare RESULT, TRUE		@ TRUE if player learned a new word
+	jumpeq teach_new_word
+	msgbox gTextHipster_YouAlreadyKnowALot, 4
+	release
+	end
+
+teach_new_word:
+	msgbox gTextHipster_HaveYouHeardAbout, 4
+	special ScrSpecial_SetHipsterSpokenFlag
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Trader
+@-------------------------------------------------------------------------------
+
+	.include "data/text/trader.inc"
+
+SpeakToTrader:
+	lock
+	faceplayer
+	msgbox gTextTrader_Introduction, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_want_to_trade
+	special ScrSpecial_GetTraderTradedFlag
+	compare RESULT, TRUE
+	jumpeq already_traded
+	message gTextTrader_MenuPrompt
+	waittext
+	jump do_trader_menu_get
+	end
+
+dont_want_to_trade:
+	msgbox gTextTrader_FeelUnwanted1, 2
+	end
+
+already_traded:
+	msgbox gTextTrader_TradedAlready, 2
+	end
+
+do_trader_menu_get:
+	special ScrSpecial_TraderMenuGetDecoration
+	waitstate
+	compare 0x8004, 0
+	jumpeq cancelled_get_menu
+	compare 0x8004, 65535
+	jumpeq rare_item_cant_trade_away
+	msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_want_item
+	special ScrSpecial_DoesPlayerHaveNoDecorations
+	compare RESULT, TRUE
+	jumpeq player_has_no_decorations
+	jump do_trader_menu_give
+	end
+
+cancelled_get_menu:
+	msgbox gTextTrader_DontWantAnything, 2
+	end
+
+rare_item_cant_trade_away:
+	message gTextTrader_ICantTradeThatOneAway
+	waittext
+	jump do_trader_menu_get
+	end
+
+dont_want_item:
+	message gTextTrader_MenuPrompt
+	waittext
+	jump do_trader_menu_get
+	end
+
+player_has_no_decorations:
+	msgbox gTextTrader_YouDontHaveDecorations, 2
+	end
+
+do_trader_menu_give:
+	msgbox gTextTrader_PickDecorationYoullTrade, 4
+	special ScrSpecial_TraderMenuGiveDecoration
+	waitstate
+	compare 0x8006, 0
+	jumpeq cancelled_give_menu
+	compare 0x8006, 65535
+	jumpeq decoration_is_in_use
+	special ScrSpecial_IsDecorationFull
+	compare RESULT, 1
+	jumpeq decorations_full
+	msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq do_trader_menu_give
+	special ScrSpecial_TraderDoDecorationTrade
+	msgbox gTextTrader_ThenWellTrade, 2
+	end
+
+cancelled_give_menu:
+	msgbox gTextTrader_FeelUnwanted2, 2
+	end
+
+decoration_is_in_use:
+	msgbox gTextTrader_InUseYouCantTradeIt, 4
+	jump do_trader_menu_give
+	end
+
+decorations_full:
+	msgbox gTextTrader_NoRoomForThis, 2
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Storyteller
+@-------------------------------------------------------------------------------
+
+	.include "data/text/storyteller.inc"
+
+SpeakToStoryteller:
+	setvar 0x8008, 0
+	setvar 0x8009, 0
+	setvar 0x800a, 0
+	setvar 0x800b, 0
+	lock
+	faceplayer
+	msgbox gTextStoryteller_Introduction, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_hear_story
+	specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+	compare RESULT, 0		@ If slot is 0, then the list is empty
+	jumpeq no_stories_recorded
+choose_story:
+	message gTextStoryteller_WhichTale
+	waittext
+	special ScrSpecial_StorytellerStoryListMenu
+	waitstate
+	compare RESULT, FALSE
+	jumpeq cancel_story_menu
+	setvar 0x8008, 1
+	special ScrSpecial_StorytellerDisplayStory
+	waittext
+	waitbutton
+	specialval RESULT, ScrSpecial_StorytellerUpdateStat
+	compare RESULT, FALSE
+	jumpeq no_stat_update
+	jump stat_update
+cancel_story_menu:
+	compare 0x8008, 0
+	jumpeq dont_hear_story
+	jump yes_hear_story
+no_stat_update:
+	msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4
+	msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq choose_story
+yes_hear_story:
+	specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
+	compare RESULT, TRUE
+	jumpeq cant_record_story		@ already recorded story
+	specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+	compare RESULT, 4
+	jumpeq cant_record_story		@ story list is full
+	jump prompt_record_story
+no_stories_recorded:
+	msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4
+prompt_record_story:
+	msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_hear_story
+	specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat
+	compare RESULT, TRUE
+	jumpeq stat_update
+	msgbox gTextStoryteller_ImNotSatisfied, 4
+	closebutton
+	release
+	end
+
+stat_update:
+	msgbox gTextStoryteller_BirthOfANewLegend, 4
+	closebutton
+	release
+	end
+
+dont_hear_story:
+	msgbox gTextStoryteller_OhIFeelStifled, 4
+	closebutton
+	release
+	end
+
+cant_record_story:
+	msgbox gTextStoryteller_WishMorePeopleWould, 4
+	closebutton
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Giddy
+@-------------------------------------------------------------------------------
+
+	.include "data/text/giddy.inc"
+
+SpeakToGiddy:
+	lock
+	faceplayer
+	msgbox gTextGiddy_Introduction, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq yes_hear_giddy
+	compare RESULT, NO
+	jumpeq dont_hear_giddy
+	end
+
+yes_hear_giddy:
+	special ScrSpecial_GiddyShouldTellAnotherTale
+	compare RESULT, TRUE
+	jumpeq tell_giddy_tale
+	compare RESULT, FALSE
+	jumpeq bye_bye
+	end
+
+tell_another_giddy_tale:
+	special ScrSpecial_GiddyShouldTellAnotherTale
+	compare RESULT, TRUE
+	jumpeq also_i_was_thinking
+	compare RESULT, FALSE
+	jumpeq bye_bye
+	end
+
+also_i_was_thinking:
+	msgbox gTextGiddy_AlsoIWasThinking, 4
+	jump tell_giddy_tale
+	end
+
+tell_giddy_tale:
+	special ScrSpecial_GenerateGiddyLine
+	special ShowFieldMessageStringVar4
+	waittext
+	yesnobox 20, 8
+	compare RESULT, 1
+	jumpeq tell_another_giddy_tale
+	compare RESULT, 0
+	jumpeq tell_another_giddy_tale
+	end
+
+dont_hear_giddy:
+	msgbox gTextGiddy_YouveDeflatedMe, 4
+	release
+	end
+
+bye_bye:
+	msgbox gTextGiddy_ByeBye, 4
+	release
+	end
+
+	.include "data/text/bard.inc"
+	.include "data/text/hipster.inc"
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index ca4b2bdb9..e9f379b24 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
 	inccounter GAME_STAT_CHECKED_CLOCK
 	fadescreen 1
-	special sub_810D6B8
+	special ScrSpecial_ViewWallClock
 	waitstate
 	releaseall
 	end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index e1add8734..852acd292 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
-	call FallarborTown_ContestLobby_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq FallarborTown_ContestLobby_EventScript_1B7936
 	message FallarborTown_ContestLobby_Text_1B7304
diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc
deleted file mode 100644
index eba94e698..000000000
--- a/data/scripts/storyteller.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816
-	setvar 0x8008, 0
-	setvar 0x8009, 0
-	setvar 0x800a, 0
-	setvar 0x800b, 0
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	specialval RESULT, sub_80F889C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F
-	message MauvilleCity_PokemonCenter_1F_Text_1AED35
-	waittext
-	special sub_80F8874
-	waitstate
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883
-	setvar 0x8008, 1
-	special sub_80F8888
-	waittext
-	waitbutton
-	specialval RESULT, sub_80F88AC
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883
-	compare 0x8008, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE
-	specialval RESULT, sub_80F88E0
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
-	specialval RESULT, sub_80F889C
-	compare RESULT, 4
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	specialval RESULT, sub_80F88FC
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4
-	closebutton
-	release
-	end
diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc
deleted file mode 100644
index b52c8a2dc..000000000
--- a/data/scripts/trader.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA
-	special sub_8109C44
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3
-	message MauvilleCity_PokemonCenter_1F_Text_1AE910
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC
-	special sub_8109E34
-	waitstate
-	compare 0x8004, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D
-	compare 0x8004, 65535
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42
-	special sub_8109C58
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36
-	message MauvilleCity_PokemonCenter_1F_Text_1AEB31
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42
-	message MauvilleCity_PokemonCenter_1F_Text_1AE910
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4
-	special sub_8109CF0
-	waitstate
-	compare 0x8006, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6
-	compare 0x8006, 65535
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF
-	special sub_8109C90
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	special sub_8109DE0
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2
-	end
diff --git a/data/specials.inc b/data/specials.inc
index 0eb6b742d..3545d1dff 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -7,7 +7,7 @@
 .set __special__, 0
 	.align 2
 gSpecials::
-	def_special HealPlayerParty
+	def_special ScrSpecial_HealPlayerParty
 	def_special SetCableClubWarp
 	def_special DoCableClubWarp
 	def_special sub_80810DC
@@ -58,15 +58,15 @@ gSpecials::
 	def_special FieldObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
-	def_special sub_8082558
-	def_special sub_80826D8
-	def_special sub_8082718
-	def_special sub_8082564
-	def_special sub_80847C8
+	def_special ScrSpecial_GetTrainerBattleMode
+	def_special ScrSpecial_ShowTrainerIntroSpeech
+	def_special ScrSpecial_ShowTrainerNonBattlingSpeech
+	def_special ScrSpecial_HasTrainerBeenFought
+	def_special ScrSpecial_EndTrainerApproach
 	def_special PlayTrainerEncounterMusic
 	def_special sub_8082C68
-	def_special sub_8082C9C
-	def_special sub_80826B0
+	def_special ScrSpecial_GetTrainerEyeRematchFlag
+	def_special ScrSpecial_StartTrainerEyeRematch
 	def_special ShowPokemonStorageSystem
 	def_special CheckForAlivePartyMons
 	def_special TurnOffTVScreen
@@ -100,32 +100,32 @@ gSpecials::
 	def_special sub_80C5044
 	def_special GiveMonArtistRibbon
 	def_special sub_808363C
-	def_special InitSaveDialog
+	def_special ScrSpecial_DoSaveDialog
 	def_special DoWateringBerryTreeAnim
 	def_special sub_80E60D8
 	def_special sub_80EB7C4
-	def_special sub_80F7B14
-	def_special sub_80F7B2C
-	def_special sub_80F7B40
-	def_special sub_80F7C70
-	def_special sub_80F7C84
-	def_special sub_80F7C90
-	def_special sub_80F7C54
+	def_special ScrSpecial_GetCurrentMauvilleMan
+	def_special ScrSpecial_HasBardSongBeenChanged
+	def_special ScrSpecial_SaveBardSongLyrics
+	def_special ScrSpecial_GetHipsterSpokenFlag
+	def_special ScrSpecial_SetHipsterSpokenFlag
+	def_special ScrSpecial_HipsterTeachWord
+	def_special ScrSpecial_PlayBardSong
 	def_special sub_80F83D0
-	def_special sub_80F7CF4
-	def_special sub_80F7CC8
-	def_special sub_80F889C
-	def_special sub_80F8888
-	def_special sub_80F8874
-	def_special sub_80F88AC
-	def_special sub_80F88FC
-	def_special sub_80F88E0
-	def_special sub_8109E34
-	def_special sub_8109C44
-	def_special sub_8109C58
-	def_special sub_8109C90
-	def_special sub_8109CF0
-	def_special sub_8109DE0
+	def_special ScrSpecial_GenerateGiddyLine
+	def_special ScrSpecial_GiddyShouldTellAnotherTale
+	def_special ScrSpecial_StorytellerGetFreeStorySlot
+	def_special ScrSpecial_StorytellerDisplayStory
+	def_special ScrSpecial_StorytellerStoryListMenu
+	def_special ScrSpecial_StorytellerUpdateStat
+	def_special ScrSpecial_StorytellerInitializeRandomStat
+	def_special ScrSpecial_HasStorytellerAlreadyRecorded
+	def_special ScrSpecial_TraderMenuGetDecoration
+	def_special ScrSpecial_GetTraderTradedFlag
+	def_special ScrSpecial_DoesPlayerHaveNoDecorations
+	def_special ScrSpecial_IsDecorationFull
+	def_special ScrSpecial_TraderMenuGiveDecoration
+	def_special ScrSpecial_TraderDoDecorationTrade
 	def_special GetShroomishSizeRecordInfo
 	def_special CompareShroomishSize
 	def_special GetBarboachSizeRecordInfo
@@ -162,9 +162,9 @@ gSpecials::
 	def_special sub_8123218
 	def_special sub_8053E90
 	def_special StartWallClock
-	def_special sub_810D6B8
-	def_special ChooseStarter
-	def_special StartBattle_WallyTutorial
+	def_special ScrSpecial_ViewWallClock
+	def_special ScrSpecial_ChooseStarter
+	def_special ScrSpecial_StartWallyTutorialBattle
 	def_special sub_80BF9F8
 	def_special sub_80F9A0C
 	def_special sub_810CA00
@@ -178,7 +178,7 @@ gSpecials::
 	def_special sub_810FF48
 	def_special sub_810FAA0
 	def_special sub_810FF60
-	def_special RockSmashWildEncounter
+	def_special ScrSpecial_RockSmashWildEncounter
 	def_special GabbyAndTyGetBattleNum
 	def_special sub_80BDC14
 	def_special GabbyAndTyBeforeInterview
@@ -229,11 +229,11 @@ gSpecials::
 	def_special sub_80F9A4C
 	def_special sub_80F9EEC
 	def_special sub_80FA0DC
-	def_special sub_80F9F84
-	def_special sub_80F9F3C
+	def_special ScrSpecial_GetPokemonNicknameAndMoveName
+	def_special ScrSpecial_CountPokemonMoves
 	def_special sub_8132670
 	def_special GetRecordedCyclingRoadResults
-	def_special BeginCyclingRoadChallenge
+	def_special ScrSpecial_BeginCyclingRoadChallenge
 	def_special GetPlayerAvatarBike
 	def_special FinishCyclingRoadChallenge
 	def_special UpdateCyclingRoadState
@@ -269,9 +269,9 @@ gSpecials::
 	def_special ShowBerryBlenderRecordWindow
 	def_special ResetTrickHouseEndRoomFlag
 	def_special SetTrickHouseEndRoomFlag
-	def_special TryCreatePCMenu
+	def_special ScrSpecial_CreatePCMenu
 	def_special AccessHallOfFamePC
-	def_special sub_810D6A4
+	def_special ScrSpecial_ShowDiploma
 	def_special CheckLeadMonCool
 	def_special CheckLeadMonBeauty
 	def_special CheckLeadMonCute
@@ -301,7 +301,7 @@ gSpecials::
 	def_special sub_810F4FC
 	def_special LeadMonHasEffortRibbon
 	def_special GivLeadMonEffortRibbon
-	def_special GetLeadMonEVCount
+	def_special ScrSpecial_AreLeadMonEVsMaxedOut
 	def_special sub_8064EAC
 	def_special sub_8064ED4
 	def_special InitRoamer
@@ -318,9 +318,9 @@ gSpecials::
 	def_special IsPokerusInParty
 	def_special sub_8069D78
 	def_special sub_810F758
-	def_special StartBattle_GroudonKyogre
-	def_special StartBattle_Rayquaza
-	def_special StartBattle_Regi
+	def_special ScrSpecial_StartGroudonKyogreBattle
+	def_special ScrSpecial_StartRayquazaBattle
+	def_special ScrSpecial_StartRegiBattle
 	def_special sub_8082524
 	def_special DoSealedChamberShakingEffect2
 	def_special sub_810F828
@@ -330,7 +330,7 @@ gSpecials::
 	def_special ShowContestEntryMonPic
 	def_special sub_80C5164
 	def_special sub_8134AB4
-	def_special StartBattle_SouthernIsland
+	def_special ScrSpecial_StartSouthernIslandBattle
 	def_special SetRoute119Weather
 	def_special SetRoute123Weather
 	def_special ScriptGetMultiplayerId
diff --git a/data/text/bard.inc b/data/text/bard.inc
index edf4942f6..bd22c97a3 100644
--- a/data/text/bard.inc
+++ b/data/text/bard.inc
@@ -1,19 +1,19 @@
-UnknownString_81B0A83: @ 81B0A83
+gTextBard_BardTesting: @ 81B0A83
 	.string "BARD testing!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91
+gTextBard_HiImTheBard:: @ 81B0A91
 	.string "Hi, I’m the BARD.\n"
 	.string "Would you like to hear my song?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3
+gTextBard_OhYouveLeftMe:: @ 81B0AC3
 	.string "Oh...\n"
 	.string "You’ve left me feeling the blues...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED
+gTextBard_OhWhatAMovingSong:: @ 81B0AED
 	.string "Oh, what a moving song...\n"
 	.string "I wish I could play it for others...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
+gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C
 	.string "So?\n"
 	.string "How do you like my song?\p"
 	.string "But I’m none too happy about the\n"
@@ -21,18 +21,18 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
 	.string "How would you like to write some new\n"
 	.string "lyrics for me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6
+gTextBard_OhYouveLeftMe2:: @ 81B0BA6
 	.string "Oh...\n"
 	.string "You’ve left me feeling the blues...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0
+gTextBard_ThankYouKindly:: @ 81B0BD0
 	.string "Thank you kindly!\n"
 	.string "Let me sing it for you.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA
+gTextBard_WasThatHowYouWanted:: @ 81B0BFA
 	.string "Was that how you wanted your song\n"
 	.string "to go?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23
+gTextBard_OkayThatsIt:: @ 81B0C23
 	.string "Okay! That’s it, then.\n"
 	.string "I’ll sing this song for a while.$"
diff --git a/data/text/giddy.inc b/data/text/giddy.inc
index 040ef2ae5..a763776bf 100644
--- a/data/text/giddy.inc
+++ b/data/text/giddy.inc
@@ -1,16 +1,16 @@
-MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A
+gTextGiddy_Introduction:: @ 81B092A
 	.string "I’m GIDDY!\n"
 	.string "I have a scintillating story for you!\p"
 	.string "Would you like to hear my story?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C
+gTextGiddy_YouveDeflatedMe:: @ 81B097C
 	.string "Oh...\n"
 	.string "You’ve deflated me...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998
+gTextGiddy_AlsoIWasThinking:: @ 81B0998
 	.string "Also, I was thinking...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0
+gTextGiddy_ByeBye:: @ 81B09B0
 	.string "That’s about it, I think...\p"
 	.string "We should chat again!\n"
 	.string "Bye-bye!$"
diff --git a/data/text/hipster.inc b/data/text/hipster.inc
index a30943d3a..630db02b2 100644
--- a/data/text/hipster.inc
+++ b/data/text/hipster.inc
@@ -1,19 +1,19 @@
-MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B
+gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B
 	.string "Hey, yo! They call me the HIPSTER.\n"
 	.string "I’ll teach you what’s hip and happening.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7
+gTextHipster_TaughtYouAlready:: @ 81B0CA7
 	.string "But, hey, I taught you what’s hip and\n"
 	.string "happening already.\p"
 	.string "I’d like to spread the good word to\n"
 	.string "other folks.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11
+gTextHipster_YouAlreadyKnowALot:: @ 81B0D11
 	.string "But, hey, you already know a lot about\n"
 	.string "what’s hip and happening.\p"
 	.string "I’ve got nothing new to teach you!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
+gTextHipster_HaveYouHeardAbout:: @ 81B0D75
 	.string "Hey, have you heard about\n"
 	.string "“{STR_VAR_1}”?\p"
 	.string "What’s it mean? Well...\n"
diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc
index 3cfa8a698..437a1fa21 100644
--- a/data/text/storyteller.inc
+++ b/data/text/storyteller.inc
@@ -1,24 +1,24 @@
-MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6
+gTextStoryteller_Introduction:: @ 81AECC6
 	.string "I’m the STORYTELLER.\n"
 	.string "I’ll tell you tales of legendary\l"
 	.string "TRAINERS.\p"
 	.string "Will you hear my tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
 	.string "Oh...\n"
 	.string "I feel stifled...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
 	.string "I know of these legends.\n"
 	.string "Which tale will you have me tell?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
 	.string "But, I know of no legendary TRAINERS.\n"
 	.string "Hence, I know no tales.\p"
 	.string "Where does one find a TRAINER worthy\n"
 	.string "of a legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
 	.string "What’s that?!\n"
 	.string "You... You...\p"
 	.string "{STR_VAR_2}\n"
@@ -26,38 +26,38 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
 	.string "That is indeed magnificent!\n"
 	.string "It’s the birth of a new legend!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
 	.string "It gets me thinking, could there be\n"
 	.string "other TRAINERS with more impressive\l"
 	.string "legends awaiting discovery?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
 	.string "Are you a TRAINER?\p"
 	.string "Then tell me, have you any tales that\n"
 	.string "are even remotely legendary?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
 	.string "Incidentally... Would you care to hear\n"
 	.string "another legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
 	.string "Hmm...\n"
 	.string "I’m not satisfied...\p"
 	.string "I wish you would bring me news worthy\n"
 	.string "of being called a legend.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
 	.string "I wish more people would be interested\n"
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
-UnknownString_81AEFFC:: @ 81AEFFC
+gTextStoryteller_Story1Title:: @ 81AEFFC
 	.string "The Save-Happy TRAINER$"
 
-UnknownString_81AF013:: @ 81AF013
+gTextStoryteller_Story1Action:: @ 81AF013
 	.string "Saved the game$"
 
-UnknownString_81AF022:: @ 81AF022
+gTextStoryteller_Story1Text:: @ 81AF022
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -65,13 +65,13 @@ UnknownString_81AF022:: @ 81AF022
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
-UnknownString_81AF0A3:: @ 81AF0A3
+gTextStoryteller_Story2Title:: @ 81AF0A3
 	.string "The Trendsetter TRAINER$"
 
-UnknownString_81AF0BB:: @ 81AF0BB
+gTextStoryteller_Story2Action:: @ 81AF0BB
 	.string "Started trends$"
 
-UnknownString_81AF0CA:: @ 81AF0CA
+gTextStoryteller_Story2Text:: @ 81AF0CA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -79,13 +79,13 @@ UnknownString_81AF0CA:: @ 81AF0CA
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-UnknownString_81AF149:: @ 81AF149
+gTextStoryteller_Story3Title:: @ 81AF149
 	.string "The BERRY-Planting TRAINER$"
 
-UnknownString_81AF164:: @ 81AF164
+gTextStoryteller_Story3Action:: @ 81AF164
 	.string "Planted BERRIES$"
 
-UnknownString_81AF174:: @ 81AF174
+gTextStoryteller_Story3Text:: @ 81AF174
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -93,13 +93,13 @@ UnknownString_81AF174:: @ 81AF174
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
-UnknownString_81AF1E5:: @ 81AF1E5
+gTextStoryteller_Story4Title:: @ 81AF1E5
 	.string "The BIKE-Loving TRAINER$"
 
-UnknownString_81AF1FD:: @ 81AF1FD
+gTextStoryteller_Story4Action:: @ 81AF1FD
 	.string "Traded BIKES$"
 
-UnknownString_81AF20A:: @ 81AF20A
+gTextStoryteller_Story4Text:: @ 81AF20A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -107,13 +107,13 @@ UnknownString_81AF20A:: @ 81AF20A
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
-UnknownString_81AF281:: @ 81AF281
+gTextStoryteller_Story5Title:: @ 81AF281
 	.string "The Interviewed TRAINER$"
 
-UnknownString_81AF299:: @ 81AF299
+gTextStoryteller_Story5Action:: @ 81AF299
 	.string "Got interviewed$"
 
-UnknownString_81AF2A9:: @ 81AF2A9
+gTextStoryteller_Story5Text:: @ 81AF2A9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -121,26 +121,26 @@ UnknownString_81AF2A9:: @ 81AF2A9
 	.string "{STR_VAR_3} must be a TRAINER who’s\n"
 	.string "attracting much attention!$"
 
-UnknownString_81AF32C:: @ 81AF32C
+gTextStoryteller_Story6Title:: @ 81AF32C
 	.string "The Battle-Happy TRAINER$"
 
-UnknownString_81AF345:: @ 81AF345
+gTextStoryteller_Story6Action:: @ 81AF345
 	.string "Battled$"
 
-UnknownString_81AF34D:: @ 81AF34D
+gTextStoryteller_Story6Text:: @ 81AF34D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
-UnknownString_81AF3D0:: @ 81AF3D0
+gTextStoryteller_Story7Title:: @ 81AF3D0
 	.string "The POKéMON-Catching TRAINER$"
 
-UnknownString_81AF3ED:: @ 81AF3ED
+gTextStoryteller_Story7Action:: @ 81AF3ED
 	.string "Caught POKéMON$"
 
-UnknownString_81AF3FC:: @ 81AF3FC
+gTextStoryteller_Story7Text:: @ 81AF3FC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -148,13 +148,13 @@ UnknownString_81AF3FC:: @ 81AF3FC
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
-UnknownString_81AF46D:: @ 81AF46D
+gTextStoryteller_Story8Title:: @ 81AF46D
 	.string "The Fishing TRAINER$"
 
-UnknownString_81AF481:: @ 81AF481
+gTextStoryteller_Story8Action:: @ 81AF481
 	.string "Caught POKéMON with a ROD$"
 
-UnknownString_81AF49B:: @ 81AF49B
+gTextStoryteller_Story8Text:: @ 81AF49B
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -162,13 +162,13 @@ UnknownString_81AF49B:: @ 81AF49B
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
-UnknownString_81AF511:: @ 81AF511
+gTextStoryteller_Story9Title:: @ 81AF511
 	.string "The EGG-Warming TRAINER$"
 
-UnknownString_81AF529:: @ 81AF529
+gTextStoryteller_Story9Action:: @ 81AF529
 	.string "Hatched EGGS$"
 
-UnknownString_81AF536:: @ 81AF536
+gTextStoryteller_Story9Text:: @ 81AF536
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -176,13 +176,13 @@ UnknownString_81AF536:: @ 81AF536
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
-UnknownString_81AF5A9:: @ 81AF5A9
+gTextStoryteller_Story10Title:: @ 81AF5A9
 	.string "The Evolver TRAINER$"
 
-UnknownString_81AF5BD:: @ 81AF5BD
+gTextStoryteller_Story10Action:: @ 81AF5BD
 	.string "Evolved POKéMON$"
 
-UnknownString_81AF5CD:: @ 81AF5CD
+gTextStoryteller_Story10Text:: @ 81AF5CD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -190,13 +190,13 @@ UnknownString_81AF5CD:: @ 81AF5CD
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
-UnknownString_81AF63F:: @ 81AF63F
+gTextStoryteller_Story11Title:: @ 81AF63F
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
-UnknownString_81AF661:: @ 81AF661
+gTextStoryteller_Story11Action:: @ 81AF661
 	.string "Used POKéMON CENTERS$"
 
-UnknownString_81AF676:: @ 81AF676
+gTextStoryteller_Story11Text:: @ 81AF676
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -204,13 +204,13 @@ UnknownString_81AF676:: @ 81AF676
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
-UnknownString_81AF711:: @ 81AF711
+gTextStoryteller_Story12Title:: @ 81AF711
 	.string "The Homebody TRAINER$"
 
-UnknownString_81AF726:: @ 81AF726
+gTextStoryteller_Story12Action:: @ 81AF726
 	.string "Rested POKéMON at home$"
 
-UnknownString_81AF73D:: @ 81AF73D
+gTextStoryteller_Story12Text:: @ 81AF73D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -218,13 +218,13 @@ UnknownString_81AF73D:: @ 81AF73D
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
-UnknownString_81AF7BF:: @ 81AF7BF
+gTextStoryteller_Story13Title:: @ 81AF7BF
 	.string "The SAFARI-Loving TRAINER$"
 
-UnknownString_81AF7D9:: @ 81AF7D9
+gTextStoryteller_Story13Action:: @ 81AF7D9
 	.string "Entered the SAFARI ZONE$"
 
-UnknownString_81AF7F1:: @ 81AF7F1
+gTextStoryteller_Story13Text:: @ 81AF7F1
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -232,13 +232,13 @@ UnknownString_81AF7F1:: @ 81AF7F1
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
-UnknownString_81AF88A:: @ 81AF88A
+gTextStoryteller_Story14Title:: @ 81AF88A
 	.string "The CUT-Frenzy TRAINER$"
 
-UnknownString_81AF8A1:: @ 81AF8A1
+gTextStoryteller_Story14Action:: @ 81AF8A1
 	.string "Used CUT$"
 
-UnknownString_81AF8AA:: @ 81AF8AA
+gTextStoryteller_Story14Text:: @ 81AF8AA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -246,13 +246,13 @@ UnknownString_81AF8AA:: @ 81AF8AA
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
-UnknownString_81AF91B:: @ 81AF91B
+gTextStoryteller_Story15Title:: @ 81AF91B
 	.string "The ROCK-SMASHING TRAINER$"
 
-UnknownString_81AF935:: @ 81AF935
+gTextStoryteller_Story15Action:: @ 81AF935
 	.string "Smashed rocks$"
 
-UnknownString_81AF943:: @ 81AF943
+gTextStoryteller_Story15Text:: @ 81AF943
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -260,13 +260,13 @@ UnknownString_81AF943:: @ 81AF943
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can’t leave a stone unsmashed!$"
 
-UnknownString_81AF9C8:: @ 81AF9C8
+gTextStoryteller_Story16Title:: @ 81AF9C8
 	.string "The Move-Loving TRAINER$"
 
-UnknownString_81AF9E0:: @ 81AF9E0
+gTextStoryteller_Story16Action:: @ 81AF9E0
 	.string "Moved the SECRET BASE$"
 
-UnknownString_81AF9F6:: @ 81AF9F6
+gTextStoryteller_Story16Text:: @ 81AF9F6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -274,13 +274,13 @@ UnknownString_81AF9F6:: @ 81AF9F6
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
-UnknownString_81AFA79:: @ 81AFA79
+gTextStoryteller_Story17Title:: @ 81AFA79
 	.string "The SPLASH-Happy TRAINER$"
 
-UnknownString_81AFA92:: @ 81AFA92
+gTextStoryteller_Story17Action:: @ 81AFA92
 	.string "Used SPLASH$"
 
-UnknownString_81AFA9E:: @ 81AFA9E
+gTextStoryteller_Story17Text:: @ 81AFA9E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -288,13 +288,13 @@ UnknownString_81AFA9E:: @ 81AFA9E
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
-UnknownString_81AFB17:: @ 81AFB17
+gTextStoryteller_Story18Title:: @ 81AFB17
 	.string "The Tenacious TRAINER$"
 
-UnknownString_81AFB2D:: @ 81AFB2D
+gTextStoryteller_Story18Action:: @ 81AFB2D
 	.string "Resorted to using STRUGGLE$"
 
-UnknownString_81AFB48:: @ 81AFB48
+gTextStoryteller_Story18Text:: @ 81AFB48
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -302,13 +302,13 @@ UnknownString_81AFB48:: @ 81AFB48
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
-UnknownString_81AFBD8:: @ 81AFBD8
+gTextStoryteller_Story19Title:: @ 81AFBD8
 	.string "The SLOT Champ$"
 
-UnknownString_81AFBE7:: @ 81AFBE7
+gTextStoryteller_Story19Action:: @ 81AFBE7
 	.string "Won the jackpot on the SLOTS$"
 
-UnknownString_81AFC04:: @ 81AFC04
+gTextStoryteller_Story19Text:: @ 81AFC04
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -316,13 +316,13 @@ UnknownString_81AFC04:: @ 81AFC04
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
-UnknownString_81AFC8A:: @ 81AFC8A
+gTextStoryteller_Story20Title:: @ 81AFC8A
 	.string "The ROULETTE Champ$"
 
-UnknownString_81AFC9D:: @ 81AFC9D
+gTextStoryteller_Story20Action:: @ 81AFC9D
 	.string "Had consecutive ROULETTE wins of$"
 
-UnknownString_81AFCBE:: @ 81AFCBE
+gTextStoryteller_Story20Text:: @ 81AFCBE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -330,13 +330,13 @@ UnknownString_81AFCBE:: @ 81AFCBE
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
-UnknownString_81AFD44:: @ 81AFD44
+gTextStoryteller_Story21Title:: @ 81AFD44
 	.string "The BATTLE TOWER Challenger$"
 
-UnknownString_81AFD60:: @ 81AFD60
+gTextStoryteller_Story21Action:: @ 81AFD60
 	.string "Took the BATTLE TOWER challenge$"
 
-UnknownString_81AFD80:: @ 81AFD80
+gTextStoryteller_Story21Text:: @ 81AFD80
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -344,13 +344,13 @@ UnknownString_81AFD80:: @ 81AFD80
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
-UnknownString_81AFE1D:: @ 81AFE1D
+gTextStoryteller_Story22Title:: @ 81AFE1D
 	.string "The Blend-Loving TRAINER$"
 
-UnknownString_81AFE36:: @ 81AFE36
+gTextStoryteller_Story22Action:: @ 81AFE36
 	.string "Made {POKEBLOCK}S$"
 
-UnknownString_81AFE42:: @ 81AFE42
+gTextStoryteller_Story22Text:: @ 81AFE42
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -358,13 +358,13 @@ UnknownString_81AFE42:: @ 81AFE42
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
-UnknownString_81AFEC2:: @ 81AFEC2
+gTextStoryteller_Story23Title:: @ 81AFEC2
 	.string "The CONTEST-Loving TRAINER$"
 
-UnknownString_81AFEDD:: @ 81AFEDD
+gTextStoryteller_Story23Action:: @ 81AFEDD
 	.string "Entered CONTESTS$"
 
-UnknownString_81AFEEE:: @ 81AFEEE
+gTextStoryteller_Story23Text:: @ 81AFEEE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -372,13 +372,13 @@ UnknownString_81AFEEE:: @ 81AFEEE
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
-UnknownString_81AFF68:: @ 81AFF68
+gTextStoryteller_Story24Title:: @ 81AFF68
 	.string "The CONTEST Master$"
 
-UnknownString_81AFF7B:: @ 81AFF7B
+gTextStoryteller_Story24Action:: @ 81AFF7B
 	.string "Won CONTESTS$"
 
-UnknownString_81AFF88:: @ 81AFF88
+gTextStoryteller_Story24Text:: @ 81AFF88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -386,13 +386,13 @@ UnknownString_81AFF88:: @ 81AFF88
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
-UnknownString_81AFFFB:: @ 81AFFFB
+gTextStoryteller_Story25Title:: @ 81AFFFB
 	.string "The Happy Shopper$"
 
-UnknownString_81B000D:: @ 81B000D
+gTextStoryteller_Story25Action:: @ 81B000D
 	.string "Shopped$"
 
-UnknownString_81B0015:: @ 81B0015
+gTextStoryteller_Story25Text:: @ 81B0015
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -400,13 +400,13 @@ UnknownString_81B0015:: @ 81B0015
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
-UnknownString_81B009D:: @ 81B009D
+gTextStoryteller_Story26Title:: @ 81B009D
 	.string "The Item-Finding TRAINER$"
 
-UnknownString_81B00B6:: @ 81B00B6
+gTextStoryteller_Story26Action:: @ 81B00B6
 	.string "Used an ITEMFINDER$"
 
-UnknownString_81B00C9:: @ 81B00C9
+gTextStoryteller_Story26Text:: @ 81B00C9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -414,13 +414,13 @@ UnknownString_81B00C9:: @ 81B00C9
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
-UnknownString_81B014D:: @ 81B014D
+gTextStoryteller_Story27Title:: @ 81B014D
 	.string "The Rain-Soaked TRAINER$"
 
-UnknownString_81B0165:: @ 81B0165
+gTextStoryteller_Story27Action:: @ 81B0165
 	.string "Got rained on$"
 
-UnknownString_81B0173:: @ 81B0173
+gTextStoryteller_Story27Text:: @ 81B0173
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -428,13 +428,13 @@ UnknownString_81B0173:: @ 81B0173
 	.string "{STR_VAR_3}’s charisma must even\n"
 	.string "attract rain!$"
 
-UnknownString_81B01E9:: @ 81B01E9
+gTextStoryteller_Story28Title:: @ 81B01E9
 	.string "The Avid POKéDEX Reader$"
 
-UnknownString_81B0201:: @ 81B0201
+gTextStoryteller_Story28Action:: @ 81B0201
 	.string "Checked a POKéDEX$"
 
-UnknownString_81B0213:: @ 81B0213
+gTextStoryteller_Story28Text:: @ 81B0213
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -442,13 +442,13 @@ UnknownString_81B0213:: @ 81B0213
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
-UnknownString_81B0290:: @ 81B0290
+gTextStoryteller_Story29Title:: @ 81B0290
 	.string "The RIBBON Collector$"
 
-UnknownString_81B02A5:: @ 81B02A5
+gTextStoryteller_Story29Action:: @ 81B02A5
 	.string "Received RIBBONS$"
 
-UnknownString_81B02B6:: @ 81B02B6
+gTextStoryteller_Story29Text:: @ 81B02B6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -456,13 +456,13 @@ UnknownString_81B02B6:: @ 81B02B6
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
-UnknownString_81B0337:: @ 81B0337
+gTextStoryteller_Story30Title:: @ 81B0337
 	.string "The Ledge-Jumping TRAINER$"
 
-UnknownString_81B0351:: @ 81B0351
+gTextStoryteller_Story30Action:: @ 81B0351
 	.string "Jumped down ledges$"
 
-UnknownString_81B0364:: @ 81B0364
+gTextStoryteller_Story30Text:: @ 81B0364
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -470,26 +470,26 @@ UnknownString_81B0364:: @ 81B0364
 	.string "If there’s a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can’t ignore it!$"
 
-UnknownString_81B03E9:: @ 81B03E9
+gTextStoryteller_Story31Title:: @ 81B03E9
 	.string "The Legendary TV Viewer$"
 
-UnknownString_81B0401:: @ 81B0401
+gTextStoryteller_Story31Action:: @ 81B0401
 	.string "Watched TV$"
 
-UnknownString_81B040C:: @ 81B040C
+gTextStoryteller_Story31Text:: @ 81B040C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
-UnknownString_81B046E:: @ 81B046E
+gTextStoryteller_Story32Title:: @ 81B046E
 	.string "The Time-Conscious TRAINER$"
 
-UnknownString_81B0489:: @ 81B0489
+gTextStoryteller_Story32Action:: @ 81B0489
 	.string "Checked the time$"
 
-UnknownString_81B049A:: @ 81B049A
+gTextStoryteller_Story32Text:: @ 81B049A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -497,13 +497,13 @@ UnknownString_81B049A:: @ 81B049A
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who’s conscious of the time.$"
 
-UnknownString_81B0523:: @ 81B0523
+gTextStoryteller_Story33Title:: @ 81B0523
 	.string "The POKéMON LOTTERY Wizard$"
 
-UnknownString_81B053E:: @ 81B053E
+gTextStoryteller_Story33Action:: @ 81B053E
 	.string "Won POKéMON LOTTERIES$"
 
-UnknownString_81B0554:: @ 81B0554
+gTextStoryteller_Story33Text:: @ 81B0554
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -511,13 +511,13 @@ UnknownString_81B0554:: @ 81B0554
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
-UnknownString_81B05D8:: @ 81B05D8
+gTextStoryteller_Story34Title:: @ 81B05D8
 	.string "The DAY CARE-Using Trainer$"
 
-UnknownString_81B05F3:: @ 81B05F3
+gTextStoryteller_Story34Action:: @ 81B05F3
 	.string "Left POKéMON at the DAY CARE$"
 
-UnknownString_81B0610:: @ 81B0610
+gTextStoryteller_Story34Text:: @ 81B0610
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -525,13 +525,13 @@ UnknownString_81B0610:: @ 81B0610
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
-UnknownString_81B06A9:: @ 81B06A9
+gTextStoryteller_Story35Title:: @ 81B06A9
 	.string "The CABLE CAR-Loving TRAINER$"
 
-UnknownString_81B06C6:: @ 81B06C6
+gTextStoryteller_Story35Action:: @ 81B06C6
 	.string "Rode the CABLE CAR$"
 
-UnknownString_81B06D9:: @ 81B06D9
+gTextStoryteller_Story35Text:: @ 81B06D9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -539,13 +539,13 @@ UnknownString_81B06D9:: @ 81B06D9
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who’s up and down all the time!$"
 
-UnknownString_81B0763:: @ 81B0763
+gTextStoryteller_Story36Title:: @ 81B0763
 	.string "The Hot Spring-Loving TRAINER$"
 
-UnknownString_81B0781:: @ 81B0781
+gTextStoryteller_Story36Action:: @ 81B0781
 	.string "Bathed in hot springs$"
 
-UnknownString_81B0797:: @ 81B0797
+gTextStoryteller_Story36Text:: @ 81B0797
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
diff --git a/data/text/trader.inc b/data/text/trader.inc
index dba63bcf8..599344091 100644
--- a/data/text/trader.inc
+++ b/data/text/trader.inc
@@ -1,57 +1,57 @@
-MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F
+gTextTrader_Introduction:: @ 81AE88F
 	.string "Hi, I’m the TRADER.\n"
 	.string "Want to trade decorations with me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6
+gTextTrader_FeelUnwanted1:: @ 81AE8C6
 	.string "Oh...\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF
+gTextTrader_TradedAlready:: @ 81AE8DF
 	.string "But we’ve traded decorations already,\n"
 	.string "you and I.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910
+gTextTrader_MenuPrompt:: @ 81AE910
 	.string "If you see any decorative item that\n"
 	.string "you want of mine, speak up.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950
+gTextTrader_DontWantAnything:: @ 81AE950
 	.string "You don’t want anything?\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C
+gTextTrader_ItemOnceBelongedTo:: @ 81AE97C
 	.string "That decorative item once belonged\n"
 	.string "to {STR_VAR_1}.\p"
 	.string "Do you want it?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6
+gTextTrader_YouDontHaveDecorations:: @ 81AE9B6
 	.string "Uh... Wait a second. You don’t have a\n"
 	.string "single piece of decoration!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8
+gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8
 	.string "Okay, pick the decoration that you’ll\n"
 	.string "trade to me.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B
+gTextTrader_FeelUnwanted2:: @ 81AEA2B
 	.string "You won’t trade with me?\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57
+gTextTrader_NoRoomForThis:: @ 81AEA57
 	.string "You’ve got all the {STR_VAR_2}S that can\n"
 	.string "be stored. You’ve no room for this.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B
+gTextTrader_SoWellTrade:: @ 81AEA9B
 	.string "Okay, so we’ll trade my {STR_VAR_3}\n"
 	.string "for your {STR_VAR_2}?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3
+gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3
 	.string "That piece of decoration is in use.\n"
 	.string "You can’t trade it.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB
+gTextTrader_ThenWellTrade:: @ 81AEAFB
 	.string "Then we’ll trade!\n"
 	.string "I’ll send my decoration to your PC.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31
+gTextTrader_ICantTradeThatOneAway:: @ 81AEB31
 	.string "Oops! Sorry!\n"
 	.string "That’s a really rare piece of decoration.\l"
 	.string "I can’t trade that one away!\p"
diff --git a/data/trainer_see.s b/data/trainer_see.s
index 57eeae061..04a787f0c 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -4,47 +4,6 @@
 	.section .rodata
 
 	.align 2
-gSpriteImage_839B308:: @ 839B308
-	.incbin "graphics/unknown_sprites/839B4E0/0.4bpp"
-
-	.align 2
-gSpriteImage_839B388:: @ 839B388
-	.incbin "graphics/unknown_sprites/839B4E0/1.4bpp"
-
-	.align 2
-gSpriteImage_839B408:: @ 839B408
-	.incbin "graphics/unknown_sprites/839B408.4bpp"
-
-	.align 2
-gIsTrainerInRange:: @ 839B488
-	.4byte IsTrainerInRangeSouth
-	.4byte IsTrainerInRangeNorth
-	.4byte IsTrainerInRangeWest
-	.4byte IsTrainerInRangeEast
-
-	.align 2
-gTrainerSeeFuncList:: @ 839B498
-	.4byte sub_8084394
-	.4byte sub_8084398
-	.4byte sub_80843DC
-	.4byte sub_808441C
-	.4byte sub_8084478
-	.4byte sub_8084534
-	.4byte sub_8084578
-	.4byte sub_80845AC
-	.4byte sub_80845C8
-	.4byte sub_80845FC
-	.4byte sub_8084654
-	.4byte sub_80846C8
-
-	.align 2
-gTrainerSeeFuncList2:: @ 839B4C8
-	.4byte sub_80845C8
-	.4byte sub_80845FC
-	.4byte sub_8084654
-	.4byte sub_80846C8
-
-	.align 2
 gOamData_839B4D8:: @ 839B4D8
 	.2byte 0x0000
 	.2byte 0x4000
diff --git a/include/bard_music.h b/include/bard_music.h
new file mode 100644
index 000000000..529fd50f8
--- /dev/null
+++ b/include/bard_music.h
@@ -0,0 +1,31 @@
+#ifndef GUARD_BARD_MUSIC_H
+#define GUARD_BARD_MUSIC_H
+
+struct BardSound;
+
+struct BardPhoneme
+{
+    /*0x00*/ u16 sound;
+    /*0x02*/ u16 length;
+    /*0x04*/ s16 pitch;
+    /*0x06*/ u16 volume;
+};
+
+struct BardSong
+{
+    /*0x00*/ u8 currWord;
+    /*0x01*/ u8 currPhoneme;
+    /*0x02*/ u8 phonemeTimer;
+    /*0x03*/ u8 state;
+    /*0x04*/ s16 var04;
+    /*0x06*/ u16 volume;
+    /*0x08*/ s16 pitch;
+    /*0x0A*/ s16 voiceInflection;
+    /*0x0C*/ u16 lyrics[6];
+    /*0x18*/ struct BardPhoneme phonemes[6];
+};
+
+const struct BardSound *GetWordSounds(u16 arg0, u16 arg1);
+s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 arg2);
+
+#endif  // GUARD_BARD_MUSIC_H
diff --git a/include/battle.h b/include/battle.h
index 72211f50f..47cb7cf8e 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -173,6 +173,20 @@
 #define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT))
 #define WEATHER_HAIL                (1 << 7)
 
+enum
+{
+    BATTLE_TERRAIN_GRASS,
+    BATTLE_TERRAIN_LONG_GRASS,
+    BATTLE_TERRAIN_SAND,
+    BATTLE_TERRAIN_UNDERWATER,
+    BATTLE_TERRAIN_WATER,
+    BATTLE_TERRAIN_POND,
+    BATTLE_TERRAIN_MOUNTAIN,
+    BATTLE_TERRAIN_CAVE,
+    BATTLE_TERRAIN_BUILDING,
+    BATTLE_TERRAIN_PLAIN,
+};
+
 // needed to match the hack that is get_item, thanks cam, someone else clean this up later.
 extern u8 unk_2000000[];
 
diff --git a/include/battle_setup.h b/include/battle_setup.h
index c8c463f6d..444ab5467 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -40,72 +40,38 @@ struct TrainerPartyMember3
     u16 moves[4];
 };
 
-struct TrainerBattleSpec
-{
-    void *ptr;
-    u8 ptrType;
-};
-
 struct TrainerEyeTrainer
 {
-   u16 trainerNums[5];
+   u16 opponentIDs[5];  // Each of these trainers has 5 increasingly stronger teams.
    u16 mapGroup;
    u16 mapNum;
 };
 
-//void task01_battle_start(u8 taskId);
-//void task_add_01_battle_start(u8 transition, u16 song);
-void CheckForSafariZoneAndProceed(void);
-void StartBattle_StandardWild(void);
-void StartBattle_Roamer(void);
-void StartBattle_Safari(void);
-//void task_add_01_battle_start_with_music_and_stats(void);
-//void StartBattle_WallyTutorial(void);
-void StartBattle_ScriptedWild(void);
-//void StartBattle_SouthernIsland(void);
-//void StartBattle_Rayquaza(void);
-//void StartBattle_GroudonKyogre(void);
-//void StartBattle_Regi(void);
-void HandleWildBattleEnd(void);
-void HandleScriptedWildBattleEnd(void);
-s8 GetBattleTerrain(void);
-//s8 GetBattleTransitionTypeByMap(void);
-//u16 GetSumOfPartyMonLevel(u8 numMons);
-//u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons);
-u8 GetWildBattleTransition(void);
-u8 GetTrainerBattleTransition(void);
-u8 GetBattleTowerBattleTransition(void);
-//void ChooseStarter(void);
-void CB2_GiveStarter(void);
-void CB2_StartFirstBattle(void);
-void HandleFirstBattleEnd(void);
-//u32 TrainerBattleLoadArg32(u8 *ptr);
-//u16 TrainerBattleLoadArg16(u8 *ptr);
-//u8 TrainerBattleLoadArg8(u8 *ptr);
-//u16 trainerflag_opponent(void);
-bool32 battle_exit_is_player_defeat(u32 a1);
-//void sub_80822BC(void);
-//void TrainerBattleLoadArgs(const struct TrainerBattleSpec *specs, u8 *data);
-//void battle_80801F0(void);
-u8 *TrainerBattleConfigure(const u8 *data);
+void BattleSetup_StartWildBattle(void);
+void BattleSetup_StartRoamerBattle(void);
+void BattleSetup_StartScriptedWildBattle(void);
+s8 BattleSetup_GetTerrain(void);
+u8 BattleSetup_GetBattleTowerBattleTransition(void);
+u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
 void TrainerWantsBattle(u8, u8 *);
+
 bool32 GetTrainerFlagFromScriptPointer(u8 *data);
 //void sub_8082524(void);
-//u8 sub_8082558(void);
-//u8 sub_8082564(void);
+//u8 ScrSpecial_GetTrainerBattleMode(void);
+//u8 ScrSpecial_HasTrainerBeenFought(void);
 //void sub_808257C(void);
 //void unref_sub_8082590(void); // unused
-u8 trainer_flag_check(u16);
+u8 HasTrainerAlreadyBeenFought(u16);
 void trainer_flag_set(u16);
 void trainer_flag_clear(u16);
-void sub_80825E4(void);
+void BattleSetup_StartTrainerBattle(void);
 void sub_808260C(void);
 void do_choose_name_or_words_screen(void);
-//void sub_80826B0(void);
-//void sub_80826D8(void);
-u8 *sub_80826E8(void);
-u8 *sub_8082700(void);
-//void sub_8082718(void);
+//void ScrSpecial_StartTrainerEyeRematch(void);
+//void ScrSpecial_ShowTrainerIntroSpeech(void);
+u8 *BattleSetup_GetScriptAddrAfterBattle(void);
+u8 *BattleSetup_GetTrainerPostBattleScript(void);
+//void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
 //void PlayTrainerEncounterMusic(void);
 //u8 *SanitizeString(u8 *str);
 u8 *sub_808281C(void);
@@ -118,7 +84,7 @@ u8 *sub_8082880(void);
 //s32 sub_80829A8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum);
 //s32 sub_80829E8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum);
 //bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
-//bool8 sub_8082A54(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
+//bool8 DoesTrainerEyeTrainerWantRematch(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //void sub_8082AE4(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
 //bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 trainerNum);
@@ -130,7 +96,7 @@ s32 sub_8082C0C(u16 mapGroup, u16 mapNum);
 s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum);
 u16 sub_8082C4C(u16 a1);
 //s32 sub_8082C68(void);
-//u8 sub_8082C9C(void);
+//u8 ScrSpecial_GetTrainerEyeRematchFlag(void);
 void sub_8082CB8(void);
 
 #endif // GUARD_BATTLE_SETUP_H
diff --git a/include/battle_transition.h b/include/battle_transition.h
index ca6869c93..0b8766e87 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -1,8 +1,8 @@
 #ifndef GUARD_BATTLE_TRANSITION_H
 #define GUARD_BATTLE_TRANSITION_H
 
-void sub_811AABC(u8 transitionID);
-void sub_811AAD8(u8 transitionID);
+void BattleTransition_StartOnField(u8 transitionID);
+void BattleTransition_Start(u8 transitionID);
 bool8 IsBattleTransitionDone(void);
 
 #define TRANSITIONS_NO         17
diff --git a/include/braille_puzzles.h b/include/braille_puzzles.h
index 2b0e2bb96..e9d1f5d7c 100644
--- a/include/braille_puzzles.h
+++ b/include/braille_puzzles.h
@@ -2,6 +2,7 @@
 #define GUARD_BRAILLEPUZZLES_H
 
 bool8 ShouldDoBrailleStrengthEffect(void);
+bool8 ShouldDoBrailleFlyEffect(void);
 void DoBrailleStrengthEffect(void);
 void UseFlyAncientTomb_Callback(void);
 void UseFlyAncientTomb_Finish(void);
@@ -10,5 +11,6 @@ bool32 BrailleWait_CheckButtonPress(void);
 void SealedChamberShakingEffect(u8 taskId);
 bool8 ShouldDoBrailleDigEffect(void);
 void DoBrailleDigEffect(void);
+void DoBrailleFlyEffect(void);
 
 #endif
diff --git a/include/cable_club.h b/include/cable_club.h
index 9e6a703e3..a2fe46b30 100644
--- a/include/cable_club.h
+++ b/include/cable_club.h
@@ -3,20 +3,22 @@
 
 #include "task.h"
 
-void sub_8082D4C();
-void sub_8082D60(u8, u8);
-u16 sub_8082D9C(u8, u8);
-u32 sub_8082DF4(u8);
-u32 sub_8082E28(u8);
-u32 sub_8082EB8(u8);
-void sub_8082FEC(u8 taskId);
-void sub_80833C4(u8 taskId);
-void sub_8083418(u8 taskId);
-u8 sub_8083444(u8 taskId);
+void sub_808347C(u8 arg0);
+void sub_80834E4(void);
+void sub_808350C(void);
+void sub_80835D8(void);
+void sub_8083614(void);
+void sub_808363C(void);
 u8 sub_8083664(void);
-void sub_8083A84(TaskFunc);
-s32 sub_8083BF4(u8 id);
-void sub_8083C50(u8);
-void sub_8083188(u8 taskId);
+void sub_8083820(void);
+void sub_80839A4(void);
+void sub_80839D0(void);
+void sub_8083A84(TaskFunc followupFunc);
+void sub_8083B5C(void);
+void sub_8083B80(void);
+void sub_8083B90(void);
+void sub_8083BDC(void);
+bool32 sub_8083BF4(u8 linkPlayerIndex);
+void sub_8083C50(u8 taskId);
 
 #endif // GUARD_CABLE_CLUB_H
diff --git a/include/data2.h b/include/data2.h
index 2837a4451..53a90944d 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -3,12 +3,7 @@
 
 #include "sprite.h"
 
-struct UnknownStructD2
-{
-    u32 unk0;
-    u32 unk4;
-    u32 unk8;
-};
+struct UnknownTaskStruct;
 
 struct MonCoords
 {
@@ -44,10 +39,10 @@ extern u8 gEnemyMonElevation[];
 extern const u8 gTrainerClassNames[][13];
 extern const struct Trainer gTrainers[];
 extern u8 gSpeciesNames[][11];
-extern u8 gMoveNames[][13];
+extern const u8 gMoveNames[][13];
 extern const u8 gAbilityNames[][13];
 extern const u8 gTypeNames[][7];
-extern const struct UnknownStructD2 gUnknown_081F9674;
+extern const struct UnknownTaskStruct gUnknown_081F9674;
 extern const u8 gUnknown_081F96C8[];
 extern struct CompressedSpriteSheet gUnknown_081FAEA4;
 extern struct CompressedSpritePalette gUnknown_081FAEAC;
diff --git a/include/diploma.h b/include/diploma.h
index 81e9e3bb2..8d730fa05 100644
--- a/include/diploma.h
+++ b/include/diploma.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_DIPLOMA_H
 #define GUARD_DIPLOMA_H
 
-void sub_8145D88(void);
+void CB2_ShowDiploma(void);
 
 #endif // GUARD_DIPLOMA_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 03e9bb737..702082966 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_EASYCHAT_H
 #define GUARD_EASYCHAT_H
 
-enum {
+enum
+{
     EC_GROUP_POKEMON,
     EC_GROUP_TRAINER,
     EC_GROUP_STATUS,
@@ -26,6 +27,1037 @@ enum {
     EC_GROUP_POKEMON_2,
 };
 
+// TRAINER
+#define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0
+#define EC_WORD_GOTCHA       (EC_GROUP_TRAINER << 9) | 0x1
+#define EC_WORD_TRADE        (EC_GROUP_TRAINER << 9) | 0x2
+#define EC_WORD_SAPPHIRE     (EC_GROUP_TRAINER << 9) | 0x3
+#define EC_WORD_EVOLVE       (EC_GROUP_TRAINER << 9) | 0x4
+#define EC_WORD_ENCYCLOPEDIA (EC_GROUP_TRAINER << 9) | 0x5
+#define EC_WORD_NATURE       (EC_GROUP_TRAINER << 9) | 0x6
+#define EC_WORD_CENTER       (EC_GROUP_TRAINER << 9) | 0x7
+#define EC_WORD_EGG          (EC_GROUP_TRAINER << 9) | 0x8
+#define EC_WORD_LINK         (EC_GROUP_TRAINER << 9) | 0x9
+#define EC_WORD_SP_ABILITY   (EC_GROUP_TRAINER << 9) | 0xa
+#define EC_WORD_TRAINER      (EC_GROUP_TRAINER << 9) | 0xb
+#define EC_WORD_VERSION      (EC_GROUP_TRAINER << 9) | 0xc
+#define EC_WORD_POKENAV      (EC_GROUP_TRAINER << 9) | 0xd
+#define EC_WORD_POKEMON      (EC_GROUP_TRAINER << 9) | 0xe
+#define EC_WORD_GET          (EC_GROUP_TRAINER << 9) | 0xf
+#define EC_WORD_POKEDEX      (EC_GROUP_TRAINER << 9) | 0x10
+#define EC_WORD_RUBY         (EC_GROUP_TRAINER << 9) | 0x11
+#define EC_WORD_LEVEL        (EC_GROUP_TRAINER << 9) | 0x12
+
+// STATUS
+#define EC_WORD_DARK         (EC_GROUP_STATUS << 9) | 0x0
+#define EC_WORD_STENCH       (EC_GROUP_STATUS << 9) | 0x1
+#define EC_WORD_THICK_FAT    (EC_GROUP_STATUS << 9) | 0x2
+#define EC_WORD_RAIN_DISH    (EC_GROUP_STATUS << 9) | 0x3
+#define EC_WORD_DRIZZLE      (EC_GROUP_STATUS << 9) | 0x4
+#define EC_WORD_ARENA_TRAP   (EC_GROUP_STATUS << 9) | 0x5
+#define EC_WORD_INTIMIDATE   (EC_GROUP_STATUS << 9) | 0x6
+#define EC_WORD_ROCK_HEAD    (EC_GROUP_STATUS << 9) | 0x7
+#define EC_WORD_COLOR        (EC_GROUP_STATUS << 9) | 0x8
+#define EC_WORD_ALT_COLOR    (EC_GROUP_STATUS << 9) | 0x9
+#define EC_WORD_ROCK         (EC_GROUP_STATUS << 9) | 0xa
+#define EC_WORD_BEAUTIFUL    (EC_GROUP_STATUS << 9) | 0xb
+#define EC_WORD_BEAUTY       (EC_GROUP_STATUS << 9) | 0xc
+#define EC_WORD_AIR_LOCK     (EC_GROUP_STATUS << 9) | 0xd
+#define EC_WORD_PSYCHIC      (EC_GROUP_STATUS << 9) | 0xe
+#define EC_WORD_HYPER_CUTTER (EC_GROUP_STATUS << 9) | 0xf
+#define EC_WORD_FIGHTING     (EC_GROUP_STATUS << 9) | 0x10
+#define EC_WORD_SHADOW_TAG   (EC_GROUP_STATUS << 9) | 0x11
+#define EC_WORD_SMART        (EC_GROUP_STATUS << 9) | 0x12
+#define EC_WORD_SMARTNESS    (EC_GROUP_STATUS << 9) | 0x13
+#define EC_WORD_SPEED_BOOST  (EC_GROUP_STATUS << 9) | 0x14
+#define EC_WORD_COOL         (EC_GROUP_STATUS << 9) | 0x15
+#define EC_WORD_COOLNESS     (EC_GROUP_STATUS << 9) | 0x16
+#define EC_WORD_BATTLE_ARMOR (EC_GROUP_STATUS << 9) | 0x17
+#define EC_WORD_CUTE         (EC_GROUP_STATUS << 9) | 0x18
+#define EC_WORD_CUTENESS     (EC_GROUP_STATUS << 9) | 0x19
+#define EC_WORD_STURDY       (EC_GROUP_STATUS << 9) | 0x1a
+#define EC_WORD_SUCTION_CUPS (EC_GROUP_STATUS << 9) | 0x1b
+#define EC_WORD_GRASS        (EC_GROUP_STATUS << 9) | 0x1c
+#define EC_WORD_CLEAR_BODY   (EC_GROUP_STATUS << 9) | 0x1d
+#define EC_WORD_TORRENT      (EC_GROUP_STATUS << 9) | 0x1e
+#define EC_WORD_GHOST        (EC_GROUP_STATUS << 9) | 0x1f
+#define EC_WORD_ICE          (EC_GROUP_STATUS << 9) | 0x20
+#define EC_WORD_GUTS         (EC_GROUP_STATUS << 9) | 0x21
+#define EC_WORD_ROUGH_SKIN   (EC_GROUP_STATUS << 9) | 0x22
+#define EC_WORD_SHELL_ARMOR  (EC_GROUP_STATUS << 9) | 0x23
+#define EC_WORD_NATURAL_CURE (EC_GROUP_STATUS << 9) | 0x24
+#define EC_WORD_DAMP         (EC_GROUP_STATUS << 9) | 0x25
+#define EC_WORD_GROUND       (EC_GROUP_STATUS << 9) | 0x26
+#define EC_WORD_LIMBER       (EC_GROUP_STATUS << 9) | 0x27
+#define EC_WORD_MAGNET_PULL  (EC_GROUP_STATUS << 9) | 0x28
+#define EC_WORD_WHITE_SMOKE  (EC_GROUP_STATUS << 9) | 0x29
+#define EC_WORD_SYNCHRONIZE  (EC_GROUP_STATUS << 9) | 0x2a
+#define EC_WORD_OVERGROW     (EC_GROUP_STATUS << 9) | 0x2b
+#define EC_WORD_SWIFT_SWIM   (EC_GROUP_STATUS << 9) | 0x2c
+#define EC_WORD_SAND_STREAM  (EC_GROUP_STATUS << 9) | 0x2d
+#define EC_WORD_SAND_VEIL    (EC_GROUP_STATUS << 9) | 0x2e
+#define EC_WORD_KEEN_EYE     (EC_GROUP_STATUS << 9) | 0x2f
+#define EC_WORD_INNER_FOCUS  (EC_GROUP_STATUS << 9) | 0x30
+#define EC_WORD_STATIC       (EC_GROUP_STATUS << 9) | 0x31
+#define EC_WORD_TYPE         (EC_GROUP_STATUS << 9) | 0x32
+#define EC_WORD_TOUGH        (EC_GROUP_STATUS << 9) | 0x33
+#define EC_WORD_TOUGHNESS    (EC_GROUP_STATUS << 9) | 0x34
+#define EC_WORD_SHED_SKIN    (EC_GROUP_STATUS << 9) | 0x35
+#define EC_WORD_HUGE_POWER   (EC_GROUP_STATUS << 9) | 0x36
+#define EC_WORD_VOLT_ABSORB  (EC_GROUP_STATUS << 9) | 0x37
+#define EC_WORD_WATER_ABSORB (EC_GROUP_STATUS << 9) | 0x38
+#define EC_WORD_ELECTRIC     (EC_GROUP_STATUS << 9) | 0x39
+#define EC_WORD_FORECAST     (EC_GROUP_STATUS << 9) | 0x3a
+#define EC_WORD_SERENE_GRACE (EC_GROUP_STATUS << 9) | 0x3b
+#define EC_WORD_POISON       (EC_GROUP_STATUS << 9) | 0x3c
+#define EC_WORD_POISON_POINT (EC_GROUP_STATUS << 9) | 0x3d
+#define EC_WORD_DRAGON       (EC_GROUP_STATUS << 9) | 0x3e
+#define EC_WORD_TRACE        (EC_GROUP_STATUS << 9) | 0x3f
+#define EC_WORD_OBLIVIOUS    (EC_GROUP_STATUS << 9) | 0x40
+#define EC_WORD_TRUANT       (EC_GROUP_STATUS << 9) | 0x41
+#define EC_WORD_RUN_AWAY     (EC_GROUP_STATUS << 9) | 0x42
+#define EC_WORD_STICKY_HOLD  (EC_GROUP_STATUS << 9) | 0x43
+#define EC_WORD_CLOUD_NINE   (EC_GROUP_STATUS << 9) | 0x44
+#define EC_WORD_NORMAL       (EC_GROUP_STATUS << 9) | 0x45
+#define EC_WORD_STEEL        (EC_GROUP_STATUS << 9) | 0x46
+#define EC_WORD_ILLUMINATE   (EC_GROUP_STATUS << 9) | 0x47
+#define EC_WORD_EARLY_BIRD   (EC_GROUP_STATUS << 9) | 0x48
+#define EC_WORD_HUSTLE       (EC_GROUP_STATUS << 9) | 0x49
+#define EC_WORD_SHINE        (EC_GROUP_STATUS << 9) | 0x4a
+#define EC_WORD_FLYING       (EC_GROUP_STATUS << 9) | 0x4b
+#define EC_WORD_DROUGHT      (EC_GROUP_STATUS << 9) | 0x4c
+#define EC_WORD_LIGHTNINGROD (EC_GROUP_STATUS << 9) | 0x4d
+#define EC_WORD_COMPOUNDEYES (EC_GROUP_STATUS << 9) | 0x4e
+#define EC_WORD_MARVEL_SCALE (EC_GROUP_STATUS << 9) | 0x4f
+#define EC_WORD_WONDER_GUARD (EC_GROUP_STATUS << 9) | 0x50
+#define EC_WORD_INSOMNIA     (EC_GROUP_STATUS << 9) | 0x51
+#define EC_WORD_LEVITATE     (EC_GROUP_STATUS << 9) | 0x52
+#define EC_WORD_PLUS         (EC_GROUP_STATUS << 9) | 0x53
+#define EC_WORD_PRESSURE     (EC_GROUP_STATUS << 9) | 0x54
+#define EC_WORD_LIQUID_OOZE  (EC_GROUP_STATUS << 9) | 0x55
+#define EC_WORD_COLOR_CHANGE (EC_GROUP_STATUS << 9) | 0x56
+#define EC_WORD_SOUNDPROOF   (EC_GROUP_STATUS << 9) | 0x57
+#define EC_WORD_EFFECT_SPORE (EC_GROUP_STATUS << 9) | 0x58
+#define EC_WORD_PKRS         (EC_GROUP_STATUS << 9) | 0x59
+#define EC_WORD_FIRE         (EC_GROUP_STATUS << 9) | 0x5a
+#define EC_WORD_FLAME_BODY   (EC_GROUP_STATUS << 9) | 0x5b
+#define EC_WORD_MINUS        (EC_GROUP_STATUS << 9) | 0x5c
+#define EC_WORD_OWN_TEMPO    (EC_GROUP_STATUS << 9) | 0x5d
+#define EC_WORD_MAGMA_ARMOR  (EC_GROUP_STATUS << 9) | 0x5e
+#define EC_WORD_WATER        (EC_GROUP_STATUS << 9) | 0x5f
+#define EC_WORD_WATER_VEIL   (EC_GROUP_STATUS << 9) | 0x60
+#define EC_WORD_BUG          (EC_GROUP_STATUS << 9) | 0x61
+#define EC_WORD_SWARM        (EC_GROUP_STATUS << 9) | 0x62
+#define EC_WORD_CUTE_CHARM   (EC_GROUP_STATUS << 9) | 0x63
+#define EC_WORD_IMMUNITY     (EC_GROUP_STATUS << 9) | 0x64
+#define EC_WORD_BLAZE        (EC_GROUP_STATUS << 9) | 0x65
+#define EC_WORD_PICKUP       (EC_GROUP_STATUS << 9) | 0x66
+#define EC_WORD_PATTERN      (EC_GROUP_STATUS << 9) | 0x67
+#define EC_WORD_FLASH_FIRE   (EC_GROUP_STATUS << 9) | 0x68
+#define EC_WORD_VITAL_SPIRIT (EC_GROUP_STATUS << 9) | 0x69
+#define EC_WORD_CHLOROPHYLL  (EC_GROUP_STATUS << 9) | 0x6a
+#define EC_WORD_PURE_POWER   (EC_GROUP_STATUS << 9) | 0x6b
+#define EC_WORD_SHIELD_DUST  (EC_GROUP_STATUS << 9) | 0x6c
+
+// BATTLE
+#define EC_WORD_MATCH_UP    (EC_GROUP_BATTLE << 9) | 0x0
+#define EC_WORD_GO          (EC_GROUP_BATTLE << 9) | 0x1
+#define EC_WORD_NO_1        (EC_GROUP_BATTLE << 9) | 0x2
+#define EC_WORD_DECIDE      (EC_GROUP_BATTLE << 9) | 0x3
+#define EC_WORD_LET_ME_WIN  (EC_GROUP_BATTLE << 9) | 0x4
+#define EC_WORD_WINS        (EC_GROUP_BATTLE << 9) | 0x5
+#define EC_WORD_WIN         (EC_GROUP_BATTLE << 9) | 0x6
+#define EC_WORD_WON         (EC_GROUP_BATTLE << 9) | 0x7
+#define EC_WORD_IF_I_WIN    (EC_GROUP_BATTLE << 9) | 0x8
+#define EC_WORD_WHEN_I_WIN  (EC_GROUP_BATTLE << 9) | 0x9
+#define EC_WORD_CAN_T_WIN   (EC_GROUP_BATTLE << 9) | 0xa
+#define EC_WORD_CAN_WIN     (EC_GROUP_BATTLE << 9) | 0xb
+#define EC_WORD_NO_MATCH    (EC_GROUP_BATTLE << 9) | 0xc
+#define EC_WORD_SPIRIT      (EC_GROUP_BATTLE << 9) | 0xd
+#define EC_WORD_DECIDED     (EC_GROUP_BATTLE << 9) | 0xe
+#define EC_WORD_TRUMP_CARD  (EC_GROUP_BATTLE << 9) | 0xf
+#define EC_WORD_TAKE_THAT   (EC_GROUP_BATTLE << 9) | 0x10
+#define EC_WORD_COME_ON     (EC_GROUP_BATTLE << 9) | 0x11
+#define EC_WORD_ATTACK      (EC_GROUP_BATTLE << 9) | 0x12
+#define EC_WORD_SURRENDER   (EC_GROUP_BATTLE << 9) | 0x13
+#define EC_WORD_GUTSY       (EC_GROUP_BATTLE << 9) | 0x14
+#define EC_WORD_TALENT      (EC_GROUP_BATTLE << 9) | 0x15
+#define EC_WORD_STRATEGY    (EC_GROUP_BATTLE << 9) | 0x16
+#define EC_WORD_SMITE       (EC_GROUP_BATTLE << 9) | 0x17
+#define EC_WORD_MATCH       (EC_GROUP_BATTLE << 9) | 0x18
+#define EC_WORD_VICTORY     (EC_GROUP_BATTLE << 9) | 0x19
+#define EC_WORD_OFFENSIVE   (EC_GROUP_BATTLE << 9) | 0x1a
+#define EC_WORD_SENSE       (EC_GROUP_BATTLE << 9) | 0x1b
+#define EC_WORD_VERSUS      (EC_GROUP_BATTLE << 9) | 0x1c
+#define EC_WORD_FIGHTS      (EC_GROUP_BATTLE << 9) | 0x1d
+#define EC_WORD_POWER       (EC_GROUP_BATTLE << 9) | 0x1e
+#define EC_WORD_CHALLENGE   (EC_GROUP_BATTLE << 9) | 0x1f
+#define EC_WORD_STRONG      (EC_GROUP_BATTLE << 9) | 0x20
+#define EC_WORD_TOO_STRONG  (EC_GROUP_BATTLE << 9) | 0x21
+#define EC_WORD_GO_EASY     (EC_GROUP_BATTLE << 9) | 0x22
+#define EC_WORD_FOE         (EC_GROUP_BATTLE << 9) | 0x23
+#define EC_WORD_GENIUS      (EC_GROUP_BATTLE << 9) | 0x24
+#define EC_WORD_LEGEND      (EC_GROUP_BATTLE << 9) | 0x25
+#define EC_WORD_ESCAPE      (EC_GROUP_BATTLE << 9) | 0x26
+#define EC_WORD_AIM         (EC_GROUP_BATTLE << 9) | 0x27
+#define EC_WORD_BATTLE      (EC_GROUP_BATTLE << 9) | 0x28
+#define EC_WORD_FIGHT       (EC_GROUP_BATTLE << 9) | 0x29
+#define EC_WORD_RESUSCITATE (EC_GROUP_BATTLE << 9) | 0x2a
+#define EC_WORD_POINTS      (EC_GROUP_BATTLE << 9) | 0x2b
+#define EC_WORD_SERIOUS     (EC_GROUP_BATTLE << 9) | 0x2c
+#define EC_WORD_GIVE_UP     (EC_GROUP_BATTLE << 9) | 0x2d
+#define EC_WORD_LOSS        (EC_GROUP_BATTLE << 9) | 0x2e
+#define EC_WORD_IF_I_LOSE   (EC_GROUP_BATTLE << 9) | 0x2f
+#define EC_WORD_LOST        (EC_GROUP_BATTLE << 9) | 0x30
+#define EC_WORD_LOSE        (EC_GROUP_BATTLE << 9) | 0x31
+#define EC_WORD_GUARD       (EC_GROUP_BATTLE << 9) | 0x32
+#define EC_WORD_PARTNER     (EC_GROUP_BATTLE << 9) | 0x33
+#define EC_WORD_REJECT      (EC_GROUP_BATTLE << 9) | 0x34
+#define EC_WORD_ACCEPT      (EC_GROUP_BATTLE << 9) | 0x35
+#define EC_WORD_INVINCIBLE  (EC_GROUP_BATTLE << 9) | 0x36
+#define EC_WORD_RECEIVED    (EC_GROUP_BATTLE << 9) | 0x37
+#define EC_WORD_EASY        (EC_GROUP_BATTLE << 9) | 0x38
+#define EC_WORD_WEAK        (EC_GROUP_BATTLE << 9) | 0x39
+#define EC_WORD_TOO_WEAK    (EC_GROUP_BATTLE << 9) | 0x3a
+#define EC_WORD_PUSHOVER    (EC_GROUP_BATTLE << 9) | 0x3b
+#define EC_WORD_LEADER      (EC_GROUP_BATTLE << 9) | 0x3c
+#define EC_WORD_RULE        (EC_GROUP_BATTLE << 9) | 0x3d
+#define EC_WORD_MOVE        (EC_GROUP_BATTLE << 9) | 0x3e
+
+// GREETINGS
+#define EC_WORD_THANKS         (EC_GROUP_GREETINGS << 9) | 0x0
+#define EC_WORD_YES            (EC_GROUP_GREETINGS << 9) | 0x1
+#define EC_WORD_HERE_GOES      (EC_GROUP_GREETINGS << 9) | 0x2
+#define EC_WORD_HERE_I_COME    (EC_GROUP_GREETINGS << 9) | 0x3
+#define EC_WORD_HERE_IT_IS     (EC_GROUP_GREETINGS << 9) | 0x4
+#define EC_WORD_YEAH           (EC_GROUP_GREETINGS << 9) | 0x5
+#define EC_WORD_WELCOME        (EC_GROUP_GREETINGS << 9) | 0x6
+#define EC_WORD_OI             (EC_GROUP_GREETINGS << 9) | 0x7
+#define EC_WORD_HOW_DO         (EC_GROUP_GREETINGS << 9) | 0x8
+#define EC_WORD_CONGRATS       (EC_GROUP_GREETINGS << 9) | 0x9
+#define EC_WORD_GIVE_ME        (EC_GROUP_GREETINGS << 9) | 0xa
+#define EC_WORD_SORRY          (EC_GROUP_GREETINGS << 9) | 0xb
+#define EC_WORD_APOLOGIZE      (EC_GROUP_GREETINGS << 9) | 0xc
+#define EC_WORD_FORGIVE        (EC_GROUP_GREETINGS << 9) | 0xd
+#define EC_WORD_HEY_THERE      (EC_GROUP_GREETINGS << 9) | 0xe
+#define EC_WORD_HELLO          (EC_GROUP_GREETINGS << 9) | 0xf
+#define EC_WORD_GOOD_BYE       (EC_GROUP_GREETINGS << 9) | 0x10
+#define EC_WORD_THANK_YOU      (EC_GROUP_GREETINGS << 9) | 0x11
+#define EC_WORD_I_VE_ARRIVED   (EC_GROUP_GREETINGS << 9) | 0x12
+#define EC_WORD_PARDON         (EC_GROUP_GREETINGS << 9) | 0x13
+#define EC_WORD_EXCUSE         (EC_GROUP_GREETINGS << 9) | 0x14
+#define EC_WORD_SEE_YA         (EC_GROUP_GREETINGS << 9) | 0x15
+#define EC_WORD_EXCUSE_ME      (EC_GROUP_GREETINGS << 9) | 0x16
+#define EC_WORD_WELL_THEN      (EC_GROUP_GREETINGS << 9) | 0x17
+#define EC_WORD_GO_AHEAD       (EC_GROUP_GREETINGS << 9) | 0x18
+#define EC_WORD_APPRECIATE     (EC_GROUP_GREETINGS << 9) | 0x19
+#define EC_WORD_HEY_QUES       (EC_GROUP_GREETINGS << 9) | 0x1a
+#define EC_WORD_WHAT_S_UP_QUES (EC_GROUP_GREETINGS << 9) | 0x1b
+#define EC_WORD_HUH_QUES       (EC_GROUP_GREETINGS << 9) | 0x1c
+#define EC_WORD_NO             (EC_GROUP_GREETINGS << 9) | 0x1d
+#define EC_WORD_HI             (EC_GROUP_GREETINGS << 9) | 0x1e
+#define EC_WORD_YEAH_YEAH      (EC_GROUP_GREETINGS << 9) | 0x1f
+#define EC_WORD_BYE_BYE        (EC_GROUP_GREETINGS << 9) | 0x20
+#define EC_WORD_MEET_YOU       (EC_GROUP_GREETINGS << 9) | 0x21
+#define EC_WORD_HEY            (EC_GROUP_GREETINGS << 9) | 0x22
+#define EC_WORD_SMELL          (EC_GROUP_GREETINGS << 9) | 0x23
+#define EC_WORD_LISTENING      (EC_GROUP_GREETINGS << 9) | 0x24
+#define EC_WORD_HOO_HAH        (EC_GROUP_GREETINGS << 9) | 0x25
+#define EC_WORD_YAHOO          (EC_GROUP_GREETINGS << 9) | 0x26
+#define EC_WORD_YO             (EC_GROUP_GREETINGS << 9) | 0x27
+#define EC_WORD_COME_OVER      (EC_GROUP_GREETINGS << 9) | 0x28
+#define EC_WORD_COUNT_ON       (EC_GROUP_GREETINGS << 9) | 0x29
+
+// PEOPLE
+#define EC_WORD_OPPONENT    (EC_GROUP_PEOPLE << 9) | 0x0
+#define EC_WORD_I           (EC_GROUP_PEOPLE << 9) | 0x1
+#define EC_WORD_YOU         (EC_GROUP_PEOPLE << 9) | 0x2
+#define EC_WORD_YOURS       (EC_GROUP_PEOPLE << 9) | 0x3
+#define EC_WORD_SON         (EC_GROUP_PEOPLE << 9) | 0x4
+#define EC_WORD_YOUR        (EC_GROUP_PEOPLE << 9) | 0x5
+#define EC_WORD_YOU_RE      (EC_GROUP_PEOPLE << 9) | 0x6
+#define EC_WORD_YOU_VE      (EC_GROUP_PEOPLE << 9) | 0x7
+#define EC_WORD_MOTHER      (EC_GROUP_PEOPLE << 9) | 0x8
+#define EC_WORD_GRANDFATHER (EC_GROUP_PEOPLE << 9) | 0x9
+#define EC_WORD_UNCLE       (EC_GROUP_PEOPLE << 9) | 0xa
+#define EC_WORD_FATHER      (EC_GROUP_PEOPLE << 9) | 0xb
+#define EC_WORD_BOY         (EC_GROUP_PEOPLE << 9) | 0xc
+#define EC_WORD_ADULT       (EC_GROUP_PEOPLE << 9) | 0xd
+#define EC_WORD_BROTHER     (EC_GROUP_PEOPLE << 9) | 0xe
+#define EC_WORD_SISTER      (EC_GROUP_PEOPLE << 9) | 0xf
+#define EC_WORD_GRANDMOTHER (EC_GROUP_PEOPLE << 9) | 0x10
+#define EC_WORD_AUNT        (EC_GROUP_PEOPLE << 9) | 0x11
+#define EC_WORD_PARENT      (EC_GROUP_PEOPLE << 9) | 0x12
+#define EC_WORD_MAN         (EC_GROUP_PEOPLE << 9) | 0x13
+#define EC_WORD_ME          (EC_GROUP_PEOPLE << 9) | 0x14
+#define EC_WORD_GIRL        (EC_GROUP_PEOPLE << 9) | 0x15
+#define EC_WORD_BABE        (EC_GROUP_PEOPLE << 9) | 0x16
+#define EC_WORD_FAMILY      (EC_GROUP_PEOPLE << 9) | 0x17
+#define EC_WORD_HER         (EC_GROUP_PEOPLE << 9) | 0x18
+#define EC_WORD_HIM         (EC_GROUP_PEOPLE << 9) | 0x19
+#define EC_WORD_HE          (EC_GROUP_PEOPLE << 9) | 0x1a
+#define EC_WORD_PLACE       (EC_GROUP_PEOPLE << 9) | 0x1b
+#define EC_WORD_DAUGHTER    (EC_GROUP_PEOPLE << 9) | 0x1c
+#define EC_WORD_HIS         (EC_GROUP_PEOPLE << 9) | 0x1d
+#define EC_WORD_HE_S        (EC_GROUP_PEOPLE << 9) | 0x1e
+#define EC_WORD_AREN_T      (EC_GROUP_PEOPLE << 9) | 0x1f
+#define EC_WORD_SIBLINGS    (EC_GROUP_PEOPLE << 9) | 0x20
+#define EC_WORD_KID         (EC_GROUP_PEOPLE << 9) | 0x21
+#define EC_WORD_CHILDREN    (EC_GROUP_PEOPLE << 9) | 0x22
+#define EC_WORD_MR          (EC_GROUP_PEOPLE << 9) | 0x23
+#define EC_WORD_MRS         (EC_GROUP_PEOPLE << 9) | 0x24
+#define EC_WORD_MYSELF      (EC_GROUP_PEOPLE << 9) | 0x25
+#define EC_WORD_I_WAS       (EC_GROUP_PEOPLE << 9) | 0x26
+#define EC_WORD_TO_ME       (EC_GROUP_PEOPLE << 9) | 0x27
+#define EC_WORD_MY          (EC_GROUP_PEOPLE << 9) | 0x28
+#define EC_WORD_I_AM        (EC_GROUP_PEOPLE << 9) | 0x29
+#define EC_WORD_I_VE        (EC_GROUP_PEOPLE << 9) | 0x2a
+#define EC_WORD_WHO         (EC_GROUP_PEOPLE << 9) | 0x2b
+#define EC_WORD_SOMEONE     (EC_GROUP_PEOPLE << 9) | 0x2c
+#define EC_WORD_WHO_WAS     (EC_GROUP_PEOPLE << 9) | 0x2d
+#define EC_WORD_TO_WHOM     (EC_GROUP_PEOPLE << 9) | 0x2e
+#define EC_WORD_WHOSE       (EC_GROUP_PEOPLE << 9) | 0x2f
+#define EC_WORD_WHO_IS      (EC_GROUP_PEOPLE << 9) | 0x30
+#define EC_WORD_IT_S        (EC_GROUP_PEOPLE << 9) | 0x31
+#define EC_WORD_LADY        (EC_GROUP_PEOPLE << 9) | 0x32
+#define EC_WORD_FRIEND      (EC_GROUP_PEOPLE << 9) | 0x33
+#define EC_WORD_ALLY        (EC_GROUP_PEOPLE << 9) | 0x34
+#define EC_WORD_PERSON      (EC_GROUP_PEOPLE << 9) | 0x35
+#define EC_WORD_DUDE        (EC_GROUP_PEOPLE << 9) | 0x36
+#define EC_WORD_THEY        (EC_GROUP_PEOPLE << 9) | 0x37
+#define EC_WORD_THEY_WERE   (EC_GROUP_PEOPLE << 9) | 0x38
+#define EC_WORD_TO_THEM     (EC_GROUP_PEOPLE << 9) | 0x39
+#define EC_WORD_THEIR       (EC_GROUP_PEOPLE << 9) | 0x3a
+#define EC_WORD_THEY_RE     (EC_GROUP_PEOPLE << 9) | 0x3b
+#define EC_WORD_THEY_VE     (EC_GROUP_PEOPLE << 9) | 0x3c
+#define EC_WORD_WE          (EC_GROUP_PEOPLE << 9) | 0x3d
+#define EC_WORD_BEEN        (EC_GROUP_PEOPLE << 9) | 0x3e
+#define EC_WORD_TO_US       (EC_GROUP_PEOPLE << 9) | 0x3f
+#define EC_WORD_OUR         (EC_GROUP_PEOPLE << 9) | 0x40
+#define EC_WORD_WE_RE       (EC_GROUP_PEOPLE << 9) | 0x41
+#define EC_WORD_RIVAL       (EC_GROUP_PEOPLE << 9) | 0x42
+#define EC_WORD_WE_VE       (EC_GROUP_PEOPLE << 9) | 0x43
+#define EC_WORD_WOMAN       (EC_GROUP_PEOPLE << 9) | 0x44
+#define EC_WORD_SHE         (EC_GROUP_PEOPLE << 9) | 0x45
+#define EC_WORD_SHE_WAS     (EC_GROUP_PEOPLE << 9) | 0x46
+#define EC_WORD_TO_HER      (EC_GROUP_PEOPLE << 9) | 0x47
+#define EC_WORD_HERS        (EC_GROUP_PEOPLE << 9) | 0x48
+#define EC_WORD_SHE_IS      (EC_GROUP_PEOPLE << 9) | 0x49
+#define EC_WORD_SOME        (EC_GROUP_PEOPLE << 9) | 0x4a
+
+// VOICES
+#define EC_WORD_EXCL                       (EC_GROUP_VOICES << 9) | 0x0
+#define EC_WORD_EXCL_EXCL                  (EC_GROUP_VOICES << 9) | 0x1
+#define EC_WORD_QUES_EXCL                  (EC_GROUP_VOICES << 9) | 0x2
+#define EC_WORD_QUES                       (EC_GROUP_VOICES << 9) | 0x3
+#define EC_WORD_ELLIPSIS                   (EC_GROUP_VOICES << 9) | 0x4
+#define EC_WORD_ELLIPSIS_EXCL              (EC_GROUP_VOICES << 9) | 0x5
+#define EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS (EC_GROUP_VOICES << 9) | 0x6
+#define EC_WORD_DASH                       (EC_GROUP_VOICES << 9) | 0x7
+#define EC_WORD_DASH_DASH_DASH             (EC_GROUP_VOICES << 9) | 0x8
+#define EC_WORD_UH_OH                      (EC_GROUP_VOICES << 9) | 0x9
+#define EC_WORD_WAAAH                      (EC_GROUP_VOICES << 9) | 0xa
+#define EC_WORD_AHAHA                      (EC_GROUP_VOICES << 9) | 0xb
+#define EC_WORD_OH_QUES                    (EC_GROUP_VOICES << 9) | 0xc
+#define EC_WORD_NOPE                       (EC_GROUP_VOICES << 9) | 0xd
+#define EC_WORD_URGH                       (EC_GROUP_VOICES << 9) | 0xe
+#define EC_WORD_HMM                        (EC_GROUP_VOICES << 9) | 0xf
+#define EC_WORD_WHOAH                      (EC_GROUP_VOICES << 9) | 0x10
+#define EC_WORD_WROOOAAR_EXCL              (EC_GROUP_VOICES << 9) | 0x11
+#define EC_WORD_WOW                        (EC_GROUP_VOICES << 9) | 0x12
+#define EC_WORD_GIGGLE                     (EC_GROUP_VOICES << 9) | 0x13
+#define EC_WORD_SIGH                       (EC_GROUP_VOICES << 9) | 0x14
+#define EC_WORD_UNBELIEVABLE               (EC_GROUP_VOICES << 9) | 0x15
+#define EC_WORD_CRIES                      (EC_GROUP_VOICES << 9) | 0x16
+#define EC_WORD_AGREE                      (EC_GROUP_VOICES << 9) | 0x17
+#define EC_WORD_EH_QUES                    (EC_GROUP_VOICES << 9) | 0x18
+#define EC_WORD_CRY                        (EC_GROUP_VOICES << 9) | 0x19
+#define EC_WORD_EHEHE                      (EC_GROUP_VOICES << 9) | 0x1a
+#define EC_WORD_OI_OI_OI                   (EC_GROUP_VOICES << 9) | 0x1b
+#define EC_WORD_OH_YEAH                    (EC_GROUP_VOICES << 9) | 0x1c
+#define EC_WORD_OH                         (EC_GROUP_VOICES << 9) | 0x1d
+#define EC_WORD_OOPS                       (EC_GROUP_VOICES << 9) | 0x1e
+#define EC_WORD_SHOCKED                    (EC_GROUP_VOICES << 9) | 0x1f
+#define EC_WORD_EEK                        (EC_GROUP_VOICES << 9) | 0x20
+#define EC_WORD_GRAAAH                     (EC_GROUP_VOICES << 9) | 0x21
+#define EC_WORD_GWAHAHAHA                  (EC_GROUP_VOICES << 9) | 0x22
+#define EC_WORD_WAY                        (EC_GROUP_VOICES << 9) | 0x23
+#define EC_WORD_TCH                        (EC_GROUP_VOICES << 9) | 0x24
+#define EC_WORD_HEHE                       (EC_GROUP_VOICES << 9) | 0x25
+#define EC_WORD_HAH                        (EC_GROUP_VOICES << 9) | 0x26
+#define EC_WORD_YUP                        (EC_GROUP_VOICES << 9) | 0x27
+#define EC_WORD_HAHAHA                     (EC_GROUP_VOICES << 9) | 0x28
+#define EC_WORD_AIYEEH                     (EC_GROUP_VOICES << 9) | 0x29
+#define EC_WORD_HIYAH                      (EC_GROUP_VOICES << 9) | 0x2a
+#define EC_WORD_FUFUFU                     (EC_GROUP_VOICES << 9) | 0x2b
+#define EC_WORD_LOL                        (EC_GROUP_VOICES << 9) | 0x2c
+#define EC_WORD_SNORT                      (EC_GROUP_VOICES << 9) | 0x2d
+#define EC_WORD_HUMPH                      (EC_GROUP_VOICES << 9) | 0x2e
+#define EC_WORD_HEHEHE                     (EC_GROUP_VOICES << 9) | 0x2f
+#define EC_WORD_HEH                        (EC_GROUP_VOICES << 9) | 0x30
+#define EC_WORD_HOHOHO                     (EC_GROUP_VOICES << 9) | 0x31
+#define EC_WORD_UH_HUH                     (EC_GROUP_VOICES << 9) | 0x32
+#define EC_WORD_OH_DEAR                    (EC_GROUP_VOICES << 9) | 0x33
+#define EC_WORD_ARRGH                      (EC_GROUP_VOICES << 9) | 0x34
+#define EC_WORD_MUFUFU                     (EC_GROUP_VOICES << 9) | 0x35
+#define EC_WORD_MMM                        (EC_GROUP_VOICES << 9) | 0x36
+#define EC_WORD_OH_KAY                     (EC_GROUP_VOICES << 9) | 0x37
+#define EC_WORD_OKAY                       (EC_GROUP_VOICES << 9) | 0x38
+#define EC_WORD_LALALA                     (EC_GROUP_VOICES << 9) | 0x39
+#define EC_WORD_YAY                        (EC_GROUP_VOICES << 9) | 0x3a
+#define EC_WORD_AWW                        (EC_GROUP_VOICES << 9) | 0x3b
+#define EC_WORD_WOWEE                      (EC_GROUP_VOICES << 9) | 0x3c
+#define EC_WORD_GWAH                       (EC_GROUP_VOICES << 9) | 0x3d
+#define EC_WORD_WAHAHAHA                   (EC_GROUP_VOICES << 9) | 0x3e
+
+// SPEECH
+#define EC_WORD_LISTEN     (EC_GROUP_SPEECH << 9) | 0x0
+#define EC_WORD_NOT_VERY   (EC_GROUP_SPEECH << 9) | 0x1
+#define EC_WORD_MEAN       (EC_GROUP_SPEECH << 9) | 0x2
+#define EC_WORD_LIE        (EC_GROUP_SPEECH << 9) | 0x3
+#define EC_WORD_LAY        (EC_GROUP_SPEECH << 9) | 0x4
+#define EC_WORD_RECOMMEND  (EC_GROUP_SPEECH << 9) | 0x5
+#define EC_WORD_NITWIT     (EC_GROUP_SPEECH << 9) | 0x6
+#define EC_WORD_QUITE      (EC_GROUP_SPEECH << 9) | 0x7
+#define EC_WORD_FROM       (EC_GROUP_SPEECH << 9) | 0x8
+#define EC_WORD_FEELING    (EC_GROUP_SPEECH << 9) | 0x9
+#define EC_WORD_BUT        (EC_GROUP_SPEECH << 9) | 0xa
+#define EC_WORD_HOWEVER    (EC_GROUP_SPEECH << 9) | 0xb
+#define EC_WORD_CASE       (EC_GROUP_SPEECH << 9) | 0xc
+#define EC_WORD_THE        (EC_GROUP_SPEECH << 9) | 0xd
+#define EC_WORD_MISS       (EC_GROUP_SPEECH << 9) | 0xe
+#define EC_WORD_HOW        (EC_GROUP_SPEECH << 9) | 0xf
+#define EC_WORD_HIT        (EC_GROUP_SPEECH << 9) | 0x10
+#define EC_WORD_ENOUGH     (EC_GROUP_SPEECH << 9) | 0x11
+#define EC_WORD_A_LOT      (EC_GROUP_SPEECH << 9) | 0x12
+#define EC_WORD_A_LITTLE   (EC_GROUP_SPEECH << 9) | 0x13
+#define EC_WORD_ABSOLUTELY (EC_GROUP_SPEECH << 9) | 0x14
+#define EC_WORD_AND        (EC_GROUP_SPEECH << 9) | 0x15
+#define EC_WORD_ONLY       (EC_GROUP_SPEECH << 9) | 0x16
+#define EC_WORD_AROUND     (EC_GROUP_SPEECH << 9) | 0x17
+#define EC_WORD_PROBABLY   (EC_GROUP_SPEECH << 9) | 0x18
+#define EC_WORD_IF         (EC_GROUP_SPEECH << 9) | 0x19
+#define EC_WORD_VERY       (EC_GROUP_SPEECH << 9) | 0x1a
+#define EC_WORD_A_TINY_BIT (EC_GROUP_SPEECH << 9) | 0x1b
+#define EC_WORD_WILD       (EC_GROUP_SPEECH << 9) | 0x1c
+#define EC_WORD_THAT_S     (EC_GROUP_SPEECH << 9) | 0x1d
+#define EC_WORD_JUST       (EC_GROUP_SPEECH << 9) | 0x1e
+#define EC_WORD_EVEN_SO    (EC_GROUP_SPEECH << 9) | 0x1f
+#define EC_WORD_MUST_BE    (EC_GROUP_SPEECH << 9) | 0x20
+#define EC_WORD_NATURALLY  (EC_GROUP_SPEECH << 9) | 0x21
+#define EC_WORD_FOR_NOW    (EC_GROUP_SPEECH << 9) | 0x22
+#define EC_WORD_UNDERSTOOD (EC_GROUP_SPEECH << 9) | 0x23
+#define EC_WORD_JOKING     (EC_GROUP_SPEECH << 9) | 0x24
+#define EC_WORD_READY      (EC_GROUP_SPEECH << 9) | 0x25
+#define EC_WORD_SOMETHING  (EC_GROUP_SPEECH << 9) | 0x26
+#define EC_WORD_SOMEHOW    (EC_GROUP_SPEECH << 9) | 0x27
+#define EC_WORD_ALTHOUGH   (EC_GROUP_SPEECH << 9) | 0x28
+#define EC_WORD_ALSO       (EC_GROUP_SPEECH << 9) | 0x29
+#define EC_WORD_PERFECT    (EC_GROUP_SPEECH << 9) | 0x2a
+#define EC_WORD_AS_MUCH_AS (EC_GROUP_SPEECH << 9) | 0x2b
+#define EC_WORD_REALLY     (EC_GROUP_SPEECH << 9) | 0x2c
+#define EC_WORD_TRULY      (EC_GROUP_SPEECH << 9) | 0x2d
+#define EC_WORD_SERIOUSLY  (EC_GROUP_SPEECH << 9) | 0x2e
+#define EC_WORD_TOTALLY    (EC_GROUP_SPEECH << 9) | 0x2f
+#define EC_WORD_UNTIL      (EC_GROUP_SPEECH << 9) | 0x30
+#define EC_WORD_AS_IF      (EC_GROUP_SPEECH << 9) | 0x31
+#define EC_WORD_MOOD       (EC_GROUP_SPEECH << 9) | 0x32
+#define EC_WORD_RATHER     (EC_GROUP_SPEECH << 9) | 0x33
+#define EC_WORD_AWFULLY    (EC_GROUP_SPEECH << 9) | 0x34
+#define EC_WORD_MODE       (EC_GROUP_SPEECH << 9) | 0x35
+#define EC_WORD_MORE       (EC_GROUP_SPEECH << 9) | 0x36
+#define EC_WORD_TOO_LATE   (EC_GROUP_SPEECH << 9) | 0x37
+#define EC_WORD_FINALLY    (EC_GROUP_SPEECH << 9) | 0x38
+#define EC_WORD_ANY        (EC_GROUP_SPEECH << 9) | 0x39
+#define EC_WORD_INSTEAD    (EC_GROUP_SPEECH << 9) | 0x3a
+#define EC_WORD_FANTASTIC  (EC_GROUP_SPEECH << 9) | 0x3b
+
+// ENDINGS
+#define EC_WORD_WILL          (EC_GROUP_ENDINGS << 9) | 0x0
+#define EC_WORD_WILL_BE_HERE  (EC_GROUP_ENDINGS << 9) | 0x1
+#define EC_WORD_OR            (EC_GROUP_ENDINGS << 9) | 0x2
+#define EC_WORD_TIMES         (EC_GROUP_ENDINGS << 9) | 0x3
+#define EC_WORD_WONDER        (EC_GROUP_ENDINGS << 9) | 0x4
+#define EC_WORD_IS_IT_QUES    (EC_GROUP_ENDINGS << 9) | 0x5
+#define EC_WORD_BE            (EC_GROUP_ENDINGS << 9) | 0x6
+#define EC_WORD_GIMME         (EC_GROUP_ENDINGS << 9) | 0x7
+#define EC_WORD_COULD         (EC_GROUP_ENDINGS << 9) | 0x8
+#define EC_WORD_LIKELY_TO     (EC_GROUP_ENDINGS << 9) | 0x9
+#define EC_WORD_WOULD         (EC_GROUP_ENDINGS << 9) | 0xa
+#define EC_WORD_IS            (EC_GROUP_ENDINGS << 9) | 0xb
+#define EC_WORD_ISN_T_IT_QUES (EC_GROUP_ENDINGS << 9) | 0xc
+#define EC_WORD_LET_S         (EC_GROUP_ENDINGS << 9) | 0xd
+#define EC_WORD_OTHER         (EC_GROUP_ENDINGS << 9) | 0xe
+#define EC_WORD_ARE           (EC_GROUP_ENDINGS << 9) | 0xf
+#define EC_WORD_WAS           (EC_GROUP_ENDINGS << 9) | 0x10
+#define EC_WORD_WERE          (EC_GROUP_ENDINGS << 9) | 0x11
+#define EC_WORD_THOSE         (EC_GROUP_ENDINGS << 9) | 0x12
+#define EC_WORD_ISN_T         (EC_GROUP_ENDINGS << 9) | 0x13
+#define EC_WORD_WON_T         (EC_GROUP_ENDINGS << 9) | 0x14
+#define EC_WORD_CAN_T         (EC_GROUP_ENDINGS << 9) | 0x15
+#define EC_WORD_CAN           (EC_GROUP_ENDINGS << 9) | 0x16
+#define EC_WORD_DON_T         (EC_GROUP_ENDINGS << 9) | 0x17
+#define EC_WORD_DO            (EC_GROUP_ENDINGS << 9) | 0x18
+#define EC_WORD_DOES          (EC_GROUP_ENDINGS << 9) | 0x19
+#define EC_WORD_WHOM          (EC_GROUP_ENDINGS << 9) | 0x1a
+#define EC_WORD_WHICH         (EC_GROUP_ENDINGS << 9) | 0x1b
+#define EC_WORD_WASN_T        (EC_GROUP_ENDINGS << 9) | 0x1c
+#define EC_WORD_WEREN_T       (EC_GROUP_ENDINGS << 9) | 0x1d
+#define EC_WORD_HAVE          (EC_GROUP_ENDINGS << 9) | 0x1e
+#define EC_WORD_HAVEN_T       (EC_GROUP_ENDINGS << 9) | 0x1f
+#define EC_WORD_A             (EC_GROUP_ENDINGS << 9) | 0x20
+#define EC_WORD_AN            (EC_GROUP_ENDINGS << 9) | 0x21
+#define EC_WORD_NOT           (EC_GROUP_ENDINGS << 9) | 0x22
+#define EC_WORD_THERE         (EC_GROUP_ENDINGS << 9) | 0x23
+#define EC_WORD_OK_QUES       (EC_GROUP_ENDINGS << 9) | 0x24
+#define EC_WORD_SO            (EC_GROUP_ENDINGS << 9) | 0x25
+#define EC_WORD_MAYBE         (EC_GROUP_ENDINGS << 9) | 0x26
+#define EC_WORD_ABOUT         (EC_GROUP_ENDINGS << 9) | 0x27
+#define EC_WORD_OVER          (EC_GROUP_ENDINGS << 9) | 0x28
+#define EC_WORD_IT            (EC_GROUP_ENDINGS << 9) | 0x29
+#define EC_WORD_ALL           (EC_GROUP_ENDINGS << 9) | 0x2a
+#define EC_WORD_FOR           (EC_GROUP_ENDINGS << 9) | 0x2b
+#define EC_WORD_ON            (EC_GROUP_ENDINGS << 9) | 0x2c
+#define EC_WORD_OFF           (EC_GROUP_ENDINGS << 9) | 0x2d
+#define EC_WORD_AS            (EC_GROUP_ENDINGS << 9) | 0x2e
+#define EC_WORD_TO            (EC_GROUP_ENDINGS << 9) | 0x2f
+#define EC_WORD_WITH          (EC_GROUP_ENDINGS << 9) | 0x30
+#define EC_WORD_BETTER        (EC_GROUP_ENDINGS << 9) | 0x31
+#define EC_WORD_EVER          (EC_GROUP_ENDINGS << 9) | 0x32
+#define EC_WORD_SINCE         (EC_GROUP_ENDINGS << 9) | 0x33
+#define EC_WORD_OF            (EC_GROUP_ENDINGS << 9) | 0x34
+#define EC_WORD_BELONGS_TO    (EC_GROUP_ENDINGS << 9) | 0x35
+#define EC_WORD_AT            (EC_GROUP_ENDINGS << 9) | 0x36
+#define EC_WORD_IN            (EC_GROUP_ENDINGS << 9) | 0x37
+#define EC_WORD_OUT           (EC_GROUP_ENDINGS << 9) | 0x38
+#define EC_WORD_TOO           (EC_GROUP_ENDINGS << 9) | 0x39
+#define EC_WORD_LIKE          (EC_GROUP_ENDINGS << 9) | 0x3a
+#define EC_WORD_DID           (EC_GROUP_ENDINGS << 9) | 0x3b
+#define EC_WORD_DIDN_T        (EC_GROUP_ENDINGS << 9) | 0x3c
+#define EC_WORD_DOESN_T       (EC_GROUP_ENDINGS << 9) | 0x3d
+#define EC_WORD_WITHOUT       (EC_GROUP_ENDINGS << 9) | 0x3e
+#define EC_WORD_AFTER         (EC_GROUP_ENDINGS << 9) | 0x3f
+#define EC_WORD_BEFORE        (EC_GROUP_ENDINGS << 9) | 0x40
+#define EC_WORD_WHILE         (EC_GROUP_ENDINGS << 9) | 0x41
+#define EC_WORD_THAN          (EC_GROUP_ENDINGS << 9) | 0x42
+#define EC_WORD_ONCE          (EC_GROUP_ENDINGS << 9) | 0x43
+#define EC_WORD_ANYWHERE      (EC_GROUP_ENDINGS << 9) | 0x44
+
+// FEELINGS
+#define EC_WORD_MEET         (EC_GROUP_FEELINGS << 9) | 0x0
+#define EC_WORD_PLAY         (EC_GROUP_FEELINGS << 9) | 0x1
+#define EC_WORD_HURRIED      (EC_GROUP_FEELINGS << 9) | 0x2
+#define EC_WORD_GOES         (EC_GROUP_FEELINGS << 9) | 0x3
+#define EC_WORD_GIDDY        (EC_GROUP_FEELINGS << 9) | 0x4
+#define EC_WORD_HAPPY        (EC_GROUP_FEELINGS << 9) | 0x5
+#define EC_WORD_HAPPINESS    (EC_GROUP_FEELINGS << 9) | 0x6
+#define EC_WORD_EXCITE       (EC_GROUP_FEELINGS << 9) | 0x7
+#define EC_WORD_IMPORTANT    (EC_GROUP_FEELINGS << 9) | 0x8
+#define EC_WORD_FUNNY        (EC_GROUP_FEELINGS << 9) | 0x9
+#define EC_WORD_GOT          (EC_GROUP_FEELINGS << 9) | 0xa
+#define EC_WORD_GO_HOME      (EC_GROUP_FEELINGS << 9) | 0xb
+#define EC_WORD_DISAPPOINTED (EC_GROUP_FEELINGS << 9) | 0xc
+#define EC_WORD_DISAPPOINTS  (EC_GROUP_FEELINGS << 9) | 0xd
+#define EC_WORD_SAD          (EC_GROUP_FEELINGS << 9) | 0xe
+#define EC_WORD_TRY          (EC_GROUP_FEELINGS << 9) | 0xf
+#define EC_WORD_TRIES        (EC_GROUP_FEELINGS << 9) | 0x10
+#define EC_WORD_HEARS        (EC_GROUP_FEELINGS << 9) | 0x11
+#define EC_WORD_THINK        (EC_GROUP_FEELINGS << 9) | 0x12
+#define EC_WORD_HEAR         (EC_GROUP_FEELINGS << 9) | 0x13
+#define EC_WORD_WANTS        (EC_GROUP_FEELINGS << 9) | 0x14
+#define EC_WORD_MISHEARD     (EC_GROUP_FEELINGS << 9) | 0x15
+#define EC_WORD_DISLIKE      (EC_GROUP_FEELINGS << 9) | 0x16
+#define EC_WORD_ANGRY        (EC_GROUP_FEELINGS << 9) | 0x17
+#define EC_WORD_ANGER        (EC_GROUP_FEELINGS << 9) | 0x18
+#define EC_WORD_SCARY        (EC_GROUP_FEELINGS << 9) | 0x19
+#define EC_WORD_LONESOME     (EC_GROUP_FEELINGS << 9) | 0x1a
+#define EC_WORD_DISAPPOINT   (EC_GROUP_FEELINGS << 9) | 0x1b
+#define EC_WORD_JOY          (EC_GROUP_FEELINGS << 9) | 0x1c
+#define EC_WORD_GETS         (EC_GROUP_FEELINGS << 9) | 0x1d
+#define EC_WORD_NEVER        (EC_GROUP_FEELINGS << 9) | 0x1e
+#define EC_WORD_DARN         (EC_GROUP_FEELINGS << 9) | 0x1f
+#define EC_WORD_DOWNCAST     (EC_GROUP_FEELINGS << 9) | 0x20
+#define EC_WORD_INCREDIBLE   (EC_GROUP_FEELINGS << 9) | 0x21
+#define EC_WORD_LIKES        (EC_GROUP_FEELINGS << 9) | 0x22
+#define EC_WORD_DISLIKES     (EC_GROUP_FEELINGS << 9) | 0x23
+#define EC_WORD_BORING       (EC_GROUP_FEELINGS << 9) | 0x24
+#define EC_WORD_CARE         (EC_GROUP_FEELINGS << 9) | 0x25
+#define EC_WORD_CARES        (EC_GROUP_FEELINGS << 9) | 0x26
+#define EC_WORD_ALL_RIGHT    (EC_GROUP_FEELINGS << 9) | 0x27
+#define EC_WORD_ADORE        (EC_GROUP_FEELINGS << 9) | 0x28
+#define EC_WORD_DISASTER     (EC_GROUP_FEELINGS << 9) | 0x29
+#define EC_WORD_ENJOY        (EC_GROUP_FEELINGS << 9) | 0x2a
+#define EC_WORD_ENJOYS       (EC_GROUP_FEELINGS << 9) | 0x2b
+#define EC_WORD_EAT          (EC_GROUP_FEELINGS << 9) | 0x2c
+#define EC_WORD_LACKING      (EC_GROUP_FEELINGS << 9) | 0x2d
+#define EC_WORD_BAD          (EC_GROUP_FEELINGS << 9) | 0x2e
+#define EC_WORD_HARD         (EC_GROUP_FEELINGS << 9) | 0x2f
+#define EC_WORD_TERRIBLE     (EC_GROUP_FEELINGS << 9) | 0x30
+#define EC_WORD_SHOULD       (EC_GROUP_FEELINGS << 9) | 0x31
+#define EC_WORD_NICE         (EC_GROUP_FEELINGS << 9) | 0x32
+#define EC_WORD_DRINK        (EC_GROUP_FEELINGS << 9) | 0x33
+#define EC_WORD_SURPRISE     (EC_GROUP_FEELINGS << 9) | 0x34
+#define EC_WORD_FEAR         (EC_GROUP_FEELINGS << 9) | 0x35
+#define EC_WORD_WANT         (EC_GROUP_FEELINGS << 9) | 0x36
+#define EC_WORD_WAIT         (EC_GROUP_FEELINGS << 9) | 0x37
+#define EC_WORD_SATISFIED    (EC_GROUP_FEELINGS << 9) | 0x38
+#define EC_WORD_SEE          (EC_GROUP_FEELINGS << 9) | 0x39
+#define EC_WORD_RARE         (EC_GROUP_FEELINGS << 9) | 0x3a
+#define EC_WORD_NEGATIVE     (EC_GROUP_FEELINGS << 9) | 0x3b
+#define EC_WORD_DONE         (EC_GROUP_FEELINGS << 9) | 0x3c
+#define EC_WORD_DANGER       (EC_GROUP_FEELINGS << 9) | 0x3d
+#define EC_WORD_DEFEATED     (EC_GROUP_FEELINGS << 9) | 0x3e
+#define EC_WORD_BEAT         (EC_GROUP_FEELINGS << 9) | 0x3f
+#define EC_WORD_GREAT        (EC_GROUP_FEELINGS << 9) | 0x40
+#define EC_WORD_ROMANTIC     (EC_GROUP_FEELINGS << 9) | 0x41
+#define EC_WORD_QUESTION     (EC_GROUP_FEELINGS << 9) | 0x42
+#define EC_WORD_UNDERSTAND   (EC_GROUP_FEELINGS << 9) | 0x43
+#define EC_WORD_UNDERSTANDS  (EC_GROUP_FEELINGS << 9) | 0x44
+
+// CONDITIONS
+#define EC_WORD_HOT          (EC_GROUP_CONDITIONS << 9) | 0x0
+#define EC_WORD_EXISTS       (EC_GROUP_CONDITIONS << 9) | 0x1
+#define EC_WORD_EXCESS       (EC_GROUP_CONDITIONS << 9) | 0x2
+#define EC_WORD_APPROVED     (EC_GROUP_CONDITIONS << 9) | 0x3
+#define EC_WORD_HAS          (EC_GROUP_CONDITIONS << 9) | 0x4
+#define EC_WORD_GOOD         (EC_GROUP_CONDITIONS << 9) | 0x5
+#define EC_WORD_LESS         (EC_GROUP_CONDITIONS << 9) | 0x6
+#define EC_WORD_MOMENTUM     (EC_GROUP_CONDITIONS << 9) | 0x7
+#define EC_WORD_GOING        (EC_GROUP_CONDITIONS << 9) | 0x8
+#define EC_WORD_WEIRD        (EC_GROUP_CONDITIONS << 9) | 0x9
+#define EC_WORD_BUSY         (EC_GROUP_CONDITIONS << 9) | 0xa
+#define EC_WORD_TOGETHER     (EC_GROUP_CONDITIONS << 9) | 0xb
+#define EC_WORD_FULL         (EC_GROUP_CONDITIONS << 9) | 0xc
+#define EC_WORD_ABSENT       (EC_GROUP_CONDITIONS << 9) | 0xd
+#define EC_WORD_BEING        (EC_GROUP_CONDITIONS << 9) | 0xe
+#define EC_WORD_NEED         (EC_GROUP_CONDITIONS << 9) | 0xf
+#define EC_WORD_TASTY        (EC_GROUP_CONDITIONS << 9) | 0x10
+#define EC_WORD_SKILLED      (EC_GROUP_CONDITIONS << 9) | 0x11
+#define EC_WORD_NOISY        (EC_GROUP_CONDITIONS << 9) | 0x12
+#define EC_WORD_BIG          (EC_GROUP_CONDITIONS << 9) | 0x13
+#define EC_WORD_LATE         (EC_GROUP_CONDITIONS << 9) | 0x14
+#define EC_WORD_CLOSE        (EC_GROUP_CONDITIONS << 9) | 0x15
+#define EC_WORD_DOCILE       (EC_GROUP_CONDITIONS << 9) | 0x16
+#define EC_WORD_AMUSING      (EC_GROUP_CONDITIONS << 9) | 0x17
+#define EC_WORD_ENTERTAINING (EC_GROUP_CONDITIONS << 9) | 0x18
+#define EC_WORD_PERFECTION   (EC_GROUP_CONDITIONS << 9) | 0x19
+#define EC_WORD_PRETTY       (EC_GROUP_CONDITIONS << 9) | 0x1a
+#define EC_WORD_HEALTHY      (EC_GROUP_CONDITIONS << 9) | 0x1b
+#define EC_WORD_EXCELLENT    (EC_GROUP_CONDITIONS << 9) | 0x1c
+#define EC_WORD_UPSIDE_DOWN  (EC_GROUP_CONDITIONS << 9) | 0x1d
+#define EC_WORD_COLD         (EC_GROUP_CONDITIONS << 9) | 0x1e
+#define EC_WORD_REFRESHING   (EC_GROUP_CONDITIONS << 9) | 0x1f
+#define EC_WORD_UNAVOIDABLE  (EC_GROUP_CONDITIONS << 9) | 0x20
+#define EC_WORD_MUCH         (EC_GROUP_CONDITIONS << 9) | 0x21
+#define EC_WORD_OVERWHELMING (EC_GROUP_CONDITIONS << 9) | 0x22
+#define EC_WORD_FABULOUS     (EC_GROUP_CONDITIONS << 9) | 0x23
+#define EC_WORD_ELSE         (EC_GROUP_CONDITIONS << 9) | 0x24
+#define EC_WORD_EXPENSIVE    (EC_GROUP_CONDITIONS << 9) | 0x25
+#define EC_WORD_CORRECT      (EC_GROUP_CONDITIONS << 9) | 0x26
+#define EC_WORD_IMPOSSIBLE   (EC_GROUP_CONDITIONS << 9) | 0x27
+#define EC_WORD_SMALL        (EC_GROUP_CONDITIONS << 9) | 0x28
+#define EC_WORD_DIFFERENT    (EC_GROUP_CONDITIONS << 9) | 0x29
+#define EC_WORD_TIRED        (EC_GROUP_CONDITIONS << 9) | 0x2a
+#define EC_WORD_SKILL        (EC_GROUP_CONDITIONS << 9) | 0x2b
+#define EC_WORD_TOP          (EC_GROUP_CONDITIONS << 9) | 0x2c
+#define EC_WORD_NON_STOP     (EC_GROUP_CONDITIONS << 9) | 0x2d
+#define EC_WORD_PREPOSTEROUS (EC_GROUP_CONDITIONS << 9) | 0x2e
+#define EC_WORD_NONE         (EC_GROUP_CONDITIONS << 9) | 0x2f
+#define EC_WORD_NOTHING      (EC_GROUP_CONDITIONS << 9) | 0x30
+#define EC_WORD_NATURAL      (EC_GROUP_CONDITIONS << 9) | 0x31
+#define EC_WORD_BECOMES      (EC_GROUP_CONDITIONS << 9) | 0x32
+#define EC_WORD_LUKEWARM     (EC_GROUP_CONDITIONS << 9) | 0x33
+#define EC_WORD_FAST         (EC_GROUP_CONDITIONS << 9) | 0x34
+#define EC_WORD_LOW          (EC_GROUP_CONDITIONS << 9) | 0x35
+#define EC_WORD_AWFUL        (EC_GROUP_CONDITIONS << 9) | 0x36
+#define EC_WORD_ALONE        (EC_GROUP_CONDITIONS << 9) | 0x37
+#define EC_WORD_BORED        (EC_GROUP_CONDITIONS << 9) | 0x38
+#define EC_WORD_SECRET       (EC_GROUP_CONDITIONS << 9) | 0x39
+#define EC_WORD_MYSTERY      (EC_GROUP_CONDITIONS << 9) | 0x3a
+#define EC_WORD_LACKS        (EC_GROUP_CONDITIONS << 9) | 0x3b
+#define EC_WORD_BEST         (EC_GROUP_CONDITIONS << 9) | 0x3c
+#define EC_WORD_LOUSY        (EC_GROUP_CONDITIONS << 9) | 0x3d
+#define EC_WORD_MISTAKE      (EC_GROUP_CONDITIONS << 9) | 0x3e
+#define EC_WORD_KIND         (EC_GROUP_CONDITIONS << 9) | 0x3f
+#define EC_WORD_WELL         (EC_GROUP_CONDITIONS << 9) | 0x40
+#define EC_WORD_WEAKENED     (EC_GROUP_CONDITIONS << 9) | 0x41
+#define EC_WORD_SIMPLE       (EC_GROUP_CONDITIONS << 9) | 0x42
+#define EC_WORD_SEEMS        (EC_GROUP_CONDITIONS << 9) | 0x43
+#define EC_WORD_BADLY        (EC_GROUP_CONDITIONS << 9) | 0x44
+
+// ACTIONS
+#define EC_WORD_MEETS     (EC_GROUP_ACTIONS << 9) | 0x0
+#define EC_WORD_CONCEDE   (EC_GROUP_ACTIONS << 9) | 0x1
+#define EC_WORD_GIVE      (EC_GROUP_ACTIONS << 9) | 0x2
+#define EC_WORD_GIVES     (EC_GROUP_ACTIONS << 9) | 0x3
+#define EC_WORD_PLAYED    (EC_GROUP_ACTIONS << 9) | 0x4
+#define EC_WORD_PLAYS     (EC_GROUP_ACTIONS << 9) | 0x5
+#define EC_WORD_COLLECT   (EC_GROUP_ACTIONS << 9) | 0x6
+#define EC_WORD_WALKING   (EC_GROUP_ACTIONS << 9) | 0x7
+#define EC_WORD_WALKS     (EC_GROUP_ACTIONS << 9) | 0x8
+#define EC_WORD_SAYS      (EC_GROUP_ACTIONS << 9) | 0x9
+#define EC_WORD_WENT      (EC_GROUP_ACTIONS << 9) | 0xa
+#define EC_WORD_SAID      (EC_GROUP_ACTIONS << 9) | 0xb
+#define EC_WORD_WAKE_UP   (EC_GROUP_ACTIONS << 9) | 0xc
+#define EC_WORD_WAKES_UP  (EC_GROUP_ACTIONS << 9) | 0xd
+#define EC_WORD_ANGERS    (EC_GROUP_ACTIONS << 9) | 0xe
+#define EC_WORD_TEACH     (EC_GROUP_ACTIONS << 9) | 0xf
+#define EC_WORD_TEACHES   (EC_GROUP_ACTIONS << 9) | 0x10
+#define EC_WORD_PLEASE    (EC_GROUP_ACTIONS << 9) | 0x11
+#define EC_WORD_LEARN     (EC_GROUP_ACTIONS << 9) | 0x12
+#define EC_WORD_CHANGE    (EC_GROUP_ACTIONS << 9) | 0x13
+#define EC_WORD_STORY     (EC_GROUP_ACTIONS << 9) | 0x14
+#define EC_WORD_TRUST     (EC_GROUP_ACTIONS << 9) | 0x15
+#define EC_WORD_LAVISH    (EC_GROUP_ACTIONS << 9) | 0x16
+#define EC_WORD_LISTENS   (EC_GROUP_ACTIONS << 9) | 0x17
+#define EC_WORD_HEARING   (EC_GROUP_ACTIONS << 9) | 0x18
+#define EC_WORD_TRAINS    (EC_GROUP_ACTIONS << 9) | 0x19
+#define EC_WORD_CHOOSE    (EC_GROUP_ACTIONS << 9) | 0x1a
+#define EC_WORD_COME      (EC_GROUP_ACTIONS << 9) | 0x1b
+#define EC_WORD_CAME      (EC_GROUP_ACTIONS << 9) | 0x1c
+#define EC_WORD_SEARCH    (EC_GROUP_ACTIONS << 9) | 0x1d
+#define EC_WORD_MAKE      (EC_GROUP_ACTIONS << 9) | 0x1e
+#define EC_WORD_CAUSE     (EC_GROUP_ACTIONS << 9) | 0x1f
+#define EC_WORD_KNOW      (EC_GROUP_ACTIONS << 9) | 0x20
+#define EC_WORD_KNOWS     (EC_GROUP_ACTIONS << 9) | 0x21
+#define EC_WORD_REFUSE    (EC_GROUP_ACTIONS << 9) | 0x22
+#define EC_WORD_STORES    (EC_GROUP_ACTIONS << 9) | 0x23
+#define EC_WORD_BRAG      (EC_GROUP_ACTIONS << 9) | 0x24
+#define EC_WORD_IGNORANT  (EC_GROUP_ACTIONS << 9) | 0x25
+#define EC_WORD_THINKS    (EC_GROUP_ACTIONS << 9) | 0x26
+#define EC_WORD_BELIEVE   (EC_GROUP_ACTIONS << 9) | 0x27
+#define EC_WORD_SLIDE     (EC_GROUP_ACTIONS << 9) | 0x28
+#define EC_WORD_EATS      (EC_GROUP_ACTIONS << 9) | 0x29
+#define EC_WORD_USE       (EC_GROUP_ACTIONS << 9) | 0x2a
+#define EC_WORD_USES      (EC_GROUP_ACTIONS << 9) | 0x2b
+#define EC_WORD_USING     (EC_GROUP_ACTIONS << 9) | 0x2c
+#define EC_WORD_COULDN_T  (EC_GROUP_ACTIONS << 9) | 0x2d
+#define EC_WORD_CAPABLE   (EC_GROUP_ACTIONS << 9) | 0x2e
+#define EC_WORD_DISAPPEAR (EC_GROUP_ACTIONS << 9) | 0x2f
+#define EC_WORD_APPEAR    (EC_GROUP_ACTIONS << 9) | 0x30
+#define EC_WORD_THROW     (EC_GROUP_ACTIONS << 9) | 0x31
+#define EC_WORD_WORRY     (EC_GROUP_ACTIONS << 9) | 0x32
+#define EC_WORD_SLEPT     (EC_GROUP_ACTIONS << 9) | 0x33
+#define EC_WORD_SLEEP     (EC_GROUP_ACTIONS << 9) | 0x34
+#define EC_WORD_RELEASE   (EC_GROUP_ACTIONS << 9) | 0x35
+#define EC_WORD_DRINKS    (EC_GROUP_ACTIONS << 9) | 0x36
+#define EC_WORD_RUNS      (EC_GROUP_ACTIONS << 9) | 0x37
+#define EC_WORD_RUN       (EC_GROUP_ACTIONS << 9) | 0x38
+#define EC_WORD_WORKS     (EC_GROUP_ACTIONS << 9) | 0x39
+#define EC_WORD_WORKING   (EC_GROUP_ACTIONS << 9) | 0x3a
+#define EC_WORD_TALKING   (EC_GROUP_ACTIONS << 9) | 0x3b
+#define EC_WORD_TALK      (EC_GROUP_ACTIONS << 9) | 0x3c
+#define EC_WORD_SINK      (EC_GROUP_ACTIONS << 9) | 0x3d
+#define EC_WORD_SMACK     (EC_GROUP_ACTIONS << 9) | 0x3e
+#define EC_WORD_PRETEND   (EC_GROUP_ACTIONS << 9) | 0x3f
+#define EC_WORD_PRAISE    (EC_GROUP_ACTIONS << 9) | 0x40
+#define EC_WORD_OVERDO    (EC_GROUP_ACTIONS << 9) | 0x41
+#define EC_WORD_SHOW      (EC_GROUP_ACTIONS << 9) | 0x42
+#define EC_WORD_LOOKS     (EC_GROUP_ACTIONS << 9) | 0x43
+#define EC_WORD_SEES      (EC_GROUP_ACTIONS << 9) | 0x44
+#define EC_WORD_SEEK      (EC_GROUP_ACTIONS << 9) | 0x45
+#define EC_WORD_OWN       (EC_GROUP_ACTIONS << 9) | 0x46
+#define EC_WORD_TAKE      (EC_GROUP_ACTIONS << 9) | 0x47
+#define EC_WORD_ALLOW     (EC_GROUP_ACTIONS << 9) | 0x48
+#define EC_WORD_FORGET    (EC_GROUP_ACTIONS << 9) | 0x49
+#define EC_WORD_FORGETS   (EC_GROUP_ACTIONS << 9) | 0x4a
+#define EC_WORD_APPEARS   (EC_GROUP_ACTIONS << 9) | 0x4b
+#define EC_WORD_FAINT     (EC_GROUP_ACTIONS << 9) | 0x4c
+#define EC_WORD_FAINTED   (EC_GROUP_ACTIONS << 9) | 0x4d
+
+// LIFESTYLE
+#define EC_WORD_CHORES       (EC_GROUP_LIFESTYLE << 9) | 0x0
+#define EC_WORD_HOME         (EC_GROUP_LIFESTYLE << 9) | 0x1
+#define EC_WORD_MONEY        (EC_GROUP_LIFESTYLE << 9) | 0x2
+#define EC_WORD_ALLOWANCE    (EC_GROUP_LIFESTYLE << 9) | 0x3
+#define EC_WORD_BATH         (EC_GROUP_LIFESTYLE << 9) | 0x4
+#define EC_WORD_CONVERSATION (EC_GROUP_LIFESTYLE << 9) | 0x5
+#define EC_WORD_SCHOOL       (EC_GROUP_LIFESTYLE << 9) | 0x6
+#define EC_WORD_COMMEMORATE  (EC_GROUP_LIFESTYLE << 9) | 0x7
+#define EC_WORD_HABIT        (EC_GROUP_LIFESTYLE << 9) | 0x8
+#define EC_WORD_GROUP        (EC_GROUP_LIFESTYLE << 9) | 0x9
+#define EC_WORD_WORD         (EC_GROUP_LIFESTYLE << 9) | 0xa
+#define EC_WORD_STORE        (EC_GROUP_LIFESTYLE << 9) | 0xb
+#define EC_WORD_SERVICE      (EC_GROUP_LIFESTYLE << 9) | 0xc
+#define EC_WORD_WORK         (EC_GROUP_LIFESTYLE << 9) | 0xd
+#define EC_WORD_SYSTEM       (EC_GROUP_LIFESTYLE << 9) | 0xe
+#define EC_WORD_TRAIN        (EC_GROUP_LIFESTYLE << 9) | 0xf
+#define EC_WORD_CLASS        (EC_GROUP_LIFESTYLE << 9) | 0x10
+#define EC_WORD_LESSONS      (EC_GROUP_LIFESTYLE << 9) | 0x11
+#define EC_WORD_INFORMATION  (EC_GROUP_LIFESTYLE << 9) | 0x12
+#define EC_WORD_LIVING       (EC_GROUP_LIFESTYLE << 9) | 0x13
+#define EC_WORD_TEACHER      (EC_GROUP_LIFESTYLE << 9) | 0x14
+#define EC_WORD_TOURNAMENT   (EC_GROUP_LIFESTYLE << 9) | 0x15
+#define EC_WORD_LETTER       (EC_GROUP_LIFESTYLE << 9) | 0x16
+#define EC_WORD_EVENT        (EC_GROUP_LIFESTYLE << 9) | 0x17
+#define EC_WORD_DIGITAL      (EC_GROUP_LIFESTYLE << 9) | 0x18
+#define EC_WORD_TEST         (EC_GROUP_LIFESTYLE << 9) | 0x19
+#define EC_WORD_DEPT_STORE   (EC_GROUP_LIFESTYLE << 9) | 0x1a
+#define EC_WORD_TELEVISION   (EC_GROUP_LIFESTYLE << 9) | 0x1b
+#define EC_WORD_PHONE        (EC_GROUP_LIFESTYLE << 9) | 0x1c
+#define EC_WORD_ITEM         (EC_GROUP_LIFESTYLE << 9) | 0x1d
+#define EC_WORD_NAME         (EC_GROUP_LIFESTYLE << 9) | 0x1e
+#define EC_WORD_NEWS         (EC_GROUP_LIFESTYLE << 9) | 0x1f
+#define EC_WORD_POPULAR      (EC_GROUP_LIFESTYLE << 9) | 0x20
+#define EC_WORD_PARTY        (EC_GROUP_LIFESTYLE << 9) | 0x21
+#define EC_WORD_STUDY        (EC_GROUP_LIFESTYLE << 9) | 0x22
+#define EC_WORD_MACHINE      (EC_GROUP_LIFESTYLE << 9) | 0x23
+#define EC_WORD_MAIL         (EC_GROUP_LIFESTYLE << 9) | 0x24
+#define EC_WORD_MESSAGE      (EC_GROUP_LIFESTYLE << 9) | 0x25
+#define EC_WORD_PROMISE      (EC_GROUP_LIFESTYLE << 9) | 0x26
+#define EC_WORD_DREAM        (EC_GROUP_LIFESTYLE << 9) | 0x27
+#define EC_WORD_KINDERGARTEN (EC_GROUP_LIFESTYLE << 9) | 0x28
+#define EC_WORD_LIFE         (EC_GROUP_LIFESTYLE << 9) | 0x29
+#define EC_WORD_RADIO        (EC_GROUP_LIFESTYLE << 9) | 0x2a
+#define EC_WORD_RENTAL       (EC_GROUP_LIFESTYLE << 9) | 0x2b
+#define EC_WORD_WORLD        (EC_GROUP_LIFESTYLE << 9) | 0x2c
+
+// HOBBIES
+#define EC_WORD_IDOL         (EC_GROUP_HOBBIES << 9) | 0x0
+#define EC_WORD_ANIME        (EC_GROUP_HOBBIES << 9) | 0x1
+#define EC_WORD_SONG         (EC_GROUP_HOBBIES << 9) | 0x2
+#define EC_WORD_MOVIE        (EC_GROUP_HOBBIES << 9) | 0x3
+#define EC_WORD_SWEETS       (EC_GROUP_HOBBIES << 9) | 0x4
+#define EC_WORD_CHAT         (EC_GROUP_HOBBIES << 9) | 0x5
+#define EC_WORD_CHILD_S_PLAY (EC_GROUP_HOBBIES << 9) | 0x6
+#define EC_WORD_TOYS         (EC_GROUP_HOBBIES << 9) | 0x7
+#define EC_WORD_MUSIC        (EC_GROUP_HOBBIES << 9) | 0x8
+#define EC_WORD_CARDS        (EC_GROUP_HOBBIES << 9) | 0x9
+#define EC_WORD_SHOPPING     (EC_GROUP_HOBBIES << 9) | 0xa
+#define EC_WORD_CAMERA       (EC_GROUP_HOBBIES << 9) | 0xb
+#define EC_WORD_VIEWING      (EC_GROUP_HOBBIES << 9) | 0xc
+#define EC_WORD_SPECTATOR    (EC_GROUP_HOBBIES << 9) | 0xd
+#define EC_WORD_GOURMET      (EC_GROUP_HOBBIES << 9) | 0xe
+#define EC_WORD_GAME         (EC_GROUP_HOBBIES << 9) | 0xf
+#define EC_WORD_RPG          (EC_GROUP_HOBBIES << 9) | 0x10
+#define EC_WORD_COLLECTION   (EC_GROUP_HOBBIES << 9) | 0x11
+#define EC_WORD_COMPLETE     (EC_GROUP_HOBBIES << 9) | 0x12
+#define EC_WORD_MAGAZINE     (EC_GROUP_HOBBIES << 9) | 0x13
+#define EC_WORD_WALK         (EC_GROUP_HOBBIES << 9) | 0x14
+#define EC_WORD_BIKE         (EC_GROUP_HOBBIES << 9) | 0x15
+#define EC_WORD_HOBBY        (EC_GROUP_HOBBIES << 9) | 0x16
+#define EC_WORD_SPORTS       (EC_GROUP_HOBBIES << 9) | 0x17
+#define EC_WORD_SOFTWARE     (EC_GROUP_HOBBIES << 9) | 0x18
+#define EC_WORD_SONGS        (EC_GROUP_HOBBIES << 9) | 0x19
+#define EC_WORD_DIET         (EC_GROUP_HOBBIES << 9) | 0x1a
+#define EC_WORD_TREASURE     (EC_GROUP_HOBBIES << 9) | 0x1b
+#define EC_WORD_TRAVEL       (EC_GROUP_HOBBIES << 9) | 0x1c
+#define EC_WORD_DANCE        (EC_GROUP_HOBBIES << 9) | 0x1d
+#define EC_WORD_CHANNEL      (EC_GROUP_HOBBIES << 9) | 0x1e
+#define EC_WORD_MAKING       (EC_GROUP_HOBBIES << 9) | 0x1f
+#define EC_WORD_FISHING      (EC_GROUP_HOBBIES << 9) | 0x20
+#define EC_WORD_DATE         (EC_GROUP_HOBBIES << 9) | 0x21
+#define EC_WORD_DESIGN       (EC_GROUP_HOBBIES << 9) | 0x22
+#define EC_WORD_LOCOMOTIVE   (EC_GROUP_HOBBIES << 9) | 0x23
+#define EC_WORD_PLUSH_DOLL   (EC_GROUP_HOBBIES << 9) | 0x24
+#define EC_WORD_PC           (EC_GROUP_HOBBIES << 9) | 0x25
+#define EC_WORD_FLOWERS      (EC_GROUP_HOBBIES << 9) | 0x26
+#define EC_WORD_HERO         (EC_GROUP_HOBBIES << 9) | 0x27
+#define EC_WORD_NAP          (EC_GROUP_HOBBIES << 9) | 0x28
+#define EC_WORD_HEROINE      (EC_GROUP_HOBBIES << 9) | 0x29
+#define EC_WORD_FASHION      (EC_GROUP_HOBBIES << 9) | 0x2a
+#define EC_WORD_ADVENTURE    (EC_GROUP_HOBBIES << 9) | 0x2b
+#define EC_WORD_BOARD        (EC_GROUP_HOBBIES << 9) | 0x2c
+#define EC_WORD_BALL         (EC_GROUP_HOBBIES << 9) | 0x2d
+#define EC_WORD_BOOK         (EC_GROUP_HOBBIES << 9) | 0x2e
+#define EC_WORD_FESTIVAL     (EC_GROUP_HOBBIES << 9) | 0x2f
+#define EC_WORD_COMICS       (EC_GROUP_HOBBIES << 9) | 0x30
+#define EC_WORD_HOLIDAY      (EC_GROUP_HOBBIES << 9) | 0x31
+#define EC_WORD_PLANS        (EC_GROUP_HOBBIES << 9) | 0x32
+#define EC_WORD_TRENDY       (EC_GROUP_HOBBIES << 9) | 0x33
+#define EC_WORD_VACATION     (EC_GROUP_HOBBIES << 9) | 0x34
+#define EC_WORD_LOOK         (EC_GROUP_HOBBIES << 9) | 0x35
+
+// TIME
+#define EC_WORD_FALL      (EC_GROUP_TIME << 9) | 0x0
+#define EC_WORD_MORNING   (EC_GROUP_TIME << 9) | 0x1
+#define EC_WORD_TOMORROW  (EC_GROUP_TIME << 9) | 0x2
+#define EC_WORD_LAST      (EC_GROUP_TIME << 9) | 0x3
+#define EC_WORD_DAY       (EC_GROUP_TIME << 9) | 0x4
+#define EC_WORD_SOMETIME  (EC_GROUP_TIME << 9) | 0x5
+#define EC_WORD_ALWAYS    (EC_GROUP_TIME << 9) | 0x6
+#define EC_WORD_CURRENT   (EC_GROUP_TIME << 9) | 0x7
+#define EC_WORD_FOREVER   (EC_GROUP_TIME << 9) | 0x8
+#define EC_WORD_DAYS      (EC_GROUP_TIME << 9) | 0x9
+#define EC_WORD_END       (EC_GROUP_TIME << 9) | 0xa
+#define EC_WORD_TUESDAY   (EC_GROUP_TIME << 9) | 0xb
+#define EC_WORD_YESTERDAY (EC_GROUP_TIME << 9) | 0xc
+#define EC_WORD_TODAY     (EC_GROUP_TIME << 9) | 0xd
+#define EC_WORD_FRIDAY    (EC_GROUP_TIME << 9) | 0xe
+#define EC_WORD_MONDAY    (EC_GROUP_TIME << 9) | 0xf
+#define EC_WORD_LATER     (EC_GROUP_TIME << 9) | 0x10
+#define EC_WORD_EARLIER   (EC_GROUP_TIME << 9) | 0x11
+#define EC_WORD_ANOTHER   (EC_GROUP_TIME << 9) | 0x12
+#define EC_WORD_TIME      (EC_GROUP_TIME << 9) | 0x13
+#define EC_WORD_FINISH    (EC_GROUP_TIME << 9) | 0x14
+#define EC_WORD_WEDNESDAY (EC_GROUP_TIME << 9) | 0x15
+#define EC_WORD_SOON      (EC_GROUP_TIME << 9) | 0x16
+#define EC_WORD_START     (EC_GROUP_TIME << 9) | 0x17
+#define EC_WORD_MONTH     (EC_GROUP_TIME << 9) | 0x18
+#define EC_WORD_STOP      (EC_GROUP_TIME << 9) | 0x19
+#define EC_WORD_NOW       (EC_GROUP_TIME << 9) | 0x1a
+#define EC_WORD_FINAL     (EC_GROUP_TIME << 9) | 0x1b
+#define EC_WORD_NEXT      (EC_GROUP_TIME << 9) | 0x1c
+#define EC_WORD_AGE       (EC_GROUP_TIME << 9) | 0x1d
+#define EC_WORD_SATURDAY  (EC_GROUP_TIME << 9) | 0x1e
+#define EC_WORD_SUMMER    (EC_GROUP_TIME << 9) | 0x1f
+#define EC_WORD_SUNDAY    (EC_GROUP_TIME << 9) | 0x20
+#define EC_WORD_BEGINNING (EC_GROUP_TIME << 9) | 0x21
+#define EC_WORD_SPRING    (EC_GROUP_TIME << 9) | 0x22
+#define EC_WORD_DAYTIME   (EC_GROUP_TIME << 9) | 0x23
+#define EC_WORD_WINTER    (EC_GROUP_TIME << 9) | 0x24
+#define EC_WORD_DAILY     (EC_GROUP_TIME << 9) | 0x25
+#define EC_WORD_OLDEN     (EC_GROUP_TIME << 9) | 0x26
+#define EC_WORD_ALMOST    (EC_GROUP_TIME << 9) | 0x27
+#define EC_WORD_NEARLY    (EC_GROUP_TIME << 9) | 0x28
+#define EC_WORD_THURSDAY  (EC_GROUP_TIME << 9) | 0x29
+#define EC_WORD_NIGHTTIME (EC_GROUP_TIME << 9) | 0x2a
+#define EC_WORD_NIGHT     (EC_GROUP_TIME << 9) | 0x2b
+#define EC_WORD_WEEK      (EC_GROUP_TIME << 9) | 0x2c
+
+// MISC
+#define EC_WORD_HIGHS           (EC_GROUP_MISC << 9) | 0x0
+#define EC_WORD_LOWS            (EC_GROUP_MISC << 9) | 0x1
+#define EC_WORD_UM              (EC_GROUP_MISC << 9) | 0x2
+#define EC_WORD_REAR            (EC_GROUP_MISC << 9) | 0x3
+#define EC_WORD_THINGS          (EC_GROUP_MISC << 9) | 0x4
+#define EC_WORD_THING           (EC_GROUP_MISC << 9) | 0x5
+#define EC_WORD_BELOW           (EC_GROUP_MISC << 9) | 0x6
+#define EC_WORD_ABOVE           (EC_GROUP_MISC << 9) | 0x7
+#define EC_WORD_BACK            (EC_GROUP_MISC << 9) | 0x8
+#define EC_WORD_HIGH            (EC_GROUP_MISC << 9) | 0x9
+#define EC_WORD_HERE            (EC_GROUP_MISC << 9) | 0xa
+#define EC_WORD_INSIDE          (EC_GROUP_MISC << 9) | 0xb
+#define EC_WORD_OUTSIDE         (EC_GROUP_MISC << 9) | 0xc
+#define EC_WORD_BESIDE          (EC_GROUP_MISC << 9) | 0xd
+#define EC_WORD_THIS_IS_IT_EXCL (EC_GROUP_MISC << 9) | 0xe
+#define EC_WORD_THIS            (EC_GROUP_MISC << 9) | 0xf
+#define EC_WORD_EVERY           (EC_GROUP_MISC << 9) | 0x10
+#define EC_WORD_THESE           (EC_GROUP_MISC << 9) | 0x11
+#define EC_WORD_THESE_WERE      (EC_GROUP_MISC << 9) | 0x12
+#define EC_WORD_DOWN            (EC_GROUP_MISC << 9) | 0x13
+#define EC_WORD_THAT            (EC_GROUP_MISC << 9) | 0x14
+#define EC_WORD_THOSE_ARE       (EC_GROUP_MISC << 9) | 0x15
+#define EC_WORD_THOSE_WERE      (EC_GROUP_MISC << 9) | 0x16
+#define EC_WORD_THAT_S_IT_EXCL  (EC_GROUP_MISC << 9) | 0x17
+#define EC_WORD_AM              (EC_GROUP_MISC << 9) | 0x18
+#define EC_WORD_THAT_WAS        (EC_GROUP_MISC << 9) | 0x19
+#define EC_WORD_FRONT           (EC_GROUP_MISC << 9) | 0x1a
+#define EC_WORD_UP              (EC_GROUP_MISC << 9) | 0x1b
+#define EC_WORD_CHOICE          (EC_GROUP_MISC << 9) | 0x1c
+#define EC_WORD_FAR             (EC_GROUP_MISC << 9) | 0x1d
+#define EC_WORD_AWAY            (EC_GROUP_MISC << 9) | 0x1e
+#define EC_WORD_NEAR            (EC_GROUP_MISC << 9) | 0x1f
+#define EC_WORD_WHERE           (EC_GROUP_MISC << 9) | 0x20
+#define EC_WORD_WHEN            (EC_GROUP_MISC << 9) | 0x21
+#define EC_WORD_WHAT            (EC_GROUP_MISC << 9) | 0x22
+#define EC_WORD_DEEP            (EC_GROUP_MISC << 9) | 0x23
+#define EC_WORD_SHALLOW         (EC_GROUP_MISC << 9) | 0x24
+#define EC_WORD_WHY             (EC_GROUP_MISC << 9) | 0x25
+#define EC_WORD_CONFUSED        (EC_GROUP_MISC << 9) | 0x26
+#define EC_WORD_OPPOSITE        (EC_GROUP_MISC << 9) | 0x27
+#define EC_WORD_LEFT            (EC_GROUP_MISC << 9) | 0x28
+#define EC_WORD_RIGHT           (EC_GROUP_MISC << 9) | 0x29
+
+// ADJECTIVES
+#define EC_WORD_WANDERING    (EC_GROUP_ADJECTIVES << 9) | 0x0
+#define EC_WORD_RICKETY      (EC_GROUP_ADJECTIVES << 9) | 0x1
+#define EC_WORD_ROCK_SOLID   (EC_GROUP_ADJECTIVES << 9) | 0x2
+#define EC_WORD_HUNGRY       (EC_GROUP_ADJECTIVES << 9) | 0x3
+#define EC_WORD_TIGHT        (EC_GROUP_ADJECTIVES << 9) | 0x4
+#define EC_WORD_TICKLISH     (EC_GROUP_ADJECTIVES << 9) | 0x5
+#define EC_WORD_TWIRLING     (EC_GROUP_ADJECTIVES << 9) | 0x6
+#define EC_WORD_SPIRALING    (EC_GROUP_ADJECTIVES << 9) | 0x7
+#define EC_WORD_THIRSTY      (EC_GROUP_ADJECTIVES << 9) | 0x8
+#define EC_WORD_LOLLING      (EC_GROUP_ADJECTIVES << 9) | 0x9
+#define EC_WORD_SILKY        (EC_GROUP_ADJECTIVES << 9) | 0xa
+#define EC_WORD_SADLY        (EC_GROUP_ADJECTIVES << 9) | 0xb
+#define EC_WORD_HOPELESS     (EC_GROUP_ADJECTIVES << 9) | 0xc
+#define EC_WORD_USELESS      (EC_GROUP_ADJECTIVES << 9) | 0xd
+#define EC_WORD_DROOLING     (EC_GROUP_ADJECTIVES << 9) | 0xe
+#define EC_WORD_EXCITING     (EC_GROUP_ADJECTIVES << 9) | 0xf
+#define EC_WORD_THICK        (EC_GROUP_ADJECTIVES << 9) | 0x10
+#define EC_WORD_SMOOTH       (EC_GROUP_ADJECTIVES << 9) | 0x11
+#define EC_WORD_SLIMY        (EC_GROUP_ADJECTIVES << 9) | 0x12
+#define EC_WORD_THIN         (EC_GROUP_ADJECTIVES << 9) | 0x13
+#define EC_WORD_BREAK        (EC_GROUP_ADJECTIVES << 9) | 0x14
+#define EC_WORD_VORACIOUS    (EC_GROUP_ADJECTIVES << 9) | 0x15
+#define EC_WORD_SCATTER      (EC_GROUP_ADJECTIVES << 9) | 0x16
+#define EC_WORD_AWESOME      (EC_GROUP_ADJECTIVES << 9) | 0x17
+#define EC_WORD_WIMPY        (EC_GROUP_ADJECTIVES << 9) | 0x18
+#define EC_WORD_WOBBLY       (EC_GROUP_ADJECTIVES << 9) | 0x19
+#define EC_WORD_SHAKY        (EC_GROUP_ADJECTIVES << 9) | 0x1a
+#define EC_WORD_RIPPED       (EC_GROUP_ADJECTIVES << 9) | 0x1b
+#define EC_WORD_SHREDDED     (EC_GROUP_ADJECTIVES << 9) | 0x1c
+#define EC_WORD_INCREASING   (EC_GROUP_ADJECTIVES << 9) | 0x1d
+#define EC_WORD_YET          (EC_GROUP_ADJECTIVES << 9) | 0x1e
+#define EC_WORD_DESTROYED    (EC_GROUP_ADJECTIVES << 9) | 0x1f
+#define EC_WORD_FIERY        (EC_GROUP_ADJECTIVES << 9) | 0x20
+#define EC_WORD_LOVEY_DOVEY  (EC_GROUP_ADJECTIVES << 9) | 0x21
+#define EC_WORD_HAPPILY      (EC_GROUP_ADJECTIVES << 9) | 0x22
+#define EC_WORD_ANTICIPATION (EC_GROUP_ADJECTIVES << 9) | 0x23
+
+// EVENTS
+#define EC_WORD_APPEAL       (EC_GROUP_EVENTS << 9) | 0x0
+#define EC_WORD_EVENTS       (EC_GROUP_EVENTS << 9) | 0x1
+#define EC_WORD_STAY_AT_HOME (EC_GROUP_EVENTS << 9) | 0x2
+#define EC_WORD_BERRY        (EC_GROUP_EVENTS << 9) | 0x3
+#define EC_WORD_CONTEST      (EC_GROUP_EVENTS << 9) | 0x4
+#define EC_WORD_MC           (EC_GROUP_EVENTS << 9) | 0x5
+#define EC_WORD_JUDGE        (EC_GROUP_EVENTS << 9) | 0x6
+#define EC_WORD_SUPER        (EC_GROUP_EVENTS << 9) | 0x7
+#define EC_WORD_STAGE        (EC_GROUP_EVENTS << 9) | 0x8
+#define EC_WORD_HALL_OF_FAME (EC_GROUP_EVENTS << 9) | 0x9
+#define EC_WORD_EVOLUTION    (EC_GROUP_EVENTS << 9) | 0xa
+#define EC_WORD_HYPER        (EC_GROUP_EVENTS << 9) | 0xb
+#define EC_WORD_BATTLE_TOWER (EC_GROUP_EVENTS << 9) | 0xc
+#define EC_WORD_LEADERS      (EC_GROUP_EVENTS << 9) | 0xd
+#define EC_WORD_BATTLE_ROOM  (EC_GROUP_EVENTS << 9) | 0xe
+#define EC_WORD_HIDDEN       (EC_GROUP_EVENTS << 9) | 0xf
+#define EC_WORD_SECRET_BASE  (EC_GROUP_EVENTS << 9) | 0x10
+#define EC_WORD_BLEND        (EC_GROUP_EVENTS << 9) | 0x11
+#define EC_WORD_POKEBLOCK    (EC_GROUP_EVENTS << 9) | 0x12
+#define EC_WORD_MASTER       (EC_GROUP_EVENTS << 9) | 0x13
+#define EC_WORD_RANK         (EC_GROUP_EVENTS << 9) | 0x14
+#define EC_WORD_RIBBON       (EC_GROUP_EVENTS << 9) | 0x15
+
+// TRENDY_SAYING
+#define EC_WORD_KTHX_BYE      (EC_GROUP_TRENDY_SAYING << 9) | 0x0
+#define EC_WORD_YES_SIR_EXCL  (EC_GROUP_TRENDY_SAYING << 9) | 0x1
+#define EC_WORD_AVANT_GARDE   (EC_GROUP_TRENDY_SAYING << 9) | 0x2
+#define EC_WORD_COUPLE        (EC_GROUP_TRENDY_SAYING << 9) | 0x3
+#define EC_WORD_MUCH_OBLIGED  (EC_GROUP_TRENDY_SAYING << 9) | 0x4
+#define EC_WORD_YEEHAW_EXCL   (EC_GROUP_TRENDY_SAYING << 9) | 0x5
+#define EC_WORD_MEGA          (EC_GROUP_TRENDY_SAYING << 9) | 0x6
+#define EC_WORD_1_HIT_KO_EXCL (EC_GROUP_TRENDY_SAYING << 9) | 0x7
+#define EC_WORD_DESTINY       (EC_GROUP_TRENDY_SAYING << 9) | 0x8
+#define EC_WORD_CANCEL        (EC_GROUP_TRENDY_SAYING << 9) | 0x9
+#define EC_WORD_NEW           (EC_GROUP_TRENDY_SAYING << 9) | 0xa
+#define EC_WORD_FLATTEN       (EC_GROUP_TRENDY_SAYING << 9) | 0xb
+#define EC_WORD_KIDDING       (EC_GROUP_TRENDY_SAYING << 9) | 0xc
+#define EC_WORD_LOSER         (EC_GROUP_TRENDY_SAYING << 9) | 0xd
+#define EC_WORD_LOSING        (EC_GROUP_TRENDY_SAYING << 9) | 0xe
+#define EC_WORD_HAPPENING     (EC_GROUP_TRENDY_SAYING << 9) | 0xf
+#define EC_WORD_HIP_AND       (EC_GROUP_TRENDY_SAYING << 9) | 0x10
+#define EC_WORD_SHAKE         (EC_GROUP_TRENDY_SAYING << 9) | 0x11
+#define EC_WORD_SHADY         (EC_GROUP_TRENDY_SAYING << 9) | 0x12
+#define EC_WORD_UPBEAT        (EC_GROUP_TRENDY_SAYING << 9) | 0x13
+#define EC_WORD_MODERN        (EC_GROUP_TRENDY_SAYING << 9) | 0x14
+#define EC_WORD_SMELL_YA      (EC_GROUP_TRENDY_SAYING << 9) | 0x15
+#define EC_WORD_BANG          (EC_GROUP_TRENDY_SAYING << 9) | 0x16
+#define EC_WORD_KNOCKOUT      (EC_GROUP_TRENDY_SAYING << 9) | 0x17
+#define EC_WORD_HASSLE        (EC_GROUP_TRENDY_SAYING << 9) | 0x18
+#define EC_WORD_WINNER        (EC_GROUP_TRENDY_SAYING << 9) | 0x19
+#define EC_WORD_FEVER         (EC_GROUP_TRENDY_SAYING << 9) | 0x1a
+#define EC_WORD_WANNABE       (EC_GROUP_TRENDY_SAYING << 9) | 0x1b
+#define EC_WORD_BABY          (EC_GROUP_TRENDY_SAYING << 9) | 0x1c
+#define EC_WORD_HEART         (EC_GROUP_TRENDY_SAYING << 9) | 0x1d
+#define EC_WORD_OLD           (EC_GROUP_TRENDY_SAYING << 9) | 0x1e
+#define EC_WORD_YOUNG         (EC_GROUP_TRENDY_SAYING << 9) | 0x1f
+#define EC_WORD_UGLY          (EC_GROUP_TRENDY_SAYING << 9) | 0x20
+
+#define EC_GROUP(word) ((word) >> 9)
+#define EC_INDEX(word) ((word) & 0x1FF)
 
 u16 sub_80EB72C(u16 group);
 void sub_80EB6FC(u16 *, u16);
@@ -33,7 +1065,7 @@ void InitEasyChatPhrases(void);
 u8 sub_80EAD7C(u8 group);
 u16 sub_80EAE88(u8);
 u8 sub_80EB37C(u16);
-u8* sub_80EB3FC(u8 *, u16);
+u8* EasyChat_GetWordText(u8 *, u16);
 u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16);
 u16 sub_80EB784(u16 group);
 u8 sub_80EB868(u8);
diff --git a/include/event_data.h b/include/event_data.h
index 98e4a6da3..ae048af4c 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -22,7 +22,7 @@ bool8 VarSet(u16 id, u16 value);
 u8 VarGetFieldObjectGraphicsId(u8 id);
 u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
-u8 FlagReset(u16 id);
+u8 FlagClear(u16 id);
 bool8 FlagGet(u16 id);
 
 extern u16 gSpecialVar_0x8000;
diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h
index c217f22af..a960f637b 100644
--- a/include/evolution_graphics.h
+++ b/include/evolution_graphics.h
@@ -6,8 +6,10 @@ void LoadEvoSparkleSpriteAndPal(void);
 u8 LaunchTask_PreEvoSparklesSet1(u16 arg0);
 u8 LaunchTask_PreEvoSparklesSet2(void);
 u8 LaunchTask_PostEvoSparklesSet1(void);
-u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0);
-u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species);
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species);
 u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID);
 
+#define EvoGraphicsTaskEvoStop  data[8]
+
 #endif // GUARD_EVOLUTION_GRAPHICS_H
diff --git a/include/evolution_scene.h b/include/evolution_scene.h
new file mode 100644
index 000000000..48bd6ebe1
--- /dev/null
+++ b/include/evolution_scene.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_EVOLUTION_SCENE_H
+#define GUARD_EVOLUTION_SCENE_H
+
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
+
+extern void (*gCB2_AfterEvolution)(void);
+
+#endif // GUARD_EVOLUTION_SCENE_H
diff --git a/include/field_door.h b/include/field_door.h
index 1759e0dc1..31fdd154b 100644
--- a/include/field_door.h
+++ b/include/field_door.h
@@ -20,6 +20,6 @@ void FieldSetDoorClosed(u32, u32);
 s8 FieldAnimateDoorClose(u32, u32);
 s8 FieldAnimateDoorOpen(u32, u32);
 bool8 FieldIsDoorAnimationRunning(void);
-u32 sub_8058790(u32 x, u32 y);
+u32 GetDoorSoundEffect(u32 x, u32 y);
 
 #endif
diff --git a/include/field_effect.h b/include/field_effect.h
index f43b15afb..a509697e4 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -253,6 +253,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
 void sub_80878A8(void);
 void sub_8087BA8(void);
 
-extern u32 gUnknown_0202FF84[8];
+extern u32 gFieldEffectArguments[8];
 
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index a1dd53a2b..11e96254d 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -27,5 +27,8 @@ void sub_8127ED0(u8, u8);
 void sub_8127F28(u8, u8, s16);
 u8 sub_8128124(u8 id);
 void ash(s16, s16, u16, u8);
+void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a);
+u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject);
+u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index fd29a9a7f..f760bf153 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -18,4 +18,6 @@ void DoShadowFieldEffect(struct MapObject *mapObject);
 u8 sub_8064704(struct Sprite *);
 u8 sub_806478C(struct Sprite *);
 void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3);
+void DoRippleFieldEffect(struct MapObject *mapObj, struct Sprite *sprite);
+
 #endif
diff --git a/include/field_poison.h b/include/field_poison.h
index 8e8e2746f..df0b31434 100644
--- a/include/field_poison.h
+++ b/include/field_poison.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_FIELD_POISON_H
 #define GUARD_FIELD_POISON_H
 
-s32 overworld_poison(void);
+s32 DoPoisonFieldEffect(void);
 
 #endif // GUARD_FIELD_POISON_H
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 572b77711..ff92fcc40 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -404,10 +404,6 @@ void SampleFreqSet(u32 freq);
 void m4aSoundVSyncOn(void);
 void m4aSoundVSyncOff(void);
 
-void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
-void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch);
-void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
 void ClearModM(struct MusicPlayerTrack *track);
 void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth);
 void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 4029132e8..5c93eb8ab 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -14,16 +14,16 @@ enum
 // map types
 enum
 {
-    MAP_TYPE_0,
-    MAP_TYPE_TOWN,
-    MAP_TYPE_CITY,
-    MAP_TYPE_ROUTE,
-    MAP_TYPE_UNDERGROUND,
-    MAP_TYPE_UNDERWATER,
-    MAP_TYPE_6,
-    MAP_TYPE_7,
-    MAP_TYPE_INDOOR,
-    MAP_TYPE_SECRET_BASE
+    MAP_TYPE_0,             // 0
+    MAP_TYPE_TOWN,          // 1
+    MAP_TYPE_CITY,          // 2
+    MAP_TYPE_ROUTE,         // 3
+    MAP_TYPE_UNDERGROUND,   // 4
+    MAP_TYPE_UNDERWATER,    // 5
+    MAP_TYPE_6,             // 6
+    MAP_TYPE_7,             // 7
+    MAP_TYPE_INDOOR,        // 8
+    MAP_TYPE_SECRET_BASE    // 9
 };
 
 // map battle scenes
diff --git a/include/global.h b/include/global.h
index 0a415e3e6..43a105162 100644
--- a/include/global.h
+++ b/include/global.h
@@ -447,43 +447,69 @@ struct MailStruct
     /*0x20*/ u16 itemId;
 };
 
-struct UnkMauvilleOldManStruct
-{
-               u8 unk_2D94;
-               u8 unk_2D95;
-    /*0x2D96*/ u16 mauvilleOldMan_ecArray[6];
-    /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
-    /*0x2DAE*/ u8 playerName[8];
-    /*0x2DB6*/ u8 filler_2DB6[0x3];
-    /*0x2DB9*/ u8 playerTrainerId[4];
-               u8 unk_2DBD;
-}; /*size = 0x2C*/
 
-struct UnkMauvilleOldManStruct2
+// Mauville Pokemon Center men
+
+struct MauvilleManCommon
+{
+    u8 id;
+};
+
+struct MauvilleManBard
 {
-    u8 filler0;
-    u8 unk1;
-    u8 unk2;
-    u16 mauvilleOldMan_ecArray[10];
-    u8 mauvilleOldMan_ecArray2[12];
-    u8 fillerF[0x2];
+    /*0x00*/ u8 id;
+    /*0x02*/ u16 songLyrics[6];
+    /*0x0E*/ u16 temporaryLyrics[6];
+    /*0x1A*/ u8 playerName[8];
+    /*0x22*/ u8 filler_2DB6[0x3];
+    /*0x25*/ u8 playerTrainerId[4];
+    /*0x29*/ bool8 hasChangedSong;
 }; /*size = 0x2C*/
 
-struct MauvilleOldManTrader
+struct MauvilleManHipster
 {
-    u8 unk0;
+    u8 id;
+    bool8 alreadySpoken;
+};
+
+struct MauvilleManTrader
+{
+    u8 id;
     u8 unk1[4];
     u8 unk5[4][11];
-    u8 unk31;
+    bool8 alreadyTraded;
 };
 
-typedef union OldMan
+struct MauvilleManStoryteller
 {
-    struct UnkMauvilleOldManStruct oldMan1;
-    struct UnkMauvilleOldManStruct2 oldMan2;
-    struct MauvilleOldManTrader trader;
-    u8 filler[0x40];
-} OldMan;
+    u8 id;
+    bool8 alreadyRecorded;
+    u8 filler2[2];
+    u8 gameStatIDs[4];
+    u8 trainerNames[4][7];
+    u8 statValues[4][4];
+};
+
+struct MauvilleManGiddy
+{
+    /*0x00*/ u8 id;
+    /*0x01*/ u8 taleCounter;
+    /*0x02*/ u8 questionNum;
+    /*0x04*/ u16 randomWords[10];
+    /*0x18*/ u8 questionList[12];
+}; /*size = 0x2C*/
+
+
+union MauvilleMan
+{
+    struct MauvilleManCommon common;
+    struct MauvilleManBard bard;
+    struct MauvilleManHipster hipster;
+    struct MauvilleManTrader trader;
+    struct MauvilleManStoryteller storyteller;
+    struct MauvilleManGiddy giddy;
+    u8 filler[0x40];  // needed to pad out the struct
+};
 
 struct Unk_SB_Access_Struct1
 {
@@ -603,7 +629,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2C*/ u16 battleMusic;
     /*0x2E*/ u8 weather;
     /*0x2F*/ u8 filler_2F;
-    /*0x30*/ u8 flashUsed;
+    /*0x30*/ u8 flashLevel;  // flash level on current map, 0 being normal and 4 being the darkest
     /*0x32*/ u16 mapDataId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
@@ -661,7 +687,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2B4C*/ struct MailStruct mail[16];
     /*0x2D8C*/ u8 unk2D8C[4];
     /*0x2D90*/ u8 filler_2D90[0x4];
-    /*0x2D94*/ OldMan oldMan;
+    /*0x2D94*/ union MauvilleMan mauvilleMan;
     /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2DFC*/ u8 filler_2DFC[0x8];
     /*0x2E04*/ SB_Struct sbStruct;
diff --git a/include/item_use.h b/include/item_use.h
index 1558f7691..227c0c9ee 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -38,7 +38,7 @@ void sub_80C9FC0(u8);
 void ItemUseOutOfBattle_Repel(u8);
 void ItemUseOutOfBattle_BlackWhiteFlute(u8);
 void task08_080A1C44(u8);
-u8 sub_80CA1C8(void);
+u8 CanUseEscapeRopeOnCurrMap(void);
 void ItemUseOutOfBattle_EscapeRope(u8);
 void ItemUseOutOfBattle_EvolutionStone(u8);
 void ItemUseInBattle_PokeBall(u8);
@@ -49,5 +49,6 @@ void ItemUseInBattle_Escape(u8);
 void ItemUseOutOfBattle_EnigmaBerry(u8);
 void ItemUseInBattle_EnigmaBerry(u8);
 void ItemUseOutOfBattle_CannotUse(u8);
+u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
 
 #endif // GUARD_ITEM_USE_H
diff --git a/include/m4a.h b/include/m4a.h
index b6c8f9072..7d016c98b 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -16,4 +16,9 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
 void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
 
+void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
+void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch);
+void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
+
 #endif //GUARD_M4A_H
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index f7352be22..9fb57743e 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -7,7 +7,7 @@ bool8 sub_8064CFC(void);
 void ScriptFreezeMapObjects(void);
 void sub_8064D38(u8 taskId);
 bool8 sub_8064DB4(void);
-void sub_8064DD8(void);
+void LockSelectedMapObject(void);
 void sub_8064E2C(void);
 void unref_sub_8064E5C(void);
 void sub_8064EAC(void);
diff --git a/include/mauville_man.h b/include/mauville_man.h
new file mode 100644
index 000000000..2b8f139f2
--- /dev/null
+++ b/include/mauville_man.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_MAUVILLE_OLD_MAN_H
+#define GUARD_MAUVILLE_OLD_MAN_H
+
+// IDs
+enum
+{
+    MAUVILLE_MAN_BARD,
+    MAUVILLE_MAN_HIPSTER,
+    MAUVILLE_MAN_TRADER,
+    MAUVILLE_MAN_STORYTELLER,
+    MAUVILLE_MAN_GIDDY,
+};
+
+void SetupMauvilleOldMan(void);
+void sub_80F7F30(void);
+void sub_80F83D0(void);
+
+#endif // GUARD_MAUVILLE_OLD_MAN_H
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
deleted file mode 100644
index 473fcf5c8..000000000
--- a/include/mauville_old_man.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GUARD_MAUVILLE_OLD_MAN_H
-#define GUARD_MAUVILLE_OLD_MAN_H
-
-void SetMauvilleOldMan(void);
-void sub_80F7DC0(void);
-void sub_80F7F30(void);
-void sub_80F7F80(u8);
-void sub_80F83D0(void);
-void sub_80F83F8(void);
-
-#endif // GUARD_MAUVILLE_OLD_MAN_H
diff --git a/include/menu.h b/include/menu.h
index e1bb4f1e4..3cf47b9b8 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -43,7 +43,7 @@ u16 unref_sub_8071F98(u8, u8);
 void unref_sub_8071FBC(u16, u8, u8, u8, u8);
 void MenuDisplayMessageBox(void);
 void MenuPrintMessage(const u8 *, u8, u8);
-void sub_8072044(const u8 *);
+void MenuPrintMessageDefaultCoords(const u8 *);
 void MenuSetText(const u8 *);
 u8 MenuUpdateWindowText(void);
 u8 unref_sub_8072098(void);
@@ -59,7 +59,7 @@ void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32);
 s8 sub_80727CC(void);
 u8 sub_807288C(u8);
 void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
-void PrintMenuItemsReordered(u8, u8, u8, const struct MenuAction[], const u8*);
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
 s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/money.h b/include/money.h
index 06ac00e92..5a0acd482 100644
--- a/include/money.h
+++ b/include/money.h
@@ -2,15 +2,15 @@
 #define GUARD_MONEY_H
 
 bool8 IsEnoughMoney(u32, u32);
-void sub_80B79B8(u32 *, u32);
-void sub_80B79E0(u32 *, u32);
-void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2);
-void sub_80B7A94(u32 arg0, u8 arg1, u8 x, u8 y);
+void AddMoney(u32 *, u32);
+void RemoveMoney(u32 *, u32);
+void GetMoneyAmountText(u8 *buffer, u32 arg1, u8 arg2);
+void PrintMoneyAmount(u32 arg0, u8 arg1, u8 x, u8 y);
 void sub_80B7AEC(u32, u8 left, u8 top);
 void sub_80B7B34(u8, u8, int);
-void sub_80B7BEC(u32, u8, u8);
-void sub_80B7C14(u32, u8, u8);
-void RemoveMoneyLabelObject(u8, u8);
+void UpdateMoneyWindow(u32, u8, u8);
+void OpenMoneyWindow(u32, u8, u8);
+void CloseMoneyWindow(u8, u8);
 bool8 sub_80B7CE8(void);
 void sub_80B7D0C(void);
 
diff --git a/include/rom4.h b/include/overworld.h
index daccad7e9..fcdc8ed97 100644
--- a/include/rom4.h
+++ b/include/overworld.h
@@ -22,12 +22,12 @@ struct UCoords32
     u32 x, y;
 };
 
-extern struct UCoords32 gUnknown_0821664C[];
+extern const struct UCoords32 gUnknown_0821664C[];
 extern void (*gFieldCallback)(void);
 
 // sub_8052F5C
 void flag_var_implications_of_teleport_(void);
-void new_game(void);
+void Overworld_ResetStateAfterTeleport(void);
 void sub_8053014(void);
 void sub_8053050(void);
 // sub_805308C
@@ -36,18 +36,18 @@ void IncrementGameStat(u8 index);
 u32 GetGameStat(u8 index);
 void SetGameStat(u8, u32);
 // sub_8053154
-// sub_8053198
-void update_saveblock1_field_object_coords(u8, s16, s16);
-void update_saveblock1_field_object_movement_behavior(u8, u8);
+// LoadSaveblockMapObjScripts
+void Overworld_SaveMapObjCoords(u8, s16, s16);
+void Overworld_SaveMapObjMovementType(u8, u8);
 // mapdata_load_assets_to_gpu_and_full_redraw
 // get_mapdata_header
 // warp_shift
 // warp_set
 // warp_data_is_not_neg_1
-struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum);
+struct MapHeader * const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum);
 struct MapHeader * const warp1_get_mapheader(void);
 // set_current_map_header_from_sav1_save_old_name
-// sub_805338C
+// LoadSaveblockMapHeader
 // sub_80533CC
 void warp_in(void);
 void warp1_set(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
@@ -81,14 +81,14 @@ void walkrun_find_lowest_active_bit_in_bitfield(void);
 u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3);
 u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8, u16, u8);
 u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void);
-bool32 IsBikingAllowedByMap(void);
-void sub_8053C98(void);
-void sub_8053CE4(s32 a1);
-u8 sav1_get_flash_used_on_map(void);
+bool32 Overworld_IsBikeAllowedOnCurrentMap(void);
+void SetDefaultFlashLevel(void);
+void Overworld_SetFlashLevel(s32 a1);
+u8 Overworld_GetFlashLevel(void);
 void sub_8053D14(u16);
 // sub_8053D30
 // sub_8053D6C
-// sub_8053D9C
+// GetLocationMusic
 // sav1_map_get_music
 // warp1_target_get_music
 // call_map_music_set_to_zero
@@ -97,21 +97,21 @@ void sav1_set_battle_music_maybe(u16);
 void sav1_reset_battle_music_maybe(void);
 void sub_8053F0C(void);
 void sub_8053F84(void);
-void sub_8053FB0(u16);
-// is_warp1_light_level_8_or_9
+void Overworld_ChangeMusicTo(u16);
+// GetMapMusicFadeoutSpeed
 void sub_8053FF8(void);
 bool8 sub_8054034(void);
 void sub_8054044(void);
-// sub_8054050
-void sub_80540D0(s16 *, u16 *);
-void sub_8054164(void);
-u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
-// get_map_light_level_from_warp
-u8 sav1_map_get_light_level(void);
-u8 get_map_light_from_warp0(void);
-bool8 is_light_level_1_2_3_5_or_6(u8 a1);
-bool8 is_light_level_1_2_3_or_6(u8 a1);
-u8 is_light_level_8_or_9(u8);
+// PlayAmbientCry
+void UpdateAmbientCry(s16 *, u16 *);
+void ChooseAmbientCrySpecies(void);
+u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
+// GetMapTypeByWarpData
+u8 Overworld_GetMapTypeOfSaveblockLocation(void);
+u8 get_map_type_from_warp0(void);
+bool8 is_map_type_1_2_3_5_or_6(u8 a1);
+bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 a1);
+u8 Overworld_MapTypeIsIndoors(u8);
 // unref_sub_8054260
 u8 sav1_map_get_name();
 // sav1_map_get_battletype
@@ -119,8 +119,8 @@ u8 sav1_map_get_name();
 bool32 is_c1_link_related_active(void);
 // c1_overworld_normal
 // c1_overworld
-// c2_overworld_basic
-void sub_8054398(void);
+// OverworldBasic
+void CB2_OverworldBasic(void);
 void c2_overworld(void);
 // set_callback1
 // sub_80543DC
diff --git a/include/party_menu.h b/include/party_menu.h
index 9ce476869..5250486bb 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -53,38 +53,55 @@ struct Struct201B000
     u16 unk282;
 };
 
+struct Unk2001000
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5;
+    u8 unk6;
+    u8 unk7;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA;
+    u8 unkB;
+    void* unkC;
+    u16 array[53561];
+};
+
 extern u8 ewram[];
+#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
 #define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
 #define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000))
 #define EWRAM_1B000 ewram1B000_alt
 
 void sub_806AEDC(void);
-void sub_806AF4C();
+void sub_806AF4C(u8 arg0, u8 arg1, void* arg2, u8 arg3);
 void OpenPartyMenu(u8, u8);
 void OpenPartyMenu();
-u8 sub_806B124(void);
+bool8 sub_806B124(void);
 u8 IsLinkDoubleBattle(void);
 u8 sub_806B58C(u8);
 u8 sub_806B58C(u8);
 void sub_806BC3C(u8, u8);
 u8 sub_806BD58(u8, u8);
 u8 sub_806BD58(u8, u8);
-u16 sub_806BD80(); // undefined args in battle_party_menu.c
+u16 sub_806BD80(u8);
 void task_pc_turn_off();
-void sub_806BF74();
-void sub_806C994();
-u8 sub_806CA38(u8);
+void sub_806BF74(u8 arg0, u8 arg1);
+void sub_806C994(u8 arg0, u8 arg1);
+u8 sub_806CA38(u8 taskID);
 void sub_806CB74(u8 taskId);
 void sub_806CCE4(void);
 void sub_806CD44(u8 taskId);
-void sub_806D538();
-void sub_806D538();
-void sub_806D538();
+void sub_806D538(u8 arg0, u8 arg1);
 void sub_806D5A4(void);
 void SetMonIconAnim();
 void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
 void LoadHeldItemIconGraphics(void);
-void LoadHeldItemIconGraphics(void);
+void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c);
 void CreateHeldItemIcons_806DC34(); // undefined args
 void CreateHeldItemIcons_806DC34();
 u8 GetMonIconSpriteId_maybe();
@@ -151,5 +168,13 @@ void DoRareCandyItemEffect(u8, u16, TaskFunc);
 void Task_RareCandy1(u8);
 void Task_RareCandy2(u8);
 void sub_8070848(u8 taskId);
+void sub_806CA60(u8 taskId);
+void sub_806CD5C(u8 taskId);
+void DoTakeMail(u8 taskId, TaskFunc func);
+void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func);
+void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func);
+void sub_806D668(u8 partyID);
+void TaughtMove(u8 taskId);
+void StopTryingToTeachMove_806F588(u8 taskId);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 184bc6cdb..5d76a8a05 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -522,7 +522,7 @@ void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot);
 void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot);
 void GiveMonInitialMoveset(struct Pokemon *mon);
 void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon);
-u16 sub_803B7C8(struct Pokemon *mon, u8 a2);
+u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 a2);
 void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move);
 void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
 
diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h
index fc43a44c6..06f905577 100644
--- a/include/pokemon_menu.h
+++ b/include/pokemon_menu.h
@@ -1,15 +1,47 @@
 #ifndef GUARD_POKEMON_MENU_H
 #define GUARD_POKEMON_MENU_H
 
+#define POKEMENU_FIRST_FIELD_MOVE_ID 10
+
+enum
+{
+    POKEMENU_SUMMARY,           // 0
+    POKEMENU_SWITCH,            // 1
+    POKEMENU_ITEM,              // 2
+    POKEMENU_CANCEL,            // 3
+    POKEMENU_GIVE_ITEM,         // 4
+    POKEMENU_TAKE_ITEM,         // 5
+    POKEMENU_TAKE_MAIL,         // 6
+    POKEMENU_MAIL,              // 7
+    POKEMENU_READ_MAIL,         // 8
+    POKEMENU_CANCEL_SUBMENU,    // 9
+    POKEMENU_CUT,               // 10
+	POKEMENU_FLASH,             // 11
+	POKEMENU_ROCK_SMASH,        // 12
+	POKEMENU_STRENGTH,          // 13
+	POKEMENU_SURF,              // 14
+	POKEMENU_FLY,               // 15
+	POKEMENU_DIVE,              // 16
+	POKEMENU_WATERFALL,         // 17
+	POKEMENU_TELEPORT,          // 18
+	POKEMENU_DIG,               // 19
+	POKEMENU_SECRET_POWER,      // 20
+	POKEMENU_MILK_DRINK,        // 21
+	POKEMENU_SOFT_BOILED,       // 22
+	POKEMENU_SWEET_SCENT,       // 23
+};
+
+extern u8 gLastFieldPokeMenuOpened;
+extern void (*gUnknown_03005CE4)(void);
+
+void sub_808B5B4(u32 taskID);
 void sub_8089A70(void);
-void sub_808A004();
-void sub_808AB90(void);
-void sub_808AB90(void); // unknown args
-void sub_808AB90(void);
+void sub_808A004(u8 taskID);
+void FieldCallback_Teleport(void);
 void sub_808AD58(void);
 void sub_808B020(void);
-void sub_808B0C0(u8);
+void sub_808B0C0(u8 taskID);
 void sub_808B508(u8);
-void sub_808B564();
+void sub_808B564(void);
 
 #endif // GUARD_POKEMON_MENU_H
diff --git a/include/script.h b/include/script.h
index 2a738698c..5a899cf4a 100644
--- a/include/script.h
+++ b/include/script.h
@@ -11,7 +11,7 @@ struct ScriptContext
     u8 stackDepth;
     u8 mode;
     u8 comparisonResult;
-    u8 (*nativePtr)(void);
+    bool8 (*nativePtr)(void);
     const u8 *scriptPtr;
     const u8 *stack[20];
     ScrCmdFunc *cmdTable;
@@ -23,7 +23,7 @@ struct ScriptContext
 
 void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
-void SetupNativeScript(struct ScriptContext *ctx, void *ptr);
+void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void));
 void StopScript(struct ScriptContext *ctx);
 u8 RunScriptCommand(struct ScriptContext *ctx);
 u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr);
@@ -42,16 +42,12 @@ void ScriptContext1_SetupScript(const u8 *ptr);
 void ScriptContext1_Stop(void);
 void EnableBothScriptContexts(void);
 void ScriptContext2_RunNewScript(const u8 *ptr);
-u8 *mapheader_get_tagged_pointer(u8 tag);
-void mapheader_run_script_by_tag(u8 tag);
-u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag);
 void mapheader_run_script_with_tag_x1(void);
 void mapheader_run_script_with_tag_x3(void);
 void mapheader_run_script_with_tag_x5(void);
 void mapheader_run_script_with_tag_x6(void);
 bool8 mapheader_run_first_tag2_script_list_match(void);
 void mapheader_run_first_tag4_script_list_match(void);
-u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
diff --git a/include/script_menu.h b/include/script_menu.h
index cc5c442ec..dca8c26a7 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -1,33 +1,19 @@
 #ifndef GUARD_SCRIPTMENU_H
 #define GUARD_SCRIPTMENU_H
 
-struct MultichoiceListStruct
-{
-    struct MenuAction *list;
-    u8 count;
-};
+struct MenuAction;
 
 extern const u8 *const gUnknown_083CE048[];
 
-bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4);
-bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
-u16 GetStringWidthInTilesForScriptMenu(const u8 *str);
-void DrawMultichoiceMenu(u8, u8, u8, struct MenuAction *list, u8, u8);
-void sub_80B5230(u8, u8, u8, u8, u8, u8);
-void sub_80B52B4(u8);
+bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
+bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
 bool8 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4);
-void sub_80B53B4(u8, u8, u8, struct MenuAction *list, u8);
-bool8 yes_no_box(u8 var1, u8 var2);
-bool8 IsScriptActive(void); // unused
-void task_yes_no_maybe(u8);
-bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
-void sub_80B5684(u8);
-bool8 TryCreatePCMenu(void);
-void CreatePCMenu(void);
-void sub_80B5838(void);
-void task_picbox(u8 taskId);
-bool8 sub_80B58C4(u16 var1, u8 var2, u8 var3);
-void *picbox_close(void);
-bool8 sub_80B59AC(void);
+bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
+bool8 ScrSpecial_CreatePCMenu(void);
+void ScriptMenu_CreatePCMenu(void);
+void ScriptMenu_DisplayPCStartupPrompt(void);
+bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
+bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
 
 #endif
diff --git a/include/script_movement.h b/include/script_movement.h
index e3cdc25b3..dc6d7e51b 100644
--- a/include/script_movement.h
+++ b/include/script_movement.h
@@ -1,8 +1,8 @@
 #ifndef GUARD_SCRIPT_MOVEMENT_H
 #define GUARD_SCRIPT_MOVEMENT_H
 
-bool8 exec_movement(u8, u8, u8, u8 *);
-bool8 sub_80A212C(u8, u8, u8);
+bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, u8 *);
+bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
 void sub_80A2178(void);
 
 #endif // GUARD_SCRIPT_MOVEMENT_H
diff --git a/include/script_pokemon_80C4.h b/include/script_pokemon_80C4.h
index 629980a2d..fab07994e 100644
--- a/include/script_pokemon_80C4.h
+++ b/include/script_pokemon_80C4.h
@@ -8,10 +8,10 @@ void ReducePlayerPartyToThree(void);
 
 u8 sub_80C4D50(void);
 void ShowContestWinner(void);
-void HealPlayerParty();
+void ScrSpecial_HealPlayerParty();
 u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
 u8 ScriptGiveEgg(u16);
-void ScriptWildBattle(u16, u8, u16);
+void CreateScriptedWildMon(u16, u8, u16);
 void ScriptSetMonMoveSlot(u8, u16, u8);
 
 #endif
diff --git a/include/species.h b/include/species.h
index e33481afd..9ab0565cb 100644
--- a/include/species.h
+++ b/include/species.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_SPECIES_H
 #define GUARD_SPECIES_H
 
-enum {
+enum
+{
     SPECIES_NONE,       // 0x000
     SPECIES_BULBASAUR,  // 0x001
     SPECIES_IVYSAUR,    // 0x002
diff --git a/include/start_menu.h b/include/start_menu.h
index 5169b3bf0..d3f77dc99 100644
--- a/include/start_menu.h
+++ b/include/start_menu.h
@@ -5,7 +5,7 @@
 void CreateStartMenuTask(void (*func)(u8));
 void sub_80712B4(u8 taskId);
 void sub_8071310(void);
-void InitSaveDialog(void);
+void ScrSpecial_DoSaveDialog(void);
 void sub_8071B28(void);
 
 #endif // GUARD_STARTER_CHOOSE_H
diff --git a/include/text.h b/include/text.h
index 9a70dec11..7125bc803 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,6 +2,7 @@
 #define GUARD_TEXT_H
 
 #define CHAR_SPACE          0x00
+#define CHAR_SONG_WORD_SEPARATOR 0x37  // separates words in the bard song. Not sure if it's used for anything else
 #define CHAR_0              0xA1
 #define CHAR_QUESTION_MARK  0xAC
 #define CHAR_PERIOD         0xAD
diff --git a/include/trade.h b/include/trade.h
index 8966d7305..a44388506 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,12 +1,23 @@
-//
-// Created by Scott Norton on 8/30/17.
-//
 
-#ifndef POKERUBY_TRADE_H
-#define POKERUBY_TRADE_H
+#ifndef GUARD_TRADE_H
+#define GUARD_TRADE_H
+
+struct SomeTradeStruct
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    struct Window field_4;
+    u8 field_34;
+};
+
+extern struct SomeTradeStruct* gUnknown_03004828;
 
 const u8 gOtherText_MaleSymbol3[1];
 const u8 gOtherText_FemaleSymbol3[1];
 const u8 gOtherText_GenderlessSymbol[1];
 
-#endif //POKERUBY_TRADE_H
+void sub_804E22C(void);
+
+#endif // GUARD_TRADE_H
diff --git a/include/trader.h b/include/trader.h
index 24a9f2a07..832a04b65 100644
--- a/include/trader.h
+++ b/include/trader.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_TRADER_H
 #define GUARD_TRADER_H
 
-void sub_81099CC(void);
+void TraderSetup(void);
+void sub_8109A20(void);
 
 #endif // GUARD_TRADER_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index b80a41641..de96dcd3a 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -7,29 +7,13 @@
 bool8 CheckTrainers(void);
 bool8 CheckTrainer(u8);
 u8 TrainerCanApproachPlayer(struct MapObject *);
-bool8 IsTrainerInRangeSouth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y);
-bool8 IsTrainerInRangeNorth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y);
-bool8 IsTrainerInRangeWest(struct MapObject *trainerObj, s16 vision, s16 x, s16 y);
-bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16 y);
+
 bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *, u8, u8);
 void sub_80842C8(struct MapObject *, u8);
 void sub_80842FC(void (*func)(u8));
 void RunTrainerSeeFuncList(u8);
-u8 sub_8084394(void);
-s8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-s8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-void sub_80846E4(u8 taskId);
 void sub_8084794(struct MapObject *var);
-void sub_80847C8(void);
+void ScrSpecial_EndTrainerApproach(void);
 void sub_80847D8(u8);
 void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);
 void objc_exclamation_mark_probably(struct Sprite *sprite);
diff --git a/include/unknown_task.h b/include/unknown_task.h
index dc07767d6..d7ac63931 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -1,14 +1,24 @@
 #ifndef GUARD_UNKNOWN_TASK_H
 #define GUARD_UNKNOWN_TASK_H
 
+struct UnknownTaskStruct
+{
+    volatile void *dest;
+    u32 control;
+    u8 unk8;
+    u8 unk9;
+};
+
 void remove_some_task(void);
 void remove_some_task(void);
 void dp12_8087EA4(void);
 void dp12_8087EA4(void);
-void sub_80895F8(u32 i, u32 i1, u32 i2);
-void sub_80895F8();
+//void sub_80895F8(u32 i, u32 i1, u32 i2);
+//void sub_80895F8();
+void sub_80895F8(struct UnknownTaskStruct unk);
 void sub_8089668(void);
 void sub_8089668();
-void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6);
+//void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6);
+u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7);
 
 #endif // GUARD_UNKNOWN_TASK_H
diff --git a/include/vars.h b/include/vars.h
index efbb462a4..179fd6f93 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -45,6 +45,7 @@
 #define VAR_0x4095                 0x4095
 #define VAR_0x4097                 0x4097
 #define VAR_0x409a                 0x409a
+#define VAR_WEATHER_INSTITUTE_CLEARED 0x040B3
 #define VAR_PORTHOLE               0x40B4
 
 #define VAR_0x40BC                 0x40BC
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index a4485b08d..d4b343126 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -28,12 +28,12 @@ extern struct WildPokemonHeader gWildMonHeaders[];
 
 void DisableWildEncounters(bool8 disabled);
 bool8 StandardWildEncounter(u16 a, u16 b);
-void RockSmashWildEncounter(void);
+void ScrSpecial_RockSmashWildEncounter(void);
 bool8 SweetScentWildEncounter(void);
-bool8 GetFishingWildMonListHeader(void);
+bool8 DoesCurrentMapHaveFishingMons(void);
 void FishingWildEncounter(u8 rod);
 u16 GetLocalWildMon(bool8 *isWaterMon);
-u16 GetMirageIslandMon(void);
+u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
diff --git a/ld_script.txt b/ld_script.txt
index eaf87a172..f93bcbedb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,8 +59,7 @@ SECTIONS {
         src/battle_7.o(.text);
         src/battle_controller_opponent.o(.text);
         asm/battle_9.o(.text);
-        asm/battle_controller_linkopponent1.o(.text);
-        src/battle_controller_linkopponent2.o(.text);
+        src/battle_controller_linkopponent.o(.text);
         src/pokemon_1.o(.text);
         src/calculate_base_damage.o(.text);
         src/pokemon_2.o(.text);
@@ -85,7 +84,7 @@ SECTIONS {
         src/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
-        src/rom4.o(.text);
+        src/overworld.o(.text);
         src/fieldmap.o(.text);
         src/metatile_behavior.o(.text);
         src/field_camera.o(.text);
@@ -95,7 +94,6 @@ SECTIONS {
         asm/field_map_obj.o(.text);
         src/field_map_obj.o(.text_fmocb2_c);
         src/field_ground_effect.o(.text);
-        asm/field_ground_effect.o(.text);
         src/field_map_obj_helpers.o(.text);
         src/field_message_box.o(.text);
         src/map_obj_lock.o(.text);
@@ -127,15 +125,13 @@ SECTIONS {
         src/field_fadetransition.o(.text);
         src/field_screen_effect.o(.text);
         src/battle_setup.o(.text);
-        asm/cable_club.o(.text);
         src/cable_club.o(.text);
-        asm/cable_club.o(.text_80830E4);
         src/mori_debug_menu.o(.text);
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
         src/field_effect.o(.text);
         src/unknown_task.o(.text);
-        asm/pokemon_menu.o(.text);
+        src/pokemon_menu.o(.text);
         src/option_menu.o(.text);
         src/pokedex.o(.text);
         src/trainer_card.o(.text);
@@ -187,8 +183,7 @@ SECTIONS {
         src/pokenav.o(.text);
         asm/pokenav.o(.text_80F708C);
         src/mon_markings.o(.text);
-        src/mauville_old_man.o(.text);
-        asm/mauville_old_man.o(.text);
+        src/mauville_man.o(.text);
         src/mail.o(.text);
         src/menu_helpers.o(.text);
         src/script_pokemon_util_80F99CC.o(.text);
@@ -217,7 +212,7 @@ SECTIONS {
         src/field_specials.o(.text);
         src/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
-        asm/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         asm/roulette.o(.text);
         asm/pokedex_cry_screen.o(.text);
         src/pokedex_cry_screen.o(.text);
@@ -238,9 +233,7 @@ SECTIONS {
         asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_81258BC.o(.text);
-        asm/battle_controller_safari.o(.text);
         src/battle_controller_safari.o(.text);
-        asm/battle_controller_safari.o(.text_812BBFC);
         src/fldeff_sweetscent.o(.text);
         asm/battle_anim_812C144.o(.text);
         src/learn_move.o(.text);
@@ -333,7 +326,7 @@ SECTIONS {
         src/battle_controller_player.o(.rodata);
         data/data2b.o(.rodata);
         src/battle_controller_opponent.o(.rodata);
-        src/battle_controller_linkopponent2.o(.rodata);
+        src/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
         src/battle_3.o(.rodata);
         src/pokemon_data.o(.rodata);
@@ -347,7 +340,7 @@ SECTIONS {
         data/trade.o(.rodata);
         src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
-        data/rom4.o(.rodata);
+        src/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
         src/fieldmap.o(.rodata);
@@ -356,7 +349,6 @@ SECTIONS {
         src/field_player_avatar.o(.rodata);
         src/field_map_obj.o(.rodata);
         src/field_ground_effect.o(.rodata);
-        data/field_ground_effect.o(.rodata);
         data/field_map_obj_helpers.o(.rodata);
         data/text_window.o(.rodata);
         src/script.o(.rodata);
@@ -383,11 +375,12 @@ SECTIONS {
         src/battle_setup.o(.rodata);
         data/cable_club.o(.rodata);
         data/mori_debug_menu.o(.rodata);
+        src/trainer_see.o(.rodata);
         data/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         data/wild_encounter.o(.rodata);
         src/field_effect.o(.rodata);
-        data/pokemon_menu.o(.rodata);
+        src/pokemon_menu.o(.rodata);
         src/option_menu.o(.rodata);
         src/pokedex.o(.rodata);
         src/trainer_card.o(.rodata);
@@ -425,7 +418,7 @@ SECTIONS {
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
         data/mon_markings.o(.rodata);
-        data/mauville_old_man.o(.rodata);
+        src/mauville_man.o(.rodata);
         data/mail.o(.rodata);
         src/menu_helpers.o(.rodata);
         src/heal_location.o(.rodata);
@@ -443,7 +436,7 @@ SECTIONS {
         src/time_events.o(.rodata);
         src/field_specials.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
-        data/evolution_scene.o(.rodata);
+        src/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
         data/landmark.o(.rodata);
diff --git a/shared_syms.txt b/shared_syms.txt
index 884f0e89d..571e0633e 100644
--- a/shared_syms.txt
+++ b/shared_syms.txt
@@ -3,6 +3,8 @@ ewram = 0x2000000;
 
 unk_2004000 = 0x2004000;
 
+gUnk_2009000 = 0x2009000;
+
 unk_2007800 = 0x2007800;
 unk_2007900 = 0x2007900;
 
diff --git a/src/bard_music.c b/src/bard_music.c
index a31568475..daf003233 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,71 +1,43 @@
 #include "global.h"
+#include "bard_music.h"
 #include "easy_chat.h"
 
 struct BardSound
 {
-    u8 pad_00[48];
-};
-
-struct UnkBard
-{
     /*0x00*/ u8 var00;
     /*0x01*/ s8 var01;
     /*0x02*/ u16 var02;
-    /*0x04*/ u16 var04;
+    /*0x04*/ u16 volume;
     /*0x06*/ u16 var06;
 };
 
-struct UnkBard3
-{
-    /*0x00*/ u16 var00;
-    /*0x02*/ u16 var02;
-    /*0x04*/ s16 var04;
-    /*0x06*/ u16 var06;
-};
-
-struct UnkBard2
-{
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 var02;
-    /*0x03*/ u8 var03;
-    /*0x04*/ u16 var04;
-             u8 pad06[4];
-    /*0x0A*/ u16 var0A;
-             u8 pad0C[12];
-    /*0x18*/ struct UnkBard3 var18[6];
-};
-
-extern struct BardSound *gBardMusicTable[];
+extern const struct BardSound (*const gBardMusicTable[])[][6];
 extern s16 *gUnknown_08417068[];
 extern u32 gUnknown_084170F4[];
 
-static s16 sub_814A2B8(u32 arg0, u32 arg1)
+static s16 CalcWordPitch(u32 arg0, u32 songPos)
 {
-    return gUnknown_08417068[arg0][arg1];
+    return gUnknown_08417068[arg0][songPos];
 }
 
 #if ENGLISH
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    struct BardSound *sounds = gBardMusicTable[arg0];
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
 
-    return &sounds[arg1];
+    return (*sounds)[word];
 }
 #elif GERMAN
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    u32 index;
-    struct BardSound *sounds;
-
-    sounds = gBardMusicTable[arg0];
-    index = de_sub_80EB748(arg0, arg1);
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
+    u32 index = de_sub_80EB748(group, word);
 
-    return &sounds[index];
+    return (*sounds)[index];
 }
 #endif
 
-s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
+s32 GetWordPhonemes(struct BardSong *song, const struct BardSound *src, u16 arg2)
 {
     s32 i;
     s32 j;
@@ -73,25 +45,25 @@ s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
 
     for (i = 0; i < 6; i++)
     {
-        dest->var18[i].var00 = src[i].var00;
+        song->phonemes[i].sound = src[i].var00;
         if (src[i].var00 != 0xFF)
         {
-            s32 r1 = src[i].var01 +gUnknown_084170F4[src[i].var00];
+            s32 length = src[i].var01 + gUnknown_084170F4[src[i].var00];
 
-            dest->var18[i].var02 = r1;
-            dest->var18[i].var06 = src[i].var04;
-            dest->var04 += r1;
+            song->phonemes[i].length = length;
+            song->phonemes[i].volume = src[i].volume;
+            song->var04 += length;
         }
     }
 
     for (j = 0, thirty = 30; j < i; j++)
-        dest->var18[j].var04 = sub_814A2B8(thirty + arg2, j);
+        song->phonemes[j].pitch = CalcWordPitch(thirty + arg2, j);
 
-    dest->var00++;
-    dest->var01 = 0;
-    dest->var02 = 0;
-    dest->var03 = 0;
-    dest->var0A = 0;
+    song->currWord++;
+    song->currPhoneme = 0;
+    song->phonemeTimer = 0;
+    song->state = 0;
+    song->voiceInflection = 0;
 
     //warning: no return statement in function returning non-void
 }
diff --git a/src/battle_2.c b/src/battle_2.c
index 106d3333b..3cdea07be 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -181,7 +181,7 @@ extern u8 gHealthboxIDs[];
 extern struct UnknownStruct6 gUnknown_03004DE0;
 //extern u16 gUnknown_03004DE0[][0xA0];  // possibly?
 extern u16 gBattleTypeFlags;
-extern s8 gBattleTerrain;  // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of GetBattleTerrain.
+extern s8 gBattleTerrain;  // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of BattleSetup_GetTerrain.
 extern u8 gReservedSpritePaletteCount;
 extern u16 gTrainerBattleOpponent;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
@@ -239,7 +239,8 @@ void InitBattle(void)
         gUnknown_03004DE0.unk0[i] = 0xFF10;
         gUnknown_03004DE0.unk780[i] = 0xFF10;
     }
-    sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
+    //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
+    sub_80895F8(gUnknown_081F9674);
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
     gUnknown_030042A4 = 0;
@@ -250,7 +251,7 @@ void InitBattle(void)
     gUnknown_03004280 = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
-    gBattleTerrain = GetBattleTerrain();
+    gBattleTerrain = BattleSetup_GetTerrain();
     InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
     InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0);
     InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC);
diff --git a/src/battle_4.c b/src/battle_4.c
index a796ace94..65ea765cf 100644
--- a/src/battle_4.c
+++ b/src/battle_4.c
@@ -82,7 +82,7 @@ extern void (*gBattleMainFunc)(void);
 extern struct Window gUnknown_03004210;
 extern const u8 gUnknown_08400D7A[];
 extern u8 gPlayerPartyCount;
-extern u16 word_2024E82; //move to learn
+extern u16 gMoveToLearn; //move to learn
 extern const u8 gTrainerMoney[];
 extern u16 gRandomMove;
 extern u8* gBattleScriptsEffectsTable[];
@@ -129,7 +129,7 @@ u16 sub_803FBFC(u8 a);
 u8 GetBankByPlayerAI(u8 ID);
 void sub_8012258(u8);
 void sub_80157C4(u8 bank); //update sent pokes in battle
-//sub_803B7C8 teach poke a move
+//MonTryLearningNewMove teach poke a move
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
 void IncrementGameStat(u8 index);
 u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
@@ -144,7 +144,7 @@ void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0);
 void nullsub_6(void);
 void ReshowBattleScreenAfterMenu(void);
 void sub_800F808(void);
-void sub_80B79B8(u32* moneySaveblock, u32 to_give);
+void AddMoney(u32* moneySaveblock, u32 to_give);
 void sub_80156DC(void); //set sentpokes value
 bool8 sub_8014AB8(u8 bank); //can run from battle
 u8 CountAliveMons(u8 caseID);
@@ -154,7 +154,7 @@ u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move
 void sub_80153D0(u8 atk); //pressure perish song pp decrement
 u8 CastformDataTypeChange(u8 bank);
 void b_push_move_exec(u8* bs_ptr);
-u8 sav1_map_get_light_level(void);
+u8 Overworld_GetMapTypeOfSaveblockLocation(void);
 u8 CalculatePlayerPartyCount(void);
 u16 Sqrt(u32 num);
 u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display
@@ -11460,9 +11460,9 @@ void atk59_learnmove_inbattle(void)
     u8* loc1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     u8* loc2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
 
-    u16 ret = sub_803B7C8(&gPlayerParty[BATTLE_STRUCT->expGetterID], BSScriptRead8(gBattlescriptCurrInstr + 9));
+    u16 ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], BSScriptRead8(gBattlescriptCurrInstr + 9));
     while (ret == 0xFFFE)
-        ret = sub_803B7C8(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0);
+        ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0);
 
     if (ret == 0)
     {
@@ -11549,7 +11549,7 @@ static void atk5A(void)
     case 2:
         if (!gPaletteFade.active)
         {
-            sub_809D9F0(gPlayerParty, BATTLE_STRUCT->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, word_2024E82);
+            sub_809D9F0(gPlayerParty, BATTLE_STRUCT->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn);
             BATTLE_STRUCT->atk5A_StateTracker++;
         }
         break;
@@ -11584,18 +11584,18 @@ static void atk5A(void)
                     }
                     ptr[0] = 0xFF;
                     RemoveMonPPBonus(&gPlayerParty[BATTLE_STRUCT->expGetterID], move_pos);
-                    SetMonMoveSlot(&gPlayerParty[BATTLE_STRUCT->expGetterID], word_2024E82, move_pos);
+                    SetMonMoveSlot(&gPlayerParty[BATTLE_STRUCT->expGetterID], gMoveToLearn, move_pos);
                     if (gBattlePartyID[0] == BATTLE_STRUCT->expGetterID && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[0].unk18_b & gBitTable[move_pos]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[0], move_pos);
-                        SetBattleMonMoveSlot(&gBattleMons[0], word_2024E82, move_pos);
+                        SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, move_pos);
                     }
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[2] == BATTLE_STRUCT->expGetterID && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[2].unk18_b & gBitTable[move_pos]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[2], move_pos);
-                        SetBattleMonMoveSlot(&gBattleMons[2], word_2024E82, move_pos);
+                        SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, move_pos);
                     }
                 }
             }
@@ -11717,7 +11717,7 @@ static void atk5D_getmoneyreward(void)
             money_to_give = 1 * gTrainerMoney[i * 4 + 1] * money_to_give;
     }
 
-    sub_80B79B8(&gSaveBlock1.money, money_to_give);
+    AddMoney(&gSaveBlock1.money, money_to_give);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 1;
     gBattleTextBuff1[2] = 4;
@@ -11889,7 +11889,7 @@ _0802413C:\n\
 _08024140:\n\
     mov r0, r8\n\
     adds r1, r4, 0\n\
-    bl sub_80B79B8\n\
+    bl AddMoney\n\
     ldr r1, _0802418C @ =gBattleTextBuff1\n\
     movs r0, 0xFD\n\
     strb r0, [r1]\n\
@@ -12653,8 +12653,8 @@ void sub_8024CEC(void)
 {
     gBattleTextBuff2[0] = 0xFD;
     gBattleTextBuff2[1] = 2;
-    gBattleTextBuff2[2] = (word_2024E82);
-    gBattleTextBuff2[3] = uBYTE1_16(word_2024E82);
+    gBattleTextBuff2[2] = (gMoveToLearn);
+    gBattleTextBuff2[3] = uBYTE1_16(gMoveToLearn);
     gBattleTextBuff2[4] = 0xFF;
 }
 
@@ -14186,7 +14186,7 @@ static void atk91_givepaydaymoney(void)
 {
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney)
     {
-        sub_80B79B8(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
+        AddMoney(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
         gBattleTextBuff1[0] = 0xFD;
         gBattleTextBuff1[1] = 1;
         gBattleTextBuff1[2] = 2;
@@ -17570,28 +17570,28 @@ static void atkE4_getsecretpowereffect(void)
 {
     switch (gBattleTerrain)
     {
-    case 0:
+    case BATTLE_TERRAIN_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 2;
         break;
-    case 1:
+    case BATTLE_TERRAIN_LONG_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 1;
         break;
-    case 2:
+    case BATTLE_TERRAIN_SAND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 27;
         break;
-    case 3:
+    case BATTLE_TERRAIN_UNDERWATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 23;
         break;
-    case 4:
+    case BATTLE_TERRAIN_WATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 22;
         break;
-    case 5:
+    case BATTLE_TERRAIN_POND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 24;
         break;
-    case 6:
+    case BATTLE_TERRAIN_MOUNTAIN:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 7;
         break;
-    case 7:
+    case BATTLE_TERRAIN_CAVE:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 8;
         break;
     default:
@@ -17818,7 +17818,7 @@ void atkEF_pokeball_catch_calculation(void)
                     ball_multiplier = 10;
                 break;
             case ITEM_DIVE_BALL:
-                if (sav1_map_get_light_level() == 5)
+                if (Overworld_GetMapTypeOfSaveblockLocation() == 5)
                     ball_multiplier = 35;
                 else
                     ball_multiplier = 10;
diff --git a/src/battle_controller_linkopponent2.c b/src/battle_controller_linkopponent.c
index 59030cd6e..93c6671e5 100644
--- a/src/battle_controller_linkopponent2.c
+++ b/src/battle_controller_linkopponent.c
@@ -3,6 +3,8 @@
 #include "battle_interface.h"
 #include "data2.h"
 #include "link.h"
+#include "m4a.h"
+#include "main.h"
 #include "palette.h"
 #include "rom_8077ABC.h"
 #include "rom3.h"
@@ -48,6 +50,9 @@ extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
 extern u8 gUnknown_0300434C[];
+extern u32 gBattleExecBuffer;
+extern MainCallback gPreBattleCallback1;
+extern struct MusicPlayerInfo gMPlay_BGM;
 
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
@@ -99,10 +104,14 @@ extern u8 move_anim_start_t3();
 extern void sub_8037FD8(void);
 extern void sub_8037F34(void);
 extern void LinkOpponentBufferExecCompleted(void);
+extern void sub_8141828();
+extern void sub_804777C();
 
 // this file's functions
 
 u32 dp01_getattr_by_ch1_for_player_pokemon__(u8, u8 *);
+void sub_803752C(void);
+void sub_8037D2C(void);
 void sub_8038900(u8);
 void sub_8039430(u8, u8);
 void sub_8039648(void);
@@ -234,6 +243,330 @@ const BattleBufferCmd gLinkOpponentBufferCommands[] =
 
 // code
 
+void nullsub_47(void)
+{
+}
+
+void SetBankFuncToLinkOpponentBufferRunCommand(void)
+{
+    gBattleBankFunc[gActiveBank] = sub_803752C;
+}
+
+void sub_803752C(void)
+{
+    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    {
+        if (gBattleBufferA[gActiveBank][0] <= 0x38)
+            gLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        else
+            LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_803757C(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_80375B4(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    {
+        sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam);
+        gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data5;
+        FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
+        DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037644(void)
+{
+    if ((--ewram17810[gActiveBank].unk9) == 0xFF)
+    {
+        ewram17810[gActiveBank].unk9 = 0;
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037680(void)
+{
+    bool8 r6 = FALSE;
+
+    if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
+    {
+        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+            r6 = TRUE;
+    }
+    else
+    {
+        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+            r6 = TRUE;
+    }
+    if (IsCryPlayingOrClearCrySongs())
+        r6 = FALSE;
+
+    if (r6)
+    {
+        if (GetBankIdentity(gActiveBank) == 1)
+        {
+            if (!ewram17810[gActiveBank].unk1_0 || !ewram17810[gActiveBank ^ 2].unk1_0)
+                return;
+            ewram17810[gActiveBank].unk0_7 = 0;
+            ewram17810[gActiveBank].unk1_0 = 0;
+            ewram17810[gActiveBank ^ 2].unk0_7 = 0;
+            ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+            FreeSpriteTilesByTag(0x27F9);
+            FreeSpritePaletteByTag(0x27F9);
+        }
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            if (GetBankIdentity(gActiveBank) == 1)
+                m4aMPlayContinue(&gMPlay_BGM);
+        }
+        else
+        {
+            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        }
+        ewram17810[gActiveBank].unk9 = 3;
+        gBattleBankFunc[gActiveBank] = sub_8037644;
+    }
+}
+
+void sub_8037840(void)
+{
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
+        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
+        sub_8141828(gActiveBank ^ 2, &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]]);
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    {
+        if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBankIdentity(gActiveBank) == 3)
+        {
+            if (++ewram17810[gActiveBank].unk9 == 1)
+                return;
+            ewram17810[gActiveBank].unk9 = 0;
+        }
+        if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
+        {
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
+            sub_8045A5C(
+              gHealthboxIDs[gActiveBank ^ 2],
+              &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]],
+              0);
+            sub_804777C(gActiveBank ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            sub_8032984(
+              gActiveBank ^ 2,
+              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], MON_DATA_SPECIES));
+        }
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        sub_8045A5C(
+          gHealthboxIDs[gActiveBank],
+          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          0);
+        sub_804777C(gActiveBank);
+        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_8032984(
+          gActiveBank,
+          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+
+        ewram17840.unk9_0 = 0;
+        gBattleBankFunc[gActiveBank] = sub_8037680;
+    }
+}
+
+void sub_8037A74(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].animEnded == TRUE
+     && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+    {
+        if (!ewram17810[gActiveBank].unk0_7)
+        {
+            sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            return;
+        }
+        if (ewram17810[gActiveBank].unk1_0)
+        {
+            ewram17810[gActiveBank].unk0_7 = 0;
+            ewram17810[gActiveBank].unk1_0 = 0;
+            FreeSpriteTilesByTag(0x27F9);
+            FreeSpritePaletteByTag(0x27F9);
+            LinkOpponentBufferExecCompleted();
+            return;
+        }
+    }
+}
+
+void sub_8037B24(void)
+{
+    s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
+
+    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    if (r4 != -1)
+        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+    else
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_8037B78(void)
+{
+    if (!gSprites[gObjectBankIDs[gActiveBank]].inUse)
+    {
+        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037BBC(void)
+{
+    if (!ewram17810[gActiveBank].unk0_6)
+    {
+        FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
+        DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+        sub_8032A08(gActiveBank);
+        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037C2C(void)
+{
+    if (gUnknown_03004210.state == 0)
+        LinkOpponentBufferExecCompleted();
+}
+
+void dp01t_0F_4_move_anim(void)
+{
+    u8 spriteId = gObjectBankIDs[gActiveBank];
+
+    if (gSprites[spriteId].data1 == 32)
+    {
+        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].invisible = FALSE;
+        gDoingBattleAnim = 0;
+        LinkOpponentBufferExecCompleted();
+    }
+    else
+    {
+        if (((u16)gSprites[spriteId].data1 % 4) == 0)
+            gSprites[spriteId].invisible ^= 1;
+        gSprites[spriteId].data1++;
+    }
+}
+
+void sub_8037CC0(void)
+{
+    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    {
+        if (ewram17800[gActiveBank].substituteSprite)
+            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
+        gBattleBankFunc[gActiveBank] = sub_8037D2C;
+    }
+}
+
+void sub_8037D2C(void)
+{
+    if (!ewram17810[gActiveBank].unk0_6)
+    {
+        CreateTask(c3_0802FDF4, 10);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037D64(void)
+{
+    if (ewram17810[gActiveBank].unk1_0)
+    {
+        ewram17810[gActiveBank].unk0_7 = 0;
+        ewram17810[gActiveBank].unk1_0 = 0;
+        FreeSpriteTilesByTag(0x27F9);
+        FreeSpritePaletteByTag(0x27F9);
+        StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0);
+        sub_8045A5C(
+          gHealthboxIDs[gActiveBank],
+          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          0);
+        sub_804777C(gActiveBank);
+        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_8031F88(gActiveBank);
+        gBattleBankFunc[gActiveBank] = sub_8037CC0;
+    }
+}
+
+void sub_8037E30(void)
+{
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
+        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBank].unk0_3)
+    {
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+        gBattleBankFunc[gActiveBank] = sub_8037D64;
+    }
+}
+
+void sub_8037EF0(void)
+{
+    if (gReceivedRemoteLinkPlayers == 0)
+    {
+        m4aSongNumStop(SE_HINSI);
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(c2_8011A1C);
+    }
+}
+
+void sub_8037F34(void)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            sub_800832C();
+            gBattleBankFunc[gActiveBank] = sub_8037EF0;
+        }
+        else
+        {
+            m4aSongNumStop(SE_HINSI);
+            gMain.inBattle = FALSE;
+            gMain.callback1 = gPreBattleCallback1;
+            SetMainCallback2(gMain.savedCallback);
+        }
+    }
+}
+
+void sub_8037FAC(void)
+{
+    if (!ewram17810[gActiveBank].unk0_4)
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_8037FD8(void)
+{
+    if (!ewram17810[gActiveBank].unk0_5)
+        LinkOpponentBufferExecCompleted();
+}
+
+void LinkOpponentBufferExecCompleted(void)
+{
+    gBattleBankFunc[gActiveBank] = sub_803752C;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 playerId = GetMultiplayerId();
+
+        PrepareBufferDataTransferLink(2, 4, &playerId);
+        gBattleBufferA[gActiveBank][0] = 0x38;
+    }
+    else
+    {
+        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    }
+}
+
 void LinkOpponentHandleGetAttributes(void)
 {
     u8 buffer[0x100];
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index e84969b4f..e05578c31 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -2,8 +2,16 @@
 #include "battle_anim_81258BC.h"
 #include "battle.h"
 #include "battle_message.h"
+#include "data2.h"
+#include "link.h"
+#include "main.h"
 #include "menu_cursor.h"
+#include "palette.h"
+#include "rom3.h"
+#include "songs.h"
+#include "sound.h"
 #include "text.h"
+#include "util.h"
 
 extern struct Window gUnknown_03004210;
 extern u8 gDisplayedStringBattle[];
@@ -16,6 +24,32 @@ extern const u8 gUnknown_08400D15[];
 extern void *gBattleBankFunc[];
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
+extern u8 gBattleBufferA[][0x200];
+extern bool8 gDoingBattleAnim;
+extern u8 gObjectBankIDs[];
+extern struct SpriteTemplate gUnknown_02024E8C;
+extern u16 gBattleTypeFlags;
+extern u32 gBattleExecBuffer;
+extern u16 gScriptItemId;
+extern MainCallback gPreBattleCallback1;
+extern u8 gBankInMenu;
+extern u8 gHealthboxIDs[];
+extern u16 gBattlePartyID[];
+extern u16 gUnknown_02024DE8;
+extern u8 gBattleOutcome;
+
+extern u8 GetBankSide(u8);
+extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankIdentity(u8);
+extern void LoadPlayerTrainerBankSprite();
+extern u8 sub_8079E90();
+extern void sub_80313A0(struct Sprite *);
+extern void sub_810BADC(void);
+extern void sub_8045A5C();
+extern void sub_80E43C0();
+extern void sub_804777C();
+extern void sub_8043DFC();
+extern bool8 move_anim_start_t3();
 
 #if ENGLISH
 #define SUB_812BB10_TILE_DATA_OFFSET 440
@@ -146,7 +180,292 @@ const BattleBufferCmd gSafariBufferCommands[] =
 };
 // code
 
-void SafariHandlecmd18(void) {
+void SafariBufferExecCompleted(void);
+void bx_wait_t6(void);
+void sub_812B65C(void);
+void SafariBufferRunCommand(void);
+void sub_812B758(void);
+
+void unref_sub_812B464(void)
+{
+}
+
+void SetBankFuncToSafariBufferRunCommand(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+}
+
+void SafariBufferRunCommand(void)
+{
+    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    {
+        if (gBattleBufferA[gActiveBank][0] < 0x39)
+            gSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        else
+            SafariBufferExecCompleted();
+    }
+}
+
+void bx_battle_menu_t6_2(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        DestroyMenuCursor();
+
+        // Useless switch statement.
+        switch (gActionSelectionCursor[gActiveBank])
+        {
+        case 0:
+            Emitcmd33(1, 5, 0);
+            break;
+        case 1:
+            Emitcmd33(1, 6, 0);
+            break;
+        case 2:
+            Emitcmd33(1, 7, 0);
+            break;
+        case 3:
+            Emitcmd33(1, 8, 0);
+            break;
+        }
+        SafariBufferExecCompleted();
+    }
+    else if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 1)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 2)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+}
+
+void sub_812B65C(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B694(void)
+{
+    if (gUnknown_03004210.state == 0)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B6AC(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+void bx_wait_t6(void)
+{
+    if (!gDoingBattleAnim || !ewram17810[gActiveBank].unk0_6)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B724(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gBattleBankFunc[gActiveBank] = sub_812B758;
+        sub_810BADC();
+    }
+}
+
+void sub_812B758(void)
+{
+    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    {
+        Emitcmd35(1, gScriptItemId);
+        SafariBufferExecCompleted();
+    }
+}
+
+void sub_812B794(void)
+{
+    if (!ewram17810[gActiveBank].unk0_5)
+        SafariBufferExecCompleted();
+}
+
+void SafariBufferExecCompleted(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 playerId = GetMultiplayerId();
+
+        PrepareBufferDataTransferLink(2, 4, &playerId);
+        gBattleBufferA[gActiveBank][0] = 0x38;
+    }
+    else
+    {
+        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    }
+}
+
+void unref_sub_812B838(void)
+{
+    if (!ewram17810[gActiveBank].unk0_4)
+        SafariBufferExecCompleted();
+}
+
+void SafariHandleGetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd1(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd3(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleLoadPokeSprite(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSendOutPoke(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleReturnPokeToBall(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerThrow(void)
+{
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
+    gObjectBankIDs[gActiveBank] = CreateSprite(
+      &gUnknown_02024E8C,
+      80,
+      (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
+      30);
+    gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
+    gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
+    gSprites[gObjectBankIDs[gActiveBank]].data0 = -2;
+    gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBank] = sub_812B65C;
+}
+
+void SafariHandleTrainerSlide(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerSlideBack(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd10(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd11(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd12(void)
+{
+    ewram17840.unk8 = 4;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+void SafariHandleBallThrow(void)
+{
+    u8 var = gBattleBufferA[gActiveBank][1];
+
+    ewram17840.unk8 = var;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+// TODO: spell Pause correctly
+void SafariHandlePuase(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleMoveAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlePrintString(void)
+{
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+    gBattleBankFunc[gActiveBank] = sub_812B694;
+}
+
+void SafariHandlePrintStringPlayerOnly(void)
+{
+    if (GetBankSide(gActiveBank) == 0)
+        SafariHandlePrintString();
+    else
+        SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd18(void)
+{
     int i;
 
     gUnknown_030042A4 = 0;
@@ -161,9 +480,7 @@ void SafariHandlecmd18(void) {
     sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
 
     for (i = 0; i < 4; i++)
-    {
         nullsub_8(i);
-    }
 
     sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
     StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB);
@@ -171,3 +488,222 @@ void SafariHandlecmd18(void) {
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
     sub_8002F44(&gUnknown_03004210);
 }
+
+void SafariHandlecmd19(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd20(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleOpenBag(void)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gBattleBankFunc[gActiveBank] = sub_812B724;
+    gBankInMenu = gActiveBank;
+}
+
+void SafariHandlecmd22(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd23(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHealthBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleExpBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusIconUpdate(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 11);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusXor(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd29(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleDMATransfer(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd31(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd32(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd33(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd34(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd35(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd36(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd37(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd38(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd39(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd40(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHitAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd42(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleEffectivenessSound(void)
+{
+    s8 pan;
+
+    if (GetBankSide(gActiveBank) == 0)
+        pan = -64;
+    else
+        pan = 63;
+    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd44(void)
+{
+    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleFaintingCry(void)
+{
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+
+    PlayCry1(species, 25);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleIntroSlide(void)
+{
+    sub_80E43C0(gBattleBufferA[gActiveBank][1]);
+    gUnknown_02024DE8 |= 1;
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerBallThrow(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 10);
+    sub_804777C(gActiveBank);
+    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd48(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd49(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd50(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSpriteInvisibility(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleBattleAnimation(void)
+{
+    u8 r3 = gBattleBufferA[gActiveBank][1];
+    u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+
+    if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        SafariBufferExecCompleted();
+    else
+        gBattleBankFunc[gActiveBank] = sub_812B794;
+}
+
+void SafariHandleLinkStandbyMsg(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleResetActionMoveSelection(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd55(void)
+{
+    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    FadeOutMapMusic(5);
+    BeginFastPaletteFade(3);
+    SafariBufferExecCompleted();
+    if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
+        gBattleBankFunc[gActiveBank] = sub_812B6AC;
+}
+
+void SafariHandlecmd56(void)
+{
+}
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 73b847713..49e0b8432 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -35,23 +35,16 @@ extern void PartyMenuDrawHPBars(void);
 extern u8 sub_806B58C(u8);
 extern u8 GetItemEffectType();
 extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
-extern u16 sub_806BD80();
-extern u8 sub_806CA38();
 extern void sub_806D5A4(void);
 extern void sub_802E414(void);
 extern void sub_80A6DCC(void);
 extern void sub_806AF4C();
-extern u8 sub_80F9344(void);
-extern u8 sub_806B124(void);
-extern void sub_806C994();
-extern void sub_806BF74();
 extern void sub_806AEDC(void);
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
 extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
 extern u8 *sub_8040D08();
 extern void sub_8040B8C(void);
 extern void sub_806E6F0();
-extern void sub_806D538();
 extern void nullsub_14();
 extern void OpenPartyMenu();
 extern u8 sub_803FBBC(void);
@@ -586,7 +579,7 @@ static void Task_809538C(void)
 {
     do
     {
-        if (sub_806B124() == 1)
+        if (sub_806B124() == TRUE)
         {
             sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
             sub_806BF74(EWRAM_1B000.unk260, 0);
diff --git a/src/battle_records.c b/src/battle_records.c
index 61dc09792..d848a10b8 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -3,7 +3,7 @@
 #include "game_stat.h"
 #include "link.h"
 #include "menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "string_util.h"
 #include "strings2.h"
 #include "trainer_card.h"
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 31c127416..59e17e9eb 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -18,7 +18,7 @@
 #include "opponent_constants.h"
 #include "palette.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "script_pokemon_80C4.h"
@@ -37,15 +37,15 @@ extern u16 gScriptResult;
 
 extern void (*gFieldCallback)(void);
 
-EWRAM_DATA u16 gTrainerBattleMode = 0;
+EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent = 0;
-EWRAM_DATA u16 gTrainerMapObjectLocalId = 0;
-EWRAM_DATA u8 *gTrainerIntroSpeech = NULL;
-EWRAM_DATA u8 *gTrainerDefeatSpeech = NULL;
-EWRAM_DATA u8 *gTrainerVictorySpeech = NULL;
-EWRAM_DATA u8 *gTrainerCannotBattleSpeech = NULL;
-EWRAM_DATA u8 *gTrainerBattleScriptReturnAddress = NULL;
-EWRAM_DATA u8 *gTrainerBattleEndScript = NULL;
+EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL;
+EWRAM_DATA static u8 *sTrainerCannotBattleSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerBattleScriptRetAddr = NULL;
+EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
 
 extern u16 gBattleTypeFlags;
 extern u16 gScriptLastTalked;
@@ -62,80 +62,99 @@ extern u8 gUnknown_0819F8AE[];
 extern u8 gUnknown_0819F80B[];
 extern u8 gUnknown_081C6C02[];
 
-
+// The first transition is used if the enemy pokemon are lower level than our pokemon.
+// Otherwise, the second transition is used.
 static const u8 gBattleTransitionTable_Wild[][2] =
 {
-    {8, 9},
-    {5, 10},
-    {0, 10},
-    {7, 6},
+    {B_TRANSITION_SLICE,               B_TRANSITION_WHITEFADE},     // Normal
+    {B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_GRID_SQUARES},  // Cave
+    {B_TRANSITION_BLUR,                B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_WAVE,                B_TRANSITION_RIPPLE},        // Water
 };
 static const u8 gBattleTransitionTable_Trainer[][2] =
 {
-    {4, 11},
-    {2, 3},
-    {0, 10},
-    {1, 6},
+    {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_SHARDS},        // Normal
+    {B_TRANSITION_SHUFFLE,         B_TRANSITION_BIG_POKEBALL},  // Cave
+    {B_TRANSITION_BLUR,            B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_SWIRL,           B_TRANSITION_RIPPLE},        // Water
+};
+
+enum
+{
+    TRAINER_PARAM_LOAD_VAL_8BIT,
+    TRAINER_PARAM_LOAD_VAL_16BIT,
+    TRAINER_PARAM_LOAD_VAL_32BIT,
+    TRAINER_PARAM_CLEAR_VAL_8BIT,
+    TRAINER_PARAM_CLEAR_VAL_16BIT,
+    TRAINER_PARAM_CLEAR_VAL_32BIT,
+    TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR,
+};
+
+struct TrainerBattleParameter
+{
+    void *varPtr;
+    u8 ptrType;
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_0[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+
+static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_1[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 2},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_2[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 2},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_3[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 5},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_4[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 2},
-    {&gTrainerBattleEndScript, 2},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
 
 const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
@@ -424,17 +443,32 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
 
 static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET};
 
-void task01_battle_start(u8 taskId)
+static void DoStandardWildBattle(void);
+static void DoSafariBattle(void);
+static void SetTrainerFlagsAfterTrainerEyeRematch(void);
+static void CB2_EndWildBattle(void);
+static void CB2_EndScriptedWildBattle(void);
+static u8 GetWildBattleTransition(void);
+static u8 GetTrainerBattleTransition(void);
+static void CB2_GiveStarter(void);
+static void CB2_StartFirstBattle(void);
+static void CB2_EndFirstBattle(void);
+static bool32 IsPlayerDefeated(u32 a1);
+
+#define tState data[0]
+#define tTransition data[1]
+
+static void Task_BattleStart(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (data[0])
+    switch (tState)
     {
     case 0:
         if (!FieldPoisonEffectIsRunning()) // is poison not active?
         {
-            sub_811AABC(data[1]);
-            data[0]++; // go to case 1.
+            BattleTransition_StartOnField(tTransition);
+            tState++; // go to case 1.
         }
         break;
     case 1:
@@ -449,132 +483,135 @@ void task01_battle_start(u8 taskId)
     }
 }
 
-void task_add_01_battle_start(u8 transition, u16 song)
+static void CreateBattleStartTask(u8 transition, u16 song)
 {
-    u8 taskId = CreateTask(task01_battle_start, 1);
+    u8 taskId = CreateTask(Task_BattleStart, 1);
 
-    gTasks[taskId].data[1] = transition;
+    gTasks[taskId].tTransition = transition;
     current_map_music_set__default_for_battle(song);
 }
 
-void CheckForSafariZoneAndProceed(void)
+#undef tState
+#undef tTransition
+
+void BattleSetup_StartWildBattle(void)
 {
     if (GetSafariZoneFlag())
-        StartBattle_Safari();
+        DoSafariBattle();
     else
-        StartBattle_StandardWild();
+        DoStandardWildBattle();
 }
 
-void StartBattle_StandardWild(void)
+static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
-    gMain.savedCallback = HandleWildBattleEnd;
+    gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Roamer(void)
+void BattleSetup_StartRoamerBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
-    gMain.savedCallback = HandleWildBattleEnd;
+    gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Safari(void)
+static void DoSafariBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
     gMain.savedCallback = sub_80C824C;
     gBattleTypeFlags = BATTLE_TYPE_SAFARI;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
 }
 
-void task_add_01_battle_start_with_music_and_stats(void)
+static void StartTheBattle(void)
 {
-    task_add_01_battle_start(GetTrainerBattleTransition(), 0);
+    CreateBattleStartTask(GetTrainerBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(9);
 }
 
 //Initiates battle where Wally catches Ralts
-void StartBattle_WallyTutorial(void)
+void ScrSpecial_StartWallyTutorialBattle(void)
 {
     CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
     ScriptContext2_Enable();
     gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music;
     gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
-    task_add_01_battle_start(8, 0);
+    CreateBattleStartTask(B_TRANSITION_SLICE, 0);
 }
 
-void StartBattle_ScriptedWild(void)
+void BattleSetup_StartScriptedWildBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = 0;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_SouthernIsland(void)
+void ScrSpecial_StartSouthernIslandBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Rayquaza(void)
+void ScrSpecial_StartRayquazaBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    task_add_01_battle_start(0, BGM_BATTLE34);
+    CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_GroudonKyogre(void)
+void ScrSpecial_StartGroudonKyogreBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
-    if (gGameVersion == 2)
-        task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
+    if (gGameVersion == VERSION_RUBY)
+        CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
     else
-        task_add_01_battle_start(0x6, BGM_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Regi(void)
+void ScrSpecial_StartRegiBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
-    task_add_01_battle_start(0xA, BGM_BATTLE36);
+    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void HandleWildBattleEnd(void)
+static void CB2_EndWildBattle(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
 
-    if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
@@ -585,18 +622,18 @@ void HandleWildBattleEnd(void)
     }
 }
 
-void HandleScriptedWildBattleEnd(void)
+void CB2_EndScriptedWildBattle(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
 
-    if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE)
         SetMainCallback2(CB2_WhiteOut);
     else
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-s8 GetBattleTerrain(void)
+s8 BattleSetup_GetTerrain(void)
 {
     u16 tileBehavior;
     s16 x, y;
@@ -605,11 +642,11 @@ s8 GetBattleTerrain(void)
     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
 
     if (MetatileBehavior_IsTallGrass(tileBehavior))
-        return 0;
+        return BATTLE_TERRAIN_GRASS;
     if (MetatileBehavior_IsLongGrass(tileBehavior))
-        return 1;
+        return BATTLE_TERRAIN_LONG_GRASS;
     if (MetatileBehavior_IsSandOrDeepSand(tileBehavior))
-        return 2;
+        return BATTLE_TERRAIN_SAND;
     switch (gMapHeader.mapType)
     {
     case MAP_TYPE_TOWN:
@@ -618,54 +655,49 @@ s8 GetBattleTerrain(void)
         break;
     case MAP_TYPE_UNDERGROUND:
         if (sub_80574C4(tileBehavior))
-            return 8;
+            return BATTLE_TERRAIN_BUILDING;
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-            return 5;
-        return 7;
+            return BATTLE_TERRAIN_POND;
+        return BATTLE_TERRAIN_CAVE;
     case MAP_TYPE_INDOOR:
     case MAP_TYPE_SECRET_BASE:
-        return 8;
+        return BATTLE_TERRAIN_BUILDING;
     case MAP_TYPE_UNDERWATER:
-        return 3;
+        return BATTLE_TERRAIN_UNDERWATER;
     case MAP_TYPE_6:
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-            return 4;
-        return 9;
+            return BATTLE_TERRAIN_WATER;
+        return BATTLE_TERRAIN_PLAIN;
     }
     if (sub_8057568(tileBehavior))
-        return 4;
+        return BATTLE_TERRAIN_WATER;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-        return 5;
+        return BATTLE_TERRAIN_POND;
     if (sub_80574D8(tileBehavior))
-        return 6;
+        return BATTLE_TERRAIN_MOUNTAIN;
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
     {
         if (sub_8057450(tileBehavior))
-            return 5;
+            return BATTLE_TERRAIN_POND;
         if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
-            return 4;
+            return BATTLE_TERRAIN_WATER;
     }
-    if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 28)
-        return 2;
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1.location.mapNum == MAP_ID_ROUTE113)
+        return BATTLE_TERRAIN_SAND;
     if (GetSav1Weather() == 8)
-        return 2;
-    return 9;
+        return BATTLE_TERRAIN_SAND;
+    return BATTLE_TERRAIN_PLAIN;
 }
 
-s8 GetBattleTransitionTypeByMap(void)
+static s8 GetBattleTransitionTypeByMap(void)
 {
-    u8 flashUsed;
     u16 tileBehavior;
     s16 x, y;
 
     PlayerGetDestCoords(&x, &y);
     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
-
-    flashUsed = sav1_get_flash_used_on_map();
-
-    if (flashUsed)
+    if (Overworld_GetFlashLevel())
         return 2;
-
     if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
     {
         switch (gMapHeader.mapType)
@@ -681,7 +713,7 @@ s8 GetBattleTransitionTypeByMap(void)
     return 3;
 }
 
-u16 GetSumOfPartyMonLevel(u8 numMons)
+static u16 GetSumOfPlayerPartyLevel(u8 numMons)
 {
     u8 sum = 0;
     int i;
@@ -701,37 +733,37 @@ u16 GetSumOfPartyMonLevel(u8 numMons)
     return sum;
 }
 
-u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons)
+static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
 {
     u8 i;
     u8 sum;
     u32 count = numMons;
     void *party;
 
-    if (gTrainers[trainerNum].partySize < count)
-        count = gTrainers[trainerNum].partySize;
+    if (gTrainers[opponentId].partySize < count)
+        count = gTrainers[opponentId].partySize;
 
     sum = 0;
 
-    switch (gTrainers[trainerNum].partyFlags)
+    switch (gTrainers[opponentId].partyFlags)
     {
     case 0:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember0 *)party)[i].level;
         break;
     case 1:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember1 *)party)[i].level;
         break;
     case 2:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember2 *)party)[i].level;
         break;
     case 3:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember3 *)party)[i].level;
         break;
@@ -740,76 +772,79 @@ u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons)
     return sum;
 }
 
-u8 GetWildBattleTransition(void)
+static u8 GetWildBattleTransition(void)
 {
-    u8 flashVar = GetBattleTransitionTypeByMap();
-    u8 level = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 transitionType = GetBattleTransitionTypeByMap();
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
 
-    if (level < (u8)GetSumOfPartyMonLevel(1)) // is wild mon level than the player's mon level?
-        return gBattleTransitionTable_Wild[flashVar][0];
+    if (enemyLevel < playerLevel)
+        return gBattleTransitionTable_Wild[transitionType][0];
     else
-        return gBattleTransitionTable_Wild[flashVar][1]; // use a white fade in instead of normal transition.
+        return gBattleTransitionTable_Wild[transitionType][1];
 }
 
-u8 GetTrainerBattleTransition(void)
+static u8 GetTrainerBattleTransition(void)
 {
     const struct Trainer *trainer;
     u8 minPartyCount;
-    u8 flashVar;
-    u8 level;
+    u8 transitionType;
+    u8 enemyLevel;
+    u8 playerLevel;
 
     if (gTrainerBattleOpponent == 1024) // link battle?
-        return 16;
+        return B_TRANSITION_STEVEN;
 
     trainer = gTrainers;
 
     if (trainer[gTrainerBattleOpponent].trainerClass == 24) // league?
     {
         if (gTrainerBattleOpponent == 261)
-            return 12;
+            return B_TRANSITION_SYDNEY;
         if (gTrainerBattleOpponent == 262)
-            return 13;
+            return B_TRANSITION_PHOEBE;
         if (gTrainerBattleOpponent == 263)
-            return 14;
+            return B_TRANSITION_GLACIA;
         if (gTrainerBattleOpponent == 264)
-            return 15;
-        return 16;
+            return B_TRANSITION_DRAKE;
+        return B_TRANSITION_STEVEN;
     }
 
     if (trainer[gTrainerBattleOpponent].trainerClass == 32) // team leader?
-        return 16;
+        return B_TRANSITION_STEVEN;
 
     if (trainer[gTrainerBattleOpponent].doubleBattle == TRUE)
         minPartyCount = 2; // double battles always at least have 2 pokemon.
     else
         minPartyCount = 1;
 
-    flashVar = GetBattleTransitionTypeByMap();
-    level = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, minPartyCount);
-
-    if (level < (u8)GetSumOfPartyMonLevel(minPartyCount)) // is wild mon level than the player's mon level?
-        return gBattleTransitionTable_Trainer[flashVar][0];
+    transitionType = GetBattleTransitionTypeByMap();
+    enemyLevel = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, minPartyCount);
+    playerLevel = GetSumOfPlayerPartyLevel(minPartyCount);
+    if (enemyLevel < playerLevel) // is wild mon level than the player's mon level?
+        return gBattleTransitionTable_Trainer[transitionType][0];
     else
-        return gBattleTransitionTable_Trainer[flashVar][1];
+        return gBattleTransitionTable_Trainer[transitionType][1];
 }
 
-u8 GetBattleTowerBattleTransition(void)
+u8 BattleSetup_GetBattleTowerBattleTransition(void)
 {
-    u8 monData = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
 
-    if (monData < (u8)GetSumOfPartyMonLevel(1))
-        return 4;
+    if (enemyLevel < playerLevel)
+        return B_TRANSITION_POKEBALLS_TRAIL;
     else
-        return 3;
+        return B_TRANSITION_BIG_POKEBALL;
 }
 
-void ChooseStarter(void)
+void ScrSpecial_ChooseStarter(void)
 {
     SetMainCallback2(CB2_ChooseStarter);
     gMain.savedCallback = CB2_GiveStarter;
 }
 
-void CB2_GiveStarter(void)
+static void CB2_GiveStarter(void)
 {
     u16 starterPoke;
 
@@ -819,10 +854,10 @@ void CB2_GiveStarter(void)
     ResetTasks();
     sub_80408BC();
     SetMainCallback2(CB2_StartFirstBattle);
-    sub_811AAD8(0);
+    BattleTransition_Start(0);
 }
 
-void CB2_StartFirstBattle(void)
+static void CB2_StartFirstBattle(void)
 {
     UpdatePaletteFade();
     RunTasks();
@@ -830,7 +865,7 @@ void CB2_StartFirstBattle(void)
     if (IsBattleTransitionDone() == TRUE)
     {
         gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
-        gMain.savedCallback = HandleFirstBattleEnd;
+        gMain.savedCallback = CB2_EndFirstBattle;
         SetMainCallback2(sub_800E7C4);
         prev_quest_postbuffer_cursor_backup_reset();
         overworld_poison_timer_set();
@@ -839,35 +874,35 @@ void CB2_StartFirstBattle(void)
     }
 }
 
-void HandleFirstBattleEnd(void)
+static void CB2_EndFirstBattle(void)
 {
     sav1_reset_battle_music_maybe();
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-u32 TrainerBattleLoadArg32(const u8 *ptr)
+static u32 TrainerBattleLoadArg32(const u8 *ptr)
 {
     return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
 }
 
-u16 TrainerBattleLoadArg16(const u8 *ptr)
+static u16 TrainerBattleLoadArg16(const u8 *ptr)
 {
     return ptr[0] | (ptr[1] << 8);
 }
 
-u8 TrainerBattleLoadArg8(const u8 *ptr)
+static u8 TrainerBattleLoadArg8(const u8 *ptr)
 {
     return ptr[0];
 }
 
-u16 trainerflag_opponent(void)
+static u16 CurrentOpponentTrainerFlag(void)
 {
     return TRAINER_FLAG_START + gTrainerBattleOpponent;
 }
 
-bool32 battle_exit_is_player_defeat(u32 a1)
+static bool32 IsPlayerDefeated(u32 battleOutcome)
 {
-    switch (a1)
+    switch (battleOutcome)
     {
     case 2:
     case 3:
@@ -882,69 +917,69 @@ bool32 battle_exit_is_player_defeat(u32 a1)
     return FALSE;
 }
 
-void sub_80822BC(void)
+static void sub_80822BC(void)
 {
-    gTrainerBattleMode = 0;
+    sTrainerBattleMode = 0;
     gTrainerBattleOpponent = 0;
-    gTrainerMapObjectLocalId = 0;
-    gTrainerIntroSpeech = 0;
-    gTrainerDefeatSpeech = 0;
-    gTrainerVictorySpeech = 0;
-    gTrainerCannotBattleSpeech = 0;
-    gTrainerBattleScriptReturnAddress = 0;
-    gTrainerBattleEndScript = 0;
+    sTrainerMapObjectLocalId = 0;
+    sTrainerIntroSpeech = 0;
+    sTrainerDefeatSpeech = 0;
+    sTrainerVictorySpeech = 0;
+    sTrainerCannotBattleSpeech = 0;
+    sTrainerBattleScriptRetAddr = 0;
+    sTrainerBattleEndScript = 0;
 }
 
-void TrainerBattleLoadArgs(const struct TrainerBattleSpec *specs, const u8 *data)
+static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, const u8 *data)
 {
     while (1)
     {
         switch (specs->ptrType)
         {
-        case 0:
-            *(u8 *)specs->ptr = TrainerBattleLoadArg8(data);
-            data++;
+        case TRAINER_PARAM_LOAD_VAL_8BIT:
+            *(u8 *)specs->varPtr = TrainerBattleLoadArg8(data);
+            data += 1;
             break;
-        case 1:
-            *(u16 *)specs->ptr = TrainerBattleLoadArg16(data);
+        case TRAINER_PARAM_LOAD_VAL_16BIT:
+            *(u16 *)specs->varPtr = TrainerBattleLoadArg16(data);
             data += 2;
             break;
-        case 2:
-            *(u32 *)specs->ptr = TrainerBattleLoadArg32(data);
+        case TRAINER_PARAM_LOAD_VAL_32BIT:
+            *(u32 *)specs->varPtr = TrainerBattleLoadArg32(data);
             data += 4;
             break;
-        case 3:
-            *(u8 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_8BIT:
+            *(u8 *)specs->varPtr = 0;
             break;
-        case 4:
-            *(u16 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_16BIT:
+            *(u16 *)specs->varPtr = 0;
             break;
-        case 5:
-            *(u32 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_32BIT:
+            *(u32 *)specs->varPtr = 0;
             break;
-        case 6:
-            *(const u8 **)specs->ptr = data;
+        case TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR:
+            *(const u8 **)specs->varPtr = data;
             return;
         }
         specs++;
     }
 }
 
-void battle_80801F0(void)
+static void battle_80801F0(void)
 {
-    if (gTrainerMapObjectLocalId)
+    if (sTrainerMapObjectLocalId)
     {
-        gScriptLastTalked = gTrainerMapObjectLocalId;
-        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(gTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+        gScriptLastTalked = sTrainerMapObjectLocalId;
+        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
 }
 
-u8 *TrainerBattleConfigure(const u8 *data)
+u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 {
     sub_80822BC();
-    gTrainerBattleMode = TrainerBattleLoadArg8(data);
+    sTrainerBattleMode = TrainerBattleLoadArg8(data);
 
-    switch (gTrainerBattleMode)
+    switch (sTrainerBattleMode)
     {
     case 3:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_3, data);
@@ -984,7 +1019,7 @@ void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
 {
     gSelectedMapObject = trainerMapObjId;
     gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
-    TrainerBattleConfigure(trainerScript + 1);
+    BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_0819F80B);
     ScriptContext2_Enable();
 }
@@ -1002,27 +1037,27 @@ void sub_8082524(void)
     npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18));
 }
 
-u8 sub_8082558(void)
+u8 ScrSpecial_GetTrainerBattleMode(void)
 {
-    return gTrainerBattleMode;
+    return sTrainerBattleMode;
 }
 
-u8 sub_8082564(void)
+u8 ScrSpecial_HasTrainerBeenFought(void)
 {
-    return FlagGet(trainerflag_opponent());
+    return FlagGet(CurrentOpponentTrainerFlag());
 }
 
-void sub_808257C(void)
+void SetCurrentTrainerBattledFlag(void)
 {
-    FlagSet(trainerflag_opponent());
+    FlagSet(CurrentOpponentTrainerFlag());
 }
 
 void unref_sub_8082590(void)
 {
-    FlagSet(trainerflag_opponent()); // duplicate function
+    FlagSet(CurrentOpponentTrainerFlag()); // duplicate function
 }
 
-u8 trainer_flag_check(u16 flag)
+u8 HasTrainerAlreadyBeenFought(u16 flag)
 {
     return FlagGet(TRAINER_FLAG_START + flag);
 }
@@ -1034,14 +1069,14 @@ void trainer_flag_set(u16 flag)
 
 void trainer_flag_clear(u16 flag)
 {
-    FlagReset(TRAINER_FLAG_START + flag);
+    FlagClear(TRAINER_FLAG_START + flag);
 }
 
-void sub_80825E4(void)
+void BattleSetup_StartTrainerBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
     gMain.savedCallback = sub_808260C;
-    task_add_01_battle_start_with_music_and_stats();
+    StartTheBattle();
     ScriptContext1_Stop();
 }
 
@@ -1051,74 +1086,77 @@ void sub_808260C(void)
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle?
     }
-    else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
-        sub_808257C();
+        SetCurrentTrainerBattledFlag();
     }
 }
 
-void do_choose_name_or_words_screen(void)
+void CB2_EndTrainerEyeRematchBattle(void)
 {
     if (gTrainerBattleOpponent == 1024)
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle?
     }
-    else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
-        sub_808257C();
-        sub_8082CB8();
+        SetCurrentTrainerBattledFlag();
+        SetTrainerFlagsAfterTrainerEyeRematch();
     }
 }
 
-void sub_80826B0(void)
+void ScrSpecial_StartTrainerEyeRematch(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
-    gMain.savedCallback = do_choose_name_or_words_screen;
-    task_add_01_battle_start_with_music_and_stats();
+    gMain.savedCallback = CB2_EndTrainerEyeRematchBattle;
+    StartTheBattle();
     ScriptContext1_Stop();
 }
 
-void sub_80826D8(void)
+static u8 *GetTrainerIntroSpeech(void);
+static u8 *GetTrainerNonBattlingSpeech(void);
+
+void ScrSpecial_ShowTrainerIntroSpeech(void)
 {
-    ShowFieldMessage(sub_808281C());
+    ShowFieldMessage(GetTrainerIntroSpeech());
 }
 
-u8 *sub_80826E8(void)
+u8 *BattleSetup_GetScriptAddrAfterBattle(void)
 {
-    if (gTrainerBattleScriptReturnAddress)
-        return gTrainerBattleScriptReturnAddress;
+    if (sTrainerBattleScriptRetAddr)
+        return sTrainerBattleScriptRetAddr;
     else
         return gUnknown_081C6C02;
 }
 
-u8 *sub_8082700(void)
+u8 *BattleSetup_GetTrainerPostBattleScript(void)
 {
-    if (gTrainerBattleEndScript)
-        return gTrainerBattleEndScript;
+    if (sTrainerBattleEndScript)
+        return sTrainerBattleEndScript;
     else
         return gUnknown_081C6C02;
 }
 
-void sub_8082718(void)
+void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
 {
-    ShowFieldMessage(sub_8082880());
+    ShowFieldMessage(GetTrainerNonBattlingSpeech());
 }
 
 void PlayTrainerEncounterMusic(void)
 {
     u16 music;
 
-    if (gTrainerBattleMode != 1 && gTrainerBattleMode != 8)
+    if (sTrainerBattleMode != 1 && sTrainerBattleMode != 8)
     {
         switch (sub_803FC58(gTrainerBattleOpponent))
         {
@@ -1169,7 +1207,7 @@ void PlayTrainerEncounterMusic(void)
 }
 
 //Returns an empty string if a null pointer was passed, otherwise returns str
-u8 *SanitizeString(const u8 *str)
+static u8 *SanitizeString(const u8 *str)
 {
     if (str)
         return (u8 *) str;
@@ -1177,9 +1215,9 @@ u8 *SanitizeString(const u8 *str)
         return (u8 *) gOtherText_CancelWithTerminator;
 }
 
-u8 *sub_808281C(void)
+static u8 *GetTrainerIntroSpeech(void)
 {
-    return SanitizeString(gTrainerIntroSpeech);
+    return SanitizeString(sTrainerIntroSpeech);
 }
 
 u8 *sub_8082830(void)
@@ -1189,7 +1227,7 @@ u8 *sub_8082830(void)
     if (gTrainerBattleOpponent == 1024)
         str = sub_80BCCE8();
     else
-        str = gTrainerDefeatSpeech;
+        str = sTrainerDefeatSpeech;
 
     StringExpandPlaceholders(gStringVar4, SanitizeString(str));
     return gStringVar4;
@@ -1197,43 +1235,43 @@ u8 *sub_8082830(void)
 
 u8 *unref_sub_808286C(void)
 {
-    return SanitizeString(gTrainerVictorySpeech);
+    return SanitizeString(sTrainerVictorySpeech);
 }
 
-u8 *sub_8082880(void)
+static u8 *GetTrainerNonBattlingSpeech(void)
 {
-    return SanitizeString(gTrainerCannotBattleSpeech);
+    return SanitizeString(sTrainerCannotBattleSpeech);
 }
 
-s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     s32 i;
 
     for (i = 0; i < NUM_TRAINER_EYE_TRAINERS; i++)
     {
-        if (trainers[i].trainerNums[0] == trainerNum)
+        if (trainers[i].opponentIDs[0] == opponentId)
             return i;
     }
     return -1;
 }
 
-s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     s32 i;
     s32 j;
 
     for (i = 0; i < NUM_TRAINER_EYE_TRAINERS; i++)
     {
-        for (j = 0; j < 5 && trainers[i].trainerNums[j] != 0; j++)
+        for (j = 0; j < 5 && trainers[i].opponentIDs[j] != 0; j++)
         {
-            if (trainers[i].trainerNums[j] == trainerNum)
+            if (trainers[i].opponentIDs[j] == opponentId)
                 return i;
         }
     }
     return -1;
 }
 
-bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum)
+bool32 UpdateRandomTrainerEyeRematches(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum)
 {
     int i;
     bool32 ret = FALSE;
@@ -1243,14 +1281,19 @@ bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 m
         if (trainers[i].mapGroup == mapGroup && trainers[i].mapNum == mapNum)
         {
             if (gSaveBlock1.trainerRematches[i] != 0)
+            {
+                // Trainer already wants rematch. Don't bother updating it
                 ret = TRUE;
-            else if (trainer_flag_check(trainers[i].trainerNums[0]) == TRUE && (Random() % 100) <= 30)
+            }
+            else if (HasTrainerAlreadyBeenFought(trainers[i].opponentIDs[0]) == TRUE
+             && (Random() % 100) <= 30)  // 31% chance of getting a rematch
             {
-                int j = 1;
+                int rematches = 1;
 
-                while (j < 5 && trainers[i].trainerNums[j] != 0 && trainer_flag_check(trainers[i].trainerNums[j]))
-                    j++;
-                gSaveBlock1.trainerRematches[i] = j;
+                while (rematches < 5 && trainers[i].opponentIDs[rematches] != 0
+                 && HasTrainerAlreadyBeenFought(trainers[i].opponentIDs[rematches]))
+                    rematches++;
+                gSaveBlock1.trainerRematches[i] = rematches;
                 ret = TRUE;
             }
         }
@@ -1282,9 +1325,9 @@ s32 sub_80829E8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapN
     return 0;
 }
 
-bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
     if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex])
         return TRUE;
@@ -1292,9 +1335,9 @@ bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
         return FALSE;
 }
 
-bool8 sub_8082A54(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 GetTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_80828B8(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_80828B8(trainers, opponentId);
 
     if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex])
         return TRUE;
@@ -1302,38 +1345,38 @@ bool8 sub_8082A54(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
         return FALSE;
 }
 
-u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     int i;
     const struct TrainerEyeTrainer *trainer;
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
     if (trainerEyeIndex == -1)
         return 0;
     trainer = &trainers[trainerEyeIndex];
     for (i = 1; i < 5; i++)
     {
-        if (!trainer->trainerNums[i])
-            return trainer->trainerNums[i - 1];
-        if (!trainer_flag_check(trainer->trainerNums[i]))
-            return trainer->trainerNums[i];
+        if (!trainer->opponentIDs[i])
+            return trainer->opponentIDs[i - 1];
+        if (!HasTrainerAlreadyBeenFought(trainer->opponentIDs[i]))
+            return trainer->opponentIDs[i];
     }
-    return trainer->trainerNums[4];
+    return trainer->opponentIDs[4];
 }
 
-void sub_8082AE4(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+void ClearTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_80828B8(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_80828B8(trainers, opponentId);
 
     if (trainerEyeIndex != -1)
         gSaveBlock1.trainerRematches[trainerEyeIndex] = 0;
 }
 
-bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
-    if (trainerEyeIndex != -1 && trainer_flag_check(trainers[trainerEyeIndex].trainerNums[1]))
+    if (trainerEyeIndex != -1 && HasTrainerAlreadyBeenFought(trainers[trainerEyeIndex].opponentIDs[1]))
         return TRUE;
     else
         return FALSE;
@@ -1377,7 +1420,7 @@ bool32 sub_8082BA4(void)
 
 void sub_8082BD0(u16 mapGroup, u16 mapNum)
 {
-    if (sub_8082BA4() && sub_80828FC(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE)
+    if (sub_8082BA4() && UpdateRandomTrainerEyeRematches(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE)
         gSaveBlock1.trainerRematchStepCounter = 0;
 }
 
@@ -1391,9 +1434,9 @@ s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum)
     return sub_80829E8(gTrainerEyeTrainers, mapGroup, mapNum);
 }
 
-u16 sub_8082C4C(u16 trainerNum)
+u16 sub_8082C4C(u16 opponentId)
 {
-    return sub_8082A90(gTrainerEyeTrainers, trainerNum);
+    return sub_8082A90(gTrainerEyeTrainers, opponentId);
 }
 
 s32 sub_8082C68(void)
@@ -1404,13 +1447,13 @@ s32 sub_8082C68(void)
         return sub_8082B10(gTrainerEyeTrainers, gTrainerBattleOpponent);
 }
 
-u8 sub_8082C9C(void)
+u8 ScrSpecial_GetTrainerEyeRematchFlag(void)
 {
-    return sub_8082A54(gTrainerEyeTrainers, gTrainerBattleOpponent);
+    return GetTrainerEyeRematchFlag(gTrainerEyeTrainers, gTrainerBattleOpponent);
 }
 
-void sub_8082CB8(void)
+void SetTrainerFlagsAfterTrainerEyeRematch(void)
 {
-    sub_8082AE4(gTrainerEyeTrainers, gTrainerBattleOpponent);
-    sub_808257C();
+    ClearTrainerEyeRematchFlag(gTrainerEyeTrainers, gTrainerBattleOpponent);
+    SetCurrentTrainerBattledFlag();
 }
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 1cacb8857..53d32d03a 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle_transition.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "palette.h"
 #include "trig.h"
@@ -530,13 +530,13 @@ static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/el
 
 // actual code starts here
 
-void sub_811AABC(u8 transitionID)
+void BattleTransition_StartOnField(u8 transitionID)
 {
-    gMain.callback2 = sub_8054398;
+    gMain.callback2 = CB2_OverworldBasic;
     LaunchBattleTransitionTask(transitionID);
 }
 
-void sub_811AAD8(u8 transitionID)
+void BattleTransition_Start(u8 transitionID)
 {
     LaunchBattleTransitionTask(transitionID);
 }
@@ -994,10 +994,10 @@ static bool8 Phase2_Transition_PokeballsTrail_Func2(struct Task* task)
     rand = Random() & 1;
     for (i = 0; i <= 4; i++, rand ^= 1)
     {
-        gUnknown_0202FF84[0] = arr0[rand];      // x
-        gUnknown_0202FF84[1] = (i * 32) + 16;   // y
-        gUnknown_0202FF84[2] = rand;
-        gUnknown_0202FF84[3] = arr1[i];
+        gFieldEffectArguments[0] = arr0[rand];      // x
+        gFieldEffectArguments[1] = (i * 32) + 16;   // y
+        gFieldEffectArguments[2] = rand;
+        gFieldEffectArguments[3] = arr1[i];
         FieldEffectStart(FLDEFF_POKEBALL);
     }
 
@@ -1017,14 +1017,14 @@ static bool8 Phase2_Transition_PokeballsTrail_Func3(struct Task* task)
 
 bool8 FldEff_Pokeball(void)
 {
-    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gUnknown_0202FF84[0], gUnknown_0202FF84[1], 0);
+    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     gSprites[spriteID].oam.priority = 0;
     gSprites[spriteID].oam.affineMode = 1;
-    gSprites[spriteID].data0 = gUnknown_0202FF84[2];
-    gSprites[spriteID].data1 = gUnknown_0202FF84[3];
+    gSprites[spriteID].data0 = gFieldEffectArguments[2];
+    gSprites[spriteID].data1 = gFieldEffectArguments[3];
     gSprites[spriteID].data2 = -1;
     InitSpriteAffineAnim(&gSprites[spriteID]);
-    StartSpriteAffineAnim(&gSprites[spriteID], gUnknown_0202FF84[2]);
+    StartSpriteAffineAnim(&gSprites[spriteID], gFieldEffectArguments[2]);
     return FALSE;
 }
 
diff --git a/src/berry.c b/src/berry.c
index fa15672e7..d82eab2a6 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -974,7 +974,7 @@ const struct Berry gBerries[] =
 
 const struct BerryTree gBlankBerryTree = {0};
 
-extern u8 BerryTreeScript;
+extern u8 S_BerryTree[];
 extern u16 gScriptLastTalked;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -1078,7 +1078,7 @@ bool32 FieldObjectInteractionWaterBerryTree(void)
 
 bool8 IsPlayerFacingPlantedBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() == &BerryTreeScript
+    if (GetFieldObjectScriptPointerForComparison() == S_BerryTree
      && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0)
         return TRUE;
     else
@@ -1087,7 +1087,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void)
 
 bool8 TryToWaterBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript)
+    if (GetFieldObjectScriptPointerForComparison() != S_BerryTree)
         return FALSE;
     else
         return FieldObjectInteractionWaterBerryTree();
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 029d352df..455aabc45 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -12,7 +12,7 @@
 #include "string_util.h"
 #include "link.h"
 #include "task.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "item.h"
 #include "items.h"
 #include "rng.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index a965f386c..1413a02ca 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "menu_helpers.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/bike.c b/src/bike.c
index 58a4f38f4..80cab0850 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -6,7 +6,7 @@
 #include "flags.h"
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 
@@ -944,7 +944,7 @@ void GetOnOffBike(u8 var)
     {
         SetPlayerAvatarTransitionFlags(var);
         sav1_set_battle_music_maybe(BGM_CYCLING);
-        sub_8053FB0(BGM_CYCLING);
+        Overworld_ChangeMusicTo(BGM_CYCLING);
     }
 }
 
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index b8d7cd386..b11b1ff3a 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -6,6 +6,7 @@
 #include "fieldmap.h"
 #include "flags.h"
 #include "main.h"
+#include "map_constants.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "rom6.h"
@@ -19,11 +20,13 @@
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
 
-extern u8 gIslandCave_EventScript_OpenRegiiceChamber[]; // regiice event script
+extern u8 S_OpenRegiceChamber[]; // regiice event script
 
 bool8 ShouldDoBrailleDigEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_DIG) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x47))
+    if (!FlagGet(SYS_BRAILLE_DIG)
+     && (gSaveBlock1.location.mapGroup == MAP_GROUP_SEALED_CHAMBER_OUTER_ROOM
+     && gSaveBlock1.location.mapNum == MAP_ID_SEALED_CHAMBER_OUTER_ROOM))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3)
             return TRUE;
@@ -52,10 +55,11 @@ void DoBrailleDigEffect(void)
 
 bool8 CheckRelicanthWailord(void)
 {
+    // First comes Relicanth.
     if (GetMonData(&gPlayerParty, MON_DATA_SPECIES2, 0) == SPECIES_RELICANTH)
     {
         CalculatePlayerPartyCount();
-
+        // Last comes Wailord
         if (GetMonData(&gPlayerParty[gPlayerPartyCount - 1], MON_DATA_SPECIES2, 0) == SPECIES_WAILORD)
             return TRUE;
     }
@@ -64,7 +68,7 @@ bool8 CheckRelicanthWailord(void)
 
 bool8 ShouldDoBrailleStrengthEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x6))
+    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
             return TRUE;
@@ -94,7 +98,7 @@ void DoBrailleStrengthEffect(void)
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x44))
+    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
     {
         if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
             return TRUE;
@@ -105,8 +109,8 @@ bool8 ShouldDoBrailleFlyEffect(void)
 
 void DoBrailleFlyEffect(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    FieldEffectStart(0x3C);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
 }
 
 bool8 FldEff_UseFlyAncientTomb(void)
@@ -120,7 +124,7 @@ bool8 FldEff_UseFlyAncientTomb(void)
 
 void UseFlyAncientTomb_Callback(void)
 {
-    FieldEffectActiveListRemove(0x3C);
+    FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
     UseFlyAncientTomb_Finish();
 }
 
@@ -158,7 +162,7 @@ void Task_BrailleWait(u8 taskId)
         if (BrailleWait_CheckButtonPress() != FALSE)
         {
             MenuZeroFillScreen();
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             data[0] = 2;
         }
         else
@@ -191,7 +195,7 @@ void Task_BrailleWait(u8 taskId)
         break;
     case 4:
         sub_8064E2C();
-        ScriptContext1_SetupScript(gIslandCave_EventScript_OpenRegiiceChamber);
+        ScriptContext1_SetupScript(S_OpenRegiceChamber);
         DestroyTask(taskId);
         break;
     }
@@ -199,14 +203,14 @@ void Task_BrailleWait(u8 taskId)
 
 bool32 BrailleWait_CheckButtonPress(void)
 {
-    u16 var = 0xFF;
+    u16 keyMask = A_BUTTON | B_BUTTON | START_BUTTON | SELECT_BUTTON | DPAD_ANY;
 
-    if (gSaveBlock2.optionsButtonMode == 1)
-        var |= 0x300;
-    if (gSaveBlock2.optionsButtonMode == 2)
-        var |= 0x200;
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
+        keyMask |= L_BUTTON | R_BUTTON;
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
+        keyMask |= L_BUTTON;
 
-    if ((var & gMain.newKeys) != FALSE)
+    if (gMain.newKeys & keyMask)
         return TRUE;
     else
         return FALSE;
diff --git a/src/cable_club.c b/src/cable_club.c
index 20b087f4e..7a85f2b6c 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -1,229 +1,350 @@
 #include "global.h"
+#include "battle.h"
+#include "battle_records.h"
 #include "cable_club.h"
 #include "field_message_box.h"
+#include "field_weather.h"
 #include "link.h"
+#include "load_save.h"
+#include "m4a.h"
 #include "main.h"
+#include "menu.h"
+#include "palette.h"
+#include "record_mixing.h"
+#include "overworld.h"
 #include "script.h"
+#include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
+#include "start_menu.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 #include "trainer_card.h"
 
 extern u16 gScriptResult;
 extern struct TrainerCard gTrainerCards[4];
-
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
-
-extern u8 gUnknown_081A4932[];
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
+extern u16 gSpecialVar_0x8006;
+extern u16 gBattleTypeFlags;
+extern const u8 gUnknown_081A4932[];
 extern const u8 gUnknown_081A4975[];
-
+extern const u8 gUnknown_081A49B6[];
+extern const u8 gUnknown_081A490C[];
+extern const u8* const gTrainerCardColorNames[];
+extern struct
+{
+    u8 field0;
+    u8 field1;
+} gUnknown_020297D8;
+
+static void sub_8082F20(u8 taskId);
+static void sub_8082F68(u8 taskId);
+static void sub_8082FEC(u8 taskId);
+static void sub_808303C(u8 taskId);
 static void sub_80830E4(u8 taskId);
+static void sub_8083188(u8 taskId);
 static void sub_8083288(u8 taskId);
 static void sub_8083314(u8 taskId);
+static void sub_80833C4(u8 taskId);
+static void sub_80833EC(u8 taskId);
+static void sub_8083418(u8 taskId);
+static bool8 sub_8083444(u8 taskId);
+static void sub_808353C(u8 taskId);
+static void sub_8083710(u8 taskId);
+static void sub_8083760(u8 taskId);
+static void sub_80837B4(u8 taskId);
+static void sub_80837EC(u8 taskId);
+static void sub_808382C(u8 taskId);
+static void sub_8083958(void);
+static void sub_80839DC(u8 taskId);
+static void sub_8083AAC(u8 taskId);
+static void sub_8083B44(u8 taskId);
+static void sub_8083B6C(void);
+static void sub_8083CA4(u8 taskId);
+
+extern void sub_80831F8(u8 taskId);
+extern void call_map_music_set_to_zero(void);
+extern void sub_810FEFC(void);
+extern void sub_8047CD8(void);
+extern void sub_805559C(void);
+extern void sub_8055574(void);
+extern s32 sub_80554F8(void);
+extern void sub_805465C(void);
+
+static void sub_8082CD4(u8 arg0, u8 arg1)
+{
+    if (FindTaskIdByFunc(sub_8082F20) == 0xFF)
+    {
+        u8 taskId = CreateTask(sub_8082F20, 80);
+
+        gTasks[taskId].data[1] = arg0;
+        gTasks[taskId].data[2] = arg1;
+    }
+}
+
+static void sub_8082D18(u32 value)
+{
+    ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEFT_ALIGN, 1);
+    MenuDrawTextWindow(18, 10, 28, 13);
+    sub_8072BD8(gOtherText_PLink, 19, 11, 72);
+}
+
+static void sub_8082D4C()
+{
+    MenuZeroFillWindowRect(18, 10, 28, 13);
+}
+
+static void sub_8082D60(u8 taskId, u8 arg1)
+{
+    s16 *data = &gTasks[taskId].data[3];
+
+    if (arg1 != *data)
+    {
+        if (arg1 <= 1)
+            sub_8082D4C();
+        else
+            sub_8082D18(arg1);
+        *data = arg1;
+    }
+}
+
+static u32 sub_8082D9C(u8 minPlayers, u8 maxPlayers)
+{
+    int playerCount;
+
+    switch (GetLinkPlayerDataExchangeStatusTimed())
+    {
+    case EXCHANGE_COMPLETE:
+        playerCount = GetLinkPlayerCount_2();
+        if (minPlayers <= playerCount && playerCount <= maxPlayers)
+            return 1;
+        ConvertIntToDecimalStringN(gStringVar1, playerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+        return 4;
+    case EXCHANGE_TIMED_OUT:
+        return 0;
+    case EXCHANGE_IN_PROGRESS:
+        return 3;
+    default:
+        return 0;
+    }
+}
+
+static bool32 sub_8082DF4(u8 taskId)
+{
+    if (HasLinkErrorOccurred() == TRUE)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool32 sub_8082E28(u8 taskId)
+{
+    if ((gMain.newKeys & B_BUTTON)
+     && IsLinkConnectionEstablished() == FALSE)
+    {
+        gTasks[taskId].func = sub_80833EC;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool32 sub_8082E6C(u8 taskId)
+{
+    if (IsLinkConnectionEstablished())
+        SetSuppressLinkErrorMessage(TRUE);
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = sub_80833EC;
+        return TRUE;
+    }
+    return FALSE;
+}
 
-void sub_808303C(u8 taskId) {
-    s32 linkPlayerCount;
-    s16 *taskData;
+static bool32 sub_8082EB8(u8 taskId)
+{
+    if (GetSioMultiSI() == 1)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void unref_sub_8082EEC(u8 taskId)
+{
+    gTasks[taskId].data[0]++;
+    if (gTasks[taskId].data[0] == 10)
+    {
+        sub_8007E9C(2);
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_8082F20(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (data[0] == 0)
+    {
+        OpenLinkTimed();
+        sub_80082EC();
+        ResetLinkPlayers();
+    }
+    else if (data[0] > 9)
+    {
+        gTasks[taskId].func = sub_8082F68;
+    }
+    data[0]++;
+}
 
-    taskData = gTasks[taskId].data;
+static void sub_8082F68(u8 taskId)
+{
+    u32 playerCount = GetLinkPlayerCount_2();
 
-    linkPlayerCount = GetLinkPlayerCount_2();
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082E6C(taskId) == TRUE
+     || playerCount < 2)
+        return;
 
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082EB8(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1)
+    SetSuppressLinkErrorMessage(TRUE);
+    gTasks[taskId].data[3] = 0;
+    if (IsLinkMaster() == TRUE)
     {
+        PlaySE(SE_PIN);
+        ShowFieldAutoScrollMessage(gUnknown_081A4932);
+        gTasks[taskId].func = sub_8082FEC;
+    }
+    else
+    {
+        PlaySE(SE_BOO);
+        ShowFieldAutoScrollMessage(gUnknown_081A49B6);
+        gTasks[taskId].func = sub_80831F8;
+    }
+}
+
+static void sub_8082FEC(u8 taskId)
+{
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
+
+    if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
+    {
+        gTasks[taskId].data[3] = 0;
+        gTasks[taskId].func = sub_808303C;
     }
+}
+
+static void sub_808303C(u8 taskId)
+{
+    s16 *taskData = gTasks[taskId].data;
+    s32 linkPlayerCount = GetLinkPlayerCount_2();
+
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
+        return;
 
     sub_8082D60(taskId, linkPlayerCount);
 
     if (!(gMain.newKeys & A_BUTTON))
-    {
         return;
-    }
 
 #if ENGLISH
     if (linkPlayerCount < taskData[1])
-    {
         return;
-    }
 
     sub_80081C8(linkPlayerCount);
     sub_8082D4C();
-    ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
-    ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
+    ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+    ShowFieldAutoScrollMessage((u8 *)gUnknown_081A4975);
     gTasks[taskId].func = sub_80830E4;
 #elif GERMAN
-    if ((gLinkType == 0x2255 && (u32) linkPlayerCount > 1) ||
-        (gLinkType != 0x2255 && taskData[1] <= linkPlayerCount))
+    if ((gLinkType == 0x2255 && (u32)linkPlayerCount > 1)
+     || (gLinkType != 0x2255 && taskData[1] <= linkPlayerCount))
     {
         sub_80081C8(linkPlayerCount);
         sub_8082D4C();
-        ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
-        ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
+        ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+        ShowFieldAutoScrollMessage((u8 *)gUnknown_081A4975);
         gTasks[taskId].func = sub_80830E4;
     }
 #endif
 }
 
-#ifdef NONMATCHING
-static void sub_80830E4(u8 taskId) {
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082EB8(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1 ||
-        GetFieldMessageBoxMode())
-    {
+static void sub_80830E4(u8 taskId)
+{
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
-    if (sub_800820C() == GetLinkPlayerCount_2() &&
-        !(gMain.heldKeys & B_BUTTON))
+    if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
     {
-        ShowFieldAutoScrollMessage(gUnknown_081A4932);
-        gTasks[taskId].func = sub_8082FEC;
-        return;
+        if (sub_800820C() != GetLinkPlayerCount_2())
+        {
+            ShowFieldAutoScrollMessage(gUnknown_081A4932);
+            gTasks[taskId].func = sub_8082FEC;
+        }
+        else if (gMain.heldKeys & B_BUTTON)
+        {
+            ShowFieldAutoScrollMessage(gUnknown_081A4932);
+            gTasks[taskId].func = sub_8082FEC;
+        }
+        else if (gMain.heldKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8007F4C();
+            gTasks[taskId].func = sub_8083188;
+        }
     }
-
-    if (gMain.heldKeys & A_BUTTON)
-    {
-        PlaySE(SE_SELECT);
-        sub_8007F4C();
-        gTasks[(u32) taskId].func = sub_8083188;
-    }
-}
-#else
-__attribute__((naked))
-static void sub_80830E4(u8 taskId) {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    adds r6, r5, 0\n\
-    adds r0, r5, 0\n\
-    bl sub_8082E28\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    adds r0, r5, 0\n\
-    bl sub_8082EB8\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    adds r0, r5, 0\n\
-    bl sub_8082DF4\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    bl GetFieldMessageBoxMode\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _08083178\n\
-    bl sub_800820C\n\
-    adds r4, r0, 0\n\
-    bl GetLinkPlayerCount_2\n\
-    lsls r4, 24\n\
-    lsls r0, 24\n\
-    cmp r4, r0\n\
-    bne _08083132\n\
-    ldr r0, _08083148 @ =gMain\n\
-    ldrh r1, [r0, 0x2C]\n\
-    movs r0, 0x2\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08083158\n\
-_08083132:\n\
-    ldr r0, _0808314C @ =gUnknown_081A4932\n\
-    bl ShowFieldAutoScrollMessage\n\
-    ldr r1, _08083150 @ =gTasks\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    ldr r1, _08083154 @ =sub_8082FEC\n\
-    str r1, [r0]\n\
-    b _08083178\n\
-    .align 2, 0\n\
-_08083148: .4byte gMain\n\
-_0808314C: .4byte gUnknown_081A4932\n\
-_08083150: .4byte gTasks\n\
-_08083154: .4byte sub_8082FEC\n\
-_08083158:\n\
-    movs r0, 0x1\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08083178\n\
-    movs r0, 0x5\n\
-    bl PlaySE\n\
-    bl sub_8007F4C\n\
-    ldr r0, _08083180 @ =gTasks\n\
-    lsls r1, r6, 2\n\
-    adds r1, r6\n\
-    lsls r1, 3\n\
-    adds r1, r0\n\
-    ldr r0, _08083184 @ =sub_8083188\n\
-    str r0, [r1]\n\
-_08083178:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08083180: .4byte gTasks\n\
-_08083184: .4byte sub_8083188\n\
-    .syntax divided\n");
 }
-#endif
-
-void sub_8083188(u8 taskId) {
-    u8 local1, local2;
-    u16 *result;
 
-    local1 = gTasks[taskId].data[1];
-    local2 = gTasks[taskId].data[2];
+static void sub_8083188(u8 taskId)
+{
+    u8 local1 = gTasks[taskId].data[1];
+    u8 local2 = gTasks[taskId].data[2];
 
-
-    if (sub_8082DF4(taskId) == 1 ||
-        sub_8083444(taskId) == 1)
-    {
+    if (sub_8082DF4(taskId) == TRUE
+     || sub_8083444(taskId) == TRUE)
         return;
-    }
 
     if (GetLinkPlayerCount_2() != sub_800820C())
     {
         gTasks[taskId].func = sub_8083418;
-        return;
     }
-
-    result = &gScriptResult;
-    *result = sub_8082D9C(local1, local2);
-    if (*result)
+    else
     {
-        gTasks[taskId].func = sub_8083288;
+        gScriptResult = sub_8082D9C(local1, local2);
+        if (gScriptResult != 0)
+            gTasks[taskId].func = sub_8083288;
     }
 }
 
-void sub_80831F8(u8 taskId) {
+void sub_80831F8(u8 taskId)
+{
     u8 local1, local2;
-    u16 *result;
 
     local1 = gTasks[taskId].data[1];
     local2 = gTasks[taskId].data[2];
 
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1)
-    {
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
-    result = &gScriptResult;
-    *result = sub_8082D9C(local1, local2);
-    if (*result == 0)
-    {
+    gScriptResult = sub_8082D9C(local1, local2);
+    if (gScriptResult == 0)
         return;
-    }
-
-
-    if (*result == 3)
+    if (gScriptResult == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -234,16 +355,15 @@ void sub_80831F8(u8 taskId) {
         gFieldLinkPlayerCount = GetLinkPlayerCount_2();
         gUnknown_03004860 = GetMultiplayerId();
         sub_80081C8(gFieldLinkPlayerCount);
-        sub_8093390((struct TrainerCard *) gBlockSendBuffer);
+        sub_8093390((struct TrainerCard *)gBlockSendBuffer);
         gTasks[taskId].func = sub_8083314;
     }
 }
 
-static void sub_8083288(u8 taskId) {
-    if (sub_8082DF4(taskId) == 1)
-    {
+static void sub_8083288(u8 taskId)
+{
+    if (sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
     if (gScriptResult == 3)
     {
@@ -256,26 +376,22 @@ static void sub_8083288(u8 taskId) {
         gFieldLinkPlayerCount = GetLinkPlayerCount_2();
         gUnknown_03004860 = GetMultiplayerId();
         sub_80081C8(gFieldLinkPlayerCount);
-        sub_8093390((struct TrainerCard *) gBlockSendBuffer);
+        sub_8093390((struct TrainerCard *)gBlockSendBuffer);
         gTasks[taskId].func = sub_8083314;
         sub_8007E9C(2);
     }
 }
 
-static void sub_8083314(u8 taskId) {
+static void sub_8083314(u8 taskId)
+{
     u8 index;
-
     struct TrainerCard *trainerCards;
 
-    if (sub_8082DF4(taskId) == 1)
-    {
+    if (sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
     if (GetBlockReceivedStatus() != sub_8008198())
-    {
         return;
-    }
 
     index = 0;
     trainerCards = gTrainerCards;
@@ -296,14 +412,12 @@ static void sub_8083314(u8 taskId) {
         u16 linkType;
         linkType = gLinkType;
         // FIXME: sub_8082D4C doesn't take any arguments
-        sub_8082D4C(0x00004411, linkType);
+        sub_8082D4C(0x4411, linkType);
 #elif GERMAN
         if (gLinkType != 0x4411)
         {
             if (gLinkType == 0x6601)
-            {
                 deUnkValue2 = 1;
-            }
         }
         sub_8082D4C();
 #endif
@@ -315,3 +429,477 @@ static void sub_8083314(u8 taskId) {
     sub_800832C();
     gTasks[taskId].func = sub_80833C4;
 }
+
+static void sub_80833C4(u8 taskId)
+{
+    if (gReceivedRemoteLinkPlayers == FALSE)
+    {
+        sub_8082D4C();
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80833EC(u8 taskId)
+{
+    gScriptResult = 5;
+    sub_8082D4C();
+    HideFieldMessageBox();
+    EnableBothScriptContexts();
+    DestroyTask(taskId);
+}
+
+static void sub_8083418(u8 taskId)
+{
+    gScriptResult = 6;
+    sub_8082D4C();
+    HideFieldMessageBox();
+    EnableBothScriptContexts();
+    DestroyTask(taskId);
+}
+
+static bool8 sub_8083444(u8 taskId)
+{
+    gTasks[taskId].data[4]++;
+    if (gTasks[taskId].data[4] > 600)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_808347C(u8 arg0)
+{
+    u32 r3 = 2;
+    u32 r2 = 2;
+
+    switch (gSpecialVar_0x8004)
+    {
+    case 1:
+        r3 = 2;
+        gLinkType = 0x2233;
+        break;
+    case 2:
+        r3 = 2;
+        gLinkType = 0x2244;
+        break;
+    case 5:
+        r3 = 4;
+        r2 = 4;
+        gLinkType = 0x2255;
+        break;
+    }
+
+    sub_8082CD4(r3, r2);
+}
+
+void sub_80834E4(void)
+{
+    gLinkType = 0x1133;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 2);
+}
+
+void sub_808350C(void)
+{
+    gScriptResult = 0;
+    gLinkType = 0x3311;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 4);
+}
+
+static void sub_808353C(u8 taskId)
+{
+    int playerCount;
+    int i;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gScriptResult == 1)
+        {
+            playerCount = GetLinkPlayerCount();
+            for (i = 0; i < playerCount; i++)
+            {
+                if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
+                {
+                    gScriptResult = 7;
+                    sub_8008480();
+                    gTasks[taskId].data[0] = 1;
+                    return;
+                }
+            }
+        }
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+        break;
+    case 1:
+        if (gReceivedRemoteLinkPlayers == FALSE)
+        {
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+void sub_80835D8(void)
+{
+    int taskId = FindTaskIdByFunc(sub_808353C);
+
+    if (taskId == 0xFF)
+    {
+        taskId = CreateTask(sub_808353C, 80);
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_8083614(void)
+{
+    gLinkType = 0x4411;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 4);
+}
+
+void sub_808363C(void)
+{
+    gLinkType = 0x6601;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(4, 4);
+}
+
+u8 sub_8083664(void)
+{
+    if (FuncIsActiveTask(sub_8083710) != FALSE)
+        return 0xFF;
+
+    switch (gSpecialVar_0x8004)
+    {
+    case 1:
+        gLinkType = 0x2233;
+        break;
+    case 2:
+        gLinkType = 0x2244;
+        break;
+    case 5:
+        gLinkType = 0x2255;
+        break;
+    case 3:
+        gLinkType = 0x1111;
+        break;
+    case 4:
+        gLinkType = 0x3322;
+        break;
+    }
+
+    return CreateTask(sub_8083710, 80);
+}
+
+static void sub_8083710(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (data[0] == 0)
+    {
+        OpenLink();
+        ResetLinkPlayers();
+        CreateTask(sub_8083C50, 80);
+    }
+    else if (data[0] >= 10)
+    {
+        gTasks[taskId].func = sub_8083760;
+    }
+    data[0]++;
+}
+
+static void sub_8083760(u8 taskId)
+{
+    if (GetLinkPlayerCount_2() >= 2)
+    {
+        if (IsLinkMaster() == TRUE)
+            gTasks[taskId].func = sub_80837B4;
+        else
+            gTasks[taskId].func = sub_80837EC;
+    }
+}
+
+static void sub_80837B4(u8 taskId)
+{
+    if (sub_800820C() == GetLinkPlayerCount_2())
+    {
+        sub_8007F4C();
+        gTasks[taskId].func = sub_80837EC;
+    }
+}
+
+static void sub_80837EC(u8 taskId)
+{
+    if (gReceivedRemoteLinkPlayers == TRUE
+     && IsLinkPlayerDataExchangeComplete() == TRUE)
+    {
+        sub_800826C();
+        sub_8007B14();
+        DestroyTask(taskId);
+    }
+}
+
+void sub_8083820(void)
+{
+    ScrSpecial_DoSaveDialog();
+}
+
+static void sub_808382C(u8 taskId)
+{
+    struct Task* task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        fade_screen(1, 0);
+        gLinkType = 0x2211;
+        ClearLinkCallback_2();
+        task->data[0]++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+            task->data[0]++;
+        break;
+    case 2:
+        task->data[1]++;
+        if (task->data[1] > 20)
+            task->data[0]++;
+        break;
+    case 3:
+        sub_800832C();
+        task->data[0]++;
+        break;
+    case 4:
+        if (!gReceivedRemoteLinkPlayers)
+            task->data[0]++;
+        break;
+    case 5:
+        if (gLinkPlayers[0].trainerId & 1)
+            current_map_music_set__default_for_battle(BGM_BATTLE32);
+        else
+            current_map_music_set__default_for_battle(BGM_BATTLE20);
+
+        switch (gSpecialVar_0x8004)
+        {
+        case 1:
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK;
+            break;
+        case 2:
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE;
+            break;
+        case 5:
+            ReducePlayerPartyToThree();
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI;
+            break;
+        }
+
+        SetMainCallback2(sub_800E7C4);
+        gMain.savedCallback = sub_8083958;
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+static void sub_8083958(void)
+{
+    call_map_music_set_to_zero();
+    LoadPlayerParty();
+    SavePlayerBag();
+    sub_810FEFC();
+
+    if (gSpecialVar_0x8004 != 5)
+        UpdateLinkBattleRecords(gUnknown_03004860 ^ 1);
+
+    gMain.savedCallback = sub_805465C;
+    SetMainCallback2(sub_8071B28);
+}
+
+void sub_80839A4(void)
+{
+    if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5)
+    {
+        LoadPlayerParty();
+        SavePlayerBag();
+    }
+    copy_saved_warp2_bank_and_enter_x_to_warp1(0x7F);
+}
+
+void sub_80839D0(void)
+{
+    sub_805559C();
+}
+
+static void sub_80839DC(u8 taskId)
+{
+    struct Task* task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        ShowFieldMessage(gUnknown_081A490C);
+        task->data[0] = 1;
+        break;
+    case 1:
+        if (IsFieldMessageBoxHidden())
+        {
+            sub_8055574();
+            sub_8007270(gSpecialVar_0x8005);
+            task->data[0] = 2;
+        }
+        break;
+    case 2:
+        switch (sub_80554F8())
+        {
+        case 0:
+            break;
+        case 1:
+            HideFieldMessageBox();
+            task->data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 2:
+            task->data[0] = 3;
+            break;
+        }
+        break;
+    case 3:
+        sub_8055588();
+        HideFieldMessageBox();
+        MenuZeroFillScreen();
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+        break;
+    }
+}
+
+void sub_8083A84(TaskFunc followupFunc)
+{
+    u8 taskId = CreateTask(sub_80839DC, 80);
+    SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, followupFunc);
+    ScriptContext1_Stop();
+}
+
+static void sub_8083AAC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        ScriptContext2_Enable();
+        fade_screen(1, 0);
+        ClearLinkCallback_2();
+        task->data[0]++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+            task->data[0]++;
+        break;
+    case 2:
+        gUnknown_020297D8.field0 = 0;
+        gUnknown_020297D8.field1 = 0;
+        m4aMPlayAllStop();
+        sub_800832C();
+        task->data[0]++;
+        break;
+    case 3:
+        if (!gReceivedRemoteLinkPlayers)
+        {
+            SetMainCallback2(sub_8047CD8);
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+static void sub_8083B44(u8 taskId)
+{
+    sub_8083B6C();
+    DestroyTask(taskId);
+}
+
+void sub_8083B5C(void)
+{
+    sub_8083A84(sub_8083B44);
+}
+
+static void sub_8083B6C(void)
+{
+    CreateTask(sub_8083AAC, 80);
+}
+
+void sub_8083B80(void)
+{
+    sub_8083B6C();
+    ScriptContext1_Stop();
+}
+
+void sub_8083B90(void)
+{
+    gLinkType = 0x2211;
+    sub_8083A84(sub_808382C);
+}
+
+void unref_sub_8083BB0(void)
+{
+    u8 taskId = CreateTask(sub_80839DC, 80);
+    SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, Task_RecordMixing_Main);
+    ScriptContext1_Stop();
+}
+
+void sub_8083BDC(void)
+{
+    sub_8093130(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+bool32 sub_8083BF4(u8 linkPlayerIndex)
+{
+    u32 trainerCardColorIndex;
+
+    gSpecialVar_0x8006 = linkPlayerIndex;
+    StringCopy(gStringVar1, gLinkPlayers[linkPlayerIndex].name);
+
+    trainerCardColorIndex = sub_80934C4(linkPlayerIndex);
+    if (trainerCardColorIndex == 0)
+        return FALSE;
+
+    StringCopy(gStringVar2, gTrainerCardColorNames[trainerCardColorIndex - 1]);
+    return TRUE;
+}
+
+void sub_8083C50(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[0]++;
+    if (task->data[0] > 300)
+    {
+        CloseLink();
+        SetMainCallback2(CB2_LinkError);
+        DestroyTask(taskId);
+    }
+
+    if (gReceivedRemoteLinkPlayers)
+        DestroyTask(taskId);
+}
+
+static void sub_8083CA4(u8 taskId)
+{
+    if (!gReceivedRemoteLinkPlayers)
+    {
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+void unref_sub_8083CC8(u8 taskId)
+{
+    sub_800832C();
+    gTasks[taskId].func = sub_8083CA4;
+}
\ No newline at end of file
diff --git a/src/choose_party.c b/src/choose_party.c
index 7b2c833e1..9cdf63fc8 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -6,9 +6,10 @@
 #include "name_string_util.h"
 #include "palette.h"
 #include "party_menu.h"
+#include "pokemon_menu.h"
 #include "pokemon.h"
 #include "pokemon_summary_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -50,10 +51,8 @@ extern void PartyMenuPrintMonsLevelOrStatus(void);
 extern void PrintPartyMenuMonNicknames(void);
 extern void sub_806BC3C(u8, u8);
 extern u8 sub_806B58C(u8);
-extern void sub_806D538();
 extern u16 sub_806BE38();
 extern u8 sub_806CA38();
-extern void sub_808B5B4();
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
 extern u8 sub_806B124();
 extern void sub_806C994();
@@ -84,8 +83,6 @@ extern void PartyMenuDoPutNicknameTilemap(u16, u8, u8, u8, const u8 *);
 extern void box_print(u8, int, const u8 *);
 extern void sub_806BCE8(void);
 extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
-extern u16 sub_806BD80();
-extern void sub_806BF74();
 
 static void ClearPartySelection(void);
 static bool8 IsMonAllowedInBattleTower(struct Pokemon *);
diff --git a/src/clock.c b/src/clock.c
index 1f2aac9fd..9635514d2 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -7,7 +7,7 @@
 #include "field_weather.h"
 #include "lottery_corner.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "time_events.h"
 #include "tv.h"
diff --git a/src/daycare.c b/src/daycare.c
index 717e37330..b383667a7 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -21,9 +21,7 @@
 #include "sound.h"
 #include "songs.h"
 #include "script.h"
-#include "rom4.h"
-
-extern u16 word_2024E82;
+#include "overworld.h"
 
 IWRAM_DATA u16 gUnknown_03000470[52];
 IWRAM_DATA u16 gUnknown_030004D8[4];
@@ -150,6 +148,9 @@ static void sub_80414C0(struct DayCareData * daycare_data)
     }
 }
 
+u8 TryIncrementMonLevel(struct Pokemon *);
+extern u16 gMoveToLearn;
+
 static void DayCare_LevelUpMoves(struct Pokemon * mon)
 {
     s32 i;
@@ -161,11 +162,11 @@ static void DayCare_LevelUpMoves(struct Pokemon * mon)
         if (TryIncrementMonLevel(mon))
         {
             r6 = 1;
-            while ((temp = sub_803B7C8(mon, r6)) != 0)
+            while ((temp = MonTryLearningNewMove(mon, r6)) != 0)
             {
                 r6 = 0;
                 if (temp == 0xffff)
-                    DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82);
+                    DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
             }
         }
         else
diff --git a/src/decoration.c b/src/decoration.c
index da33b3ab7..1d48692c1 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "main.h"
 #include "map_object_constants.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sound.h"
 #include "songs.h"
 #include "string_util.h"
@@ -2322,7 +2322,7 @@ void sub_80FF474(void)
     {
         if (FlagGet(i + 0xae) == 1)
         {
-            FlagReset(i + 0xae);
+            FlagClear(i + 0xae);
             for (j=0; j<gMapHeader.events->mapObjectCount; j++)
             {
                 if (gMapHeader.events->mapObjects[j].flagId == i + 0xae)
diff --git a/src/diploma.c b/src/diploma.c
index ba7de58aa..27601404c 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -4,7 +4,7 @@
 #include "menu.h"
 #include "palette.h"
 #include "pokedex.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
@@ -35,7 +35,7 @@ static void VBlankCB(void)
     TransferPlttBuffer();
 }
 
-void sub_8145D88(void)
+void CB2_ShowDiploma(void)
 {
     u32 savedIme;
 
diff --git a/src/easy_chat.c b/src/easy_chat.c
index f3673c8fa..e71067454 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -21,8 +21,8 @@ extern u16 gSpecialVar_0x8004;
 
 IWRAM_DATA u8 gUnknown_03000740;
 
-
-u8 *sub_80EB3FC(u8 *dst, u16 word)
+// returns the end of the destination buffer text
+u8 *EasyChat_GetWordText(u8 *dst, u16 word)
 {
     u16 group;
     u16 wordIndex;
@@ -34,13 +34,13 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
 
     if (word == 0xFFFF)
     {
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
     else
     {
-        group = word >> 9;
-        wordIndex = word & 0x1FF;
+        group = EC_GROUP(word);
+        wordIndex = EC_INDEX(word);
         switch (group)
         {
         case EC_GROUP_POKEMON: // 0
@@ -61,7 +61,7 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
             dst = StringCopy(dst, src);
             break;
         }
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
 }
@@ -79,7 +79,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -92,7 +92,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         dst[0] = CHAR_NEWLINE;
         dst++;
@@ -117,7 +117,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -130,7 +130,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         // Only difference with ConvertEasyChatWordsToString
         dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL;
@@ -146,7 +146,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
 u16 unref_sub_80EB5E0(u16 arg0)
 {
-    u8 *chars;
+    const u8 *chars;
     u16 i;
     u16 length;
     int group, word;
@@ -155,8 +155,8 @@ u16 unref_sub_80EB5E0(u16 arg0)
     if (arg0 == 0xFFFF)
         return 0;
 
-    group = arg0 >> 9;
-    word = arg0 & 0x1FF;
+    group = EC_GROUP(arg0);
+    word = EC_INDEX(arg0);
     switch (group)
     {
     case EC_GROUP_POKEMON: // 0
@@ -323,7 +323,7 @@ void sub_80EB83C(void)
         group = EC_GROUP_LIFESTYLE;
 
     local2 = sub_80EB784(group);
-    sub_80EB3FC(gStringVar2, local2);
+    EasyChat_GetWordText(gStringVar2, local2);
 }
 
 u8 sub_80EB868(u8 arg0)
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index aa3d45250..90d1ee039 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -6,7 +6,7 @@
 #include "task.h"
 #include "script.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "main.h"
 #include "event_data.h"
 #include "sound.h"
diff --git a/src/event_data.c b/src/event_data.c
index 0484bae02..ee475343f 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -36,10 +36,10 @@ void ClearTempFieldEventData(void)
 {
     memset(gSaveBlock1.flags, 0, TEMP_FLAGS_SIZE);
     memset(gSaveBlock1.vars, 0, TEMP_VARS_SIZE);
-    FlagReset(SYS_ENC_UP_ITEM);
-    FlagReset(SYS_ENC_DOWN_ITEM);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_CTRL_OBJ_DELETE);
+    FlagClear(SYS_ENC_UP_ITEM);
+    FlagClear(SYS_ENC_DOWN_ITEM);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_CTRL_OBJ_DELETE);
 }
 
 // probably had different flag splits at one point.
@@ -53,7 +53,7 @@ void DisableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2.pokedex.nationalMagic = 0;
     *nationalDexVar = 0;
-    FlagReset(SYS_NATIONAL_DEX);
+    FlagClear(SYS_NATIONAL_DEX);
 }
 
 void EnableNationalPokedex(void)
@@ -77,7 +77,7 @@ bool32 IsNationalPokedexEnabled(void)
 
 void DisableMysteryGift(void)
 {
-    FlagReset(SYS_EXDATA_ENABLE);
+    FlagClear(SYS_EXDATA_ENABLE);
 }
 
 void EnableMysteryGift(void)
@@ -93,7 +93,7 @@ bool32 IsMysteryGiftEnabled(void)
 void DisableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0);
-    FlagReset(SYS_RESET_RTC_ENABLE);
+    FlagClear(SYS_RESET_RTC_ENABLE);
 }
 
 void EnableResetRTC(void)
@@ -162,7 +162,7 @@ u8 FlagSet(u16 id)
     return 0;
 }
 
-u8 FlagReset(u16 id)
+u8 FlagClear(u16 id)
 {
     u8 *ptr = GetFlagPointer(id);
     if (ptr)
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index a47e63a59..1fd5bf8fa 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "evolution_graphics.h"
 #include "sprite.h"
 #include "trig.h"
 #include "rng.h"
@@ -376,10 +377,10 @@ static void EvoTask_DestroyPostSet1Task(u8 taskID)
     DestroyTask(taskID);
 }
 
-u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0)
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species)
 {
     u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash, 0);
-    gTasks[taskID].data[2] = arg0;
+    gTasks[taskID].data[2] = species;
     return taskID;
 }
 
@@ -424,10 +425,10 @@ static void EvoTask_DestroyPostSet2AndFlashTask(u8 taskID)
         DestroyTask(taskID);
 }
 
-u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0)
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species)
 {
     u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash_Trade, 0);
-    gTasks[taskID].data[2] = arg0;
+    gTasks[taskID].data[2] = species;
     return taskID;
 }
 
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
new file mode 100644
index 000000000..e312b081f
--- /dev/null
+++ b/src/evolution_scene.c
@@ -0,0 +1,3966 @@
+#include "global.h"
+#include "task.h"
+#include "evolution_scene.h"
+#include "evolution_graphics.h"
+#include "palette.h"
+#include "main.h"
+#include "text.h"
+#include "text_window.h"
+#include "pokemon.h"
+#include "string_util.h"
+#include "battle.h"
+#include "unknown_task.h"
+#include "data2.h"
+#include "decompress.h"
+#include "m4a.h"
+#include "trade.h"
+#include "menu.h"
+#include "pokedex.h"
+#include "species.h"
+#include "sound.h"
+#include "songs.h"
+#include "overworld.h"
+#include "battle_message.h"
+#include "pokemon_summary_screen.h"
+#include "menu_cursor.h"
+#include "strings2.h"
+
+struct EvoInfo
+{
+    u8 preEvoSpriteID;
+    u8 postEvoSpriteID;
+    u8 evoTaskID;
+    u8 field_3;
+
+    u8 unk4[0x40];
+    u8 unk44[0x40];
+    u8 unk84[0x40];
+
+    u8 unkC4[0x40][0x20];    // 0x20148C4
+    u8 unk8C4[0x40][0x20];   // 0x20150C4
+    u8 unk10C4[0x40][0x20];  // 0x20158C4
+    u8 unk18C4[0x40][0x20];  // 0x20160C4
+    u8 unk20C4[0x40][0x20];  // 0x20168C4
+    u8 unk28C4[0x40][0x20];  // 0x20170C4
+    u8 unk30C4[0x40][0x20];  // 0x20178C4
+    u8 unk38C4[0x40][0x20];  // 0x20180C4
+
+    u8 *unk40C4[0x40][0x20];  // 0x20188C4
+
+    u16 unk60C4[0x40][0x20];  // 0x201A8C4
+    u16 unk70C4[0x40][0x20];  // 0x201B8C4
+    u16 unk80C4[0x40][0x20];  // 0x201C8C4
+    u16 unk90C4[0x40][0x20];  // 0x201D8C4
+
+    u8 unkA0C4; // 0x201E8C4
+};
+
+#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800)))
+
+void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
+void sub_8024CEC(void);
+void sub_8023A80(void);
+void sub_802BC6C(void);
+void sub_8023AD8(void);
+void nullsub_6(void);
+bool32 IsHMMove2(u16 move);
+
+extern struct Window gUnknown_03004210;
+extern u16 gUnknown_030042A4;
+extern u16 gUnknown_030042A0;
+extern u16 gUnknown_030042C0;
+extern u16 gUnknown_030041B4;
+extern u16 gUnknown_03004288;
+extern u16 gUnknown_03004280;
+extern u16 gUnknown_030041B0;
+extern u16 gUnknown_030041B8;
+extern u8 gBattleTerrain;
+extern u8 gReservedSpritePaletteCount;
+extern u16 gMoveToLearn;
+extern struct SpriteTemplate gUnknown_02024E8C;
+extern u8 gUnk_2009000[]; // won't match if I 'ewram' it
+extern bool8 gAffineAnimsDisabled;
+extern u8 gDisplayedStringBattle[];
+extern u8 gBattleTextBuff2[];
+
+extern u8 gBattleCommunication[];
+#define sEvoCursorPos        gBattleCommunication[1] // when learning a new move
+#define sEvoGraphicsTaskID   gBattleCommunication[2]
+
+extern const u8 gUnknown_08400C4A[];
+extern const u8 gUnknown_08400C60[];
+extern const u8 gUnknown_08400C8D[];
+extern void * const gUnknown_081FAF4C[];
+extern const u8* const gBattleStringsTable[];
+
+// this file's functions
+static void Task_EvolutionScene(u8 taskID);
+static void Task_TradeEvolutionScene(u8 taskID);
+static void CB2_EvolutionSceneUpdate(void);
+static void CB2_TradeEvolutionSceneUpdate(void);
+static void EvoDummyFunc(void);
+static void EvoDummyFunc2(void);
+static void VBlankCB_EvolutionScene(void);
+static void VBlankCB_TradeEvolutionScene(void);
+static void sub_81150D8(void);
+
+// iwram common
+MainCallback gCB2_AfterEvolution;
+
+// const data
+static const u8 sUnknownShedinjaJpnString[] = _("ヌケニン");
+static const u8 sUnusedString0[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}");
+static const u8 sUnusedString1[] = _("▶\n ");
+static const u8 sUnusedString2[] = _("       \n▶");
+static const u8 sUnusedString3[] = _("       \n ");
+static const u8 sPadding[9] = {0};
+
+// code
+
+static void CB2_BeginEvolutionScene(void)
+{
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+#define tState              data[0]
+#define tMonPtrHI           data[1]
+#define tMonPtrLO           data[2]
+#define tPreEvoSpecies      data[3]
+#define tPostEvoSpecies     data[4]
+#define tCanStop            data[5] // in first fast data[5] only checks that
+#define tBits               data[5] // in the second task, it works as a bitfield
+#define tLearnsFirstMove    data[6]
+#define tLearnMoveState     data[8]
+#define tData9              data[9]
+#define tData10             data[10]
+#define tEvoWasStopped      data[11]
+#define tPartyID            data[12]
+
+#define TASK_BIT_CAN_STOP       0x1
+#define TASK_BIT_LEARN_MOVE     0x80
+
+static void Task_BeginEvolutionScene(u8 taskID)
+{
+    struct Pokemon* mon = NULL;
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].tState++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            u16 speciesToEvolve;
+            bool8 canStopEvo;
+            u8 partyID;
+
+            mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+            speciesToEvolve = gTasks[taskID].tPostEvoSpecies;
+            canStopEvo = gTasks[taskID].tCanStop;
+            partyID = gTasks[taskID].tPartyID;
+
+            DestroyTask(taskID);
+            EvolutionScene(mon, speciesToEvolve, canStopEvo, partyID);
+        }
+        break;
+    }
+}
+
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+{
+    u8 taskID = CreateTask(Task_BeginEvolutionScene, 0);
+    gTasks[taskID].tState = 0;
+    gTasks[taskID].tMonPtrHI = (u32)(mon);
+    gTasks[taskID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[taskID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[taskID].tCanStop = canStopEvo;
+    gTasks[taskID].tPartyID = partyID;
+    SetMainCallback2(CB2_BeginEvolutionScene);
+}
+
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+{
+    u8 name[20];
+    u16 currSpecies;
+    u32 TiD, PiD;
+    const struct CompressedSpritePalette** pokePal;
+    u8 ID;
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+    REG_MOSAIC = 0;
+    REG_WIN0H = 0;
+    REG_WIN0V = 0;
+    REG_WIN1H = 0;
+    REG_WIN1V = 0;
+    REG_WININ = 0;
+    REG_WINOUT = 0;
+
+    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    ResetPaletteFade();
+
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    gUnknown_030042C0 = 0;
+    gUnknown_030041B4 = 0;
+    gUnknown_03004288 = 0;
+    gUnknown_03004280 = 0;
+    gUnknown_030041B0 = 256;
+    gUnknown_030041B8 = 0;
+
+    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    gBattleTerrain = BATTLE_TERRAIN_PLAIN;
+
+    sub_800D6D4();
+    sub_800DAB8();
+    ResetSpriteData();
+    remove_some_task();
+    ResetTasks();
+    FreeAllSpritePalettes();
+
+    gReservedSpritePaletteCount = 4;
+
+    GetMonData(mon, MON_DATA_NICKNAME, name);
+    StringCopy10(gStringVar1, name);
+    StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+
+    // preEvo sprite
+    currSpecies = GetMonData(mon, MON_DATA_SPECIES);
+    TiD = GetMonData(mon, MON_DATA_OT_ID);
+    PiD = GetMonData(mon, MON_DATA_PERSONALITY);
+    DecompressPicFromTable_2(&gMonFrontPicTable[currSpecies],
+                             gMonFrontPicCoords[currSpecies].coords,
+                             gMonFrontPicCoords[currSpecies].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[1], currSpecies);
+    pokePal = (void*) sub_80409C8(currSpecies, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x110, 0x20);
+
+    GetMonSpriteTemplate_803C56C(currSpecies, 1);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.preEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 1;
+    gSprites[ID].invisible = 1;
+
+    // postEvo sprite
+    DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+                             gMonFrontPicCoords[speciesToEvolve].coords,
+                             gMonFrontPicCoords[speciesToEvolve].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[3], speciesToEvolve);
+    pokePal = (void*) sub_80409C8(speciesToEvolve, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(speciesToEvolve, 3);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+    gSprites[ID].invisible = 1;
+
+    LoadEvoSparkleSpriteAndPal();
+
+    sEvoInfo.evoTaskID = ID = CreateTask(Task_EvolutionScene, 0);
+    gTasks[ID].tState = 0;
+    gTasks[ID].tPreEvoSpecies = currSpecies;
+    gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[ID].tMonPtrHI = (u32)(mon);
+    gTasks[ID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[ID].tCanStop = canStopEvo;
+    gTasks[ID].tLearnsFirstMove = TRUE;
+    gTasks[ID].tEvoWasStopped = FALSE;
+    gTasks[ID].tPartyID = partyID;
+
+    memcpy(gUnk_2009000, &gPlttBufferUnfaded[0x20], 0x60);
+
+    REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
+    SetHBlankCallback(EvoDummyFunc);
+    SetVBlankCallback(VBlankCB_EvolutionScene);
+    m4aMPlayAllStop();
+    SetMainCallback2(CB2_EvolutionSceneUpdate);
+}
+
+static void CB2_EvolutionSceneLoadGraphics(void)
+{
+    u8 ID;
+    const struct CompressedSpritePalette** pokePal;
+    u16 postEvoSpecies;
+    u32 TiD, PiD;
+    struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoInfo.evoTaskID].tPartyID];
+
+    postEvoSpecies = gTasks[sEvoInfo.evoTaskID].tPostEvoSpecies;
+    TiD = GetMonData(Mon, MON_DATA_OT_ID);
+    PiD = GetMonData(Mon, MON_DATA_PERSONALITY);
+
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+    REG_MOSAIC = 0;
+    REG_WIN0H = 0;
+    REG_WIN0V = 0;
+    REG_WIN1H = 0;
+    REG_WIN1V = 0;
+    REG_WININ = 0;
+    REG_WINOUT = 0;
+    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    ResetPaletteFade();
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    gUnknown_030042C0 = 0;
+    gUnknown_030041B4 = 0;
+    gUnknown_03004288 = 0;
+    gUnknown_03004280 = 0;
+    gUnknown_030041B0 = 256;
+    gUnknown_030041B8 = 0;
+
+    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    gBattleTerrain = BATTLE_TERRAIN_PLAIN;
+
+    sub_800D6D4();
+    sub_800DAB8();
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 4;
+
+    DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
+                             gMonFrontPicCoords[postEvoSpecies].coords,
+                             gMonFrontPicCoords[postEvoSpecies].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[3], postEvoSpecies);
+    pokePal = (void*) sub_80409C8(postEvoSpecies, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(postEvoSpecies, 3);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+
+    REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
+    SetHBlankCallback(EvoDummyFunc);
+    SetVBlankCallback(VBlankCB_EvolutionScene);
+    SetMainCallback2(CB2_EvolutionSceneUpdate);
+    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+}
+
+static void CB2_TradeEvolutionSceneLoadGraphics(void)
+{
+    struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoInfo.evoTaskID].tPartyID];
+    u16 postEvoSpecies = gTasks[sEvoInfo.evoTaskID].tPostEvoSpecies;
+
+    switch (gMain.state)
+    {
+    case 0:
+        REG_DISPCNT = 0;
+        SetHBlankCallback(NULL);
+        SetVBlankCallback(NULL);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 4;
+        gUnknown_030042A4 = 0;
+        gUnknown_030042A0 = 0;
+        gUnknown_030042C0 = 0;
+        gUnknown_030041B4 = 0;
+        gUnknown_03004288 = 0;
+        gUnknown_03004280 = 0;
+        gUnknown_030041B0 = 256;
+        gUnknown_030041B8 = 0;
+        gMain.state++;
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E6F84);
+        InitWindowFromConfig(&gUnknown_03004828->field_4, &gWindowConfig_81E6F84);
+        gMain.state++;
+        break;
+    case 2:
+        LoadTextWindowGraphics(&gUnknown_03004828->field_4);
+        gUnknown_03004828->field_34 = SetTextWindowBaseTileNum(2);
+        LoadTextWindowGraphics(&gUnknown_03004828->field_4);
+        MenuZeroFillScreen();
+        ResetPaletteFade();
+        gMain.state++;
+        SetHBlankCallback(EvoDummyFunc);
+        SetVBlankCallback(VBlankCB_TradeEvolutionScene);
+        break;
+    case 3:
+        sub_804E22C();
+        gMain.state++;
+        break;
+    case 4:
+        {
+            const struct CompressedSpritePalette** pokePal;
+            u32 TiD = GetMonData(Mon, MON_DATA_OT_ID);
+            u32 PiD = GetMonData(Mon, MON_DATA_PERSONALITY);
+            DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
+                                     gMonFrontPicCoords[postEvoSpecies].coords,
+                                     gMonFrontPicCoords[postEvoSpecies].y_offset,
+                                     (void*)(0x2000000),
+                                     gUnknown_081FAF4C[3], postEvoSpecies);
+            pokePal = (void*) sub_80409C8(postEvoSpecies, TiD, PiD);
+            LoadCompressedPalette(*pokePal, 0x120, 0x20);
+            gMain.state++;
+        }
+        break;
+    case 5:
+        {
+            u8 ID;
+
+            GetMonSpriteTemplate_803C56C(postEvoSpecies, 3);
+            gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+            sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+            gSprites[ID].callback = nullsub_37;
+            gSprites[ID].oam.paletteNum = 2;
+            gMain.state++;
+        }
+        break;
+    case 6:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
+        REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP;
+        break;
+    }
+}
+
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID)
+{
+    u8 name[20];
+    u16 currSpecies;
+    u32 TiD, PiD;
+    const struct CompressedSpritePalette** pokePal;
+    u8 ID;
+
+    GetMonData(mon, MON_DATA_NICKNAME, name);
+    StringCopy10(gStringVar1, name);
+    StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+
+    gAffineAnimsDisabled = TRUE;
+
+    // preEvo sprite
+    currSpecies = GetMonData(mon, MON_DATA_SPECIES);
+    PiD = GetMonData(mon, MON_DATA_PERSONALITY);
+    TiD = GetMonData(mon, MON_DATA_OT_ID);
+    sEvoInfo.preEvoSpriteID = preEvoSpriteID;
+    DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+                             gMonFrontPicCoords[speciesToEvolve].coords,
+                             gMonFrontPicCoords[speciesToEvolve].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[1], speciesToEvolve);
+    pokePal = (void*) sub_80409C8(speciesToEvolve, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(speciesToEvolve, 1);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+    gSprites[ID].invisible = 1;
+
+    LoadEvoSparkleSpriteAndPal();
+
+    sEvoInfo.evoTaskID = ID = CreateTask(Task_TradeEvolutionScene, 0);
+    gTasks[ID].tState = 0;
+    gTasks[ID].tPreEvoSpecies = currSpecies;
+    gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[ID].tMonPtrHI = (u32)(mon);
+    gTasks[ID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[ID].tLearnsFirstMove = TRUE;
+    gTasks[ID].tEvoWasStopped = FALSE;
+    gTasks[ID].tPartyID = partyID;
+
+    SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
+}
+
+static void CB2_EvolutionSceneUpdate(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    sub_800374C(&gUnknown_03004210);
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void CB2_TradeEvolutionSceneUpdate(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    sub_80035AC(&gUnknown_03004828->field_4);
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
+{
+    u32 data = 0;
+    if (gEvolutionTable[preEvoSpecies].evolutions[0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6)
+    {
+        s32 i;
+        struct Pokemon* Shedinja = &gPlayerParty[gPlayerPartyCount];
+        const struct EvolutionData* EvoTable;
+        const struct EvolutionData* Evos;
+
+        CopyMon(Shedinja, mon, sizeof(struct Pokemon));
+        SetMonData(Shedinja, MON_DATA_SPECIES, (void*)(&gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies));
+        SetMonData(Shedinja, MON_DATA_NICKNAME, (void*)(gSpeciesNames[gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies]));
+        SetMonData(Shedinja, MON_DATA_HELD_ITEM, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_MARKINGS, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_10, (void*)(&data));
+        for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++)
+            SetMonData(Shedinja, i, (void*)(&data));
+        for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FATEFUL_ENCOUNTER; i++)
+            SetMonData(Shedinja, i, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_STATUS, (void*)(&data));
+        data = 0xFF;
+        SetMonData(Shedinja, MON_DATA_MAIL, (void*)(&data));
+
+        CalculateMonStats(Shedinja);
+        CalculatePlayerPartyCount();
+
+        // can't match it otherwise, ehh
+        EvoTable = gEvolutionTable;
+        Evos = EvoTable + preEvoSpecies;
+        GetNationalPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 2);
+        GetNationalPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 3);
+
+        if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
+            && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
+            && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
+                SetMonData(Shedinja, MON_DATA_NICKNAME, sUnknownShedinjaJpnString);
+    }
+}
+
+static void Task_EvolutionScene(u8 taskID)
+{
+    u32 var;
+    struct Pokemon* mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+
+    // check if B Button was held, so the evolution gets stopped
+    if (gMain.heldKeys == B_BUTTON && gTasks[taskID].tState == 8 && gTasks[taskID].tBits & TASK_BIT_CAN_STOP)
+    {
+        gTasks[taskID].tState = 16;
+        if (gTasks[sEvoGraphicsTaskID].isActive)
+            gTasks[sEvoGraphicsTaskID].EvoGraphicsTaskEvoStop = TRUE;
+    }
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gSprites[sEvoInfo.preEvoSpriteID].invisible = 0;
+        gTasks[taskID].tState++;
+        break;
+    case 1: // print 'whoa, poke is evolving!!!' msg
+        if (!gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C4A);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 2: // wait for string, play cry
+        if (gUnknown_03004210.state == 0)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 3: // wait for cry, play tu du SE
+        if (IsCryFinished())
+        {
+            PlaySE(BGM_ME_SHINKA);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 4: // play evolution music and fade screen black
+        if (!IsSEPlaying())
+        {
+            PlayNewMapMusic(BGM_SHINKA);
+            gTasks[taskID].tState++;
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+        }
+        break;
+    case 5: // after screen fade, preapre evo sparkles
+        if (!gPaletteFade.active)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(17);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 6: // another set of evo sparkles
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            gTasks[taskID].tState++;
+            sEvoInfo.field_3 = 1;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+        }
+        break;
+    case 7: // launch task that flashes pre evo with post evo sprites
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = sub_8149E7C(sEvoInfo.preEvoSpriteID, sEvoInfo.postEvoSpriteID);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 8: // wait for the above task to finish
+        if (--sEvoInfo.field_3 == 0)
+        {
+            sEvoInfo.field_3 = 3;
+            if (!gTasks[sEvoGraphicsTaskID].isActive)
+                gTasks[taskID].tState++;
+        }
+        break;
+    case 9: // post evo sparkles
+        sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
+        gTasks[taskID].tState++;
+        break;
+    case 10:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash(gTasks[taskID].tPostEvoSpecies);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 11: // play tu du sound after evolution
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            PlaySE(SE_EXP);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 12: // play poke cry after evolution and return screed to pre-fade state
+        if (IsSEPlaying())
+        {
+            m4aMPlayAllStop();
+            PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
+            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 13: // congratulations string and rename prompt
+        if (IsCryFinished() && !gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C60);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            PlayBGM(BGM_FANFA5);
+            gTasks[taskID].tState++;
+            SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
+            CalculateMonStats(mon);
+            EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
+            IncrementGameStat(14);
+        }
+        break;
+    case 14: // check if it wants to learn a new move
+        if (gUnknown_03004210.state == 0)
+        {
+            var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
+            if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+            {
+                u8 text[20];
+
+                sub_8053E90();
+                gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
+                gTasks[taskID].tLearnsFirstMove = FALSE;
+                gTasks[taskID].tLearnMoveState = 0;
+                GetMonData(mon, MON_DATA_NICKNAME, text);
+                StringCopy10(gBattleTextBuff1, text);
+                if (var == 0xFFFF) // no place to learn it
+                    gTasks[taskID].tState = 21;
+                else if (var == 0xFFFE) // it already knows that move
+                    break;
+                else
+                    gTasks[taskID].tState = 19; // has less than 4 moves, so it's been learned
+            }
+            else // no move to learn
+            {
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gTasks[taskID].tState++;
+            }
+        }
+        break;
+    case 15: // task has finished, return
+        if (!gPaletteFade.active)
+        {
+            if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
+                sub_8053E90();
+            if (!gTasks[taskID].tEvoWasStopped)
+                CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);
+            DestroyTask(taskID);
+            SetMainCallback2(gCB2_AfterEvolution);
+        }
+        break;
+    case 16: // evolution has been canceled, stop music and re-fade palette
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            m4aMPlayAllStop();
+            BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 17: // play cry of the pokemon trying to evolve again, evolution has been stopped
+        if (!gPaletteFade.active)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 18: // after the cry, print the string 'WHOA IT DID NOT EVOLVE!!!'
+        if (IsCryFinished())
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C8D);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            gTasks[taskID].tEvoWasStopped = TRUE;
+            gTasks[taskID].tState = 14;
+        }
+        break;
+    case 19: // pokemon learned a new move, print string and play a fanfare
+        if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+        {
+            sub_8024CEC();
+            PlayFanfare(BGM_FANFA1);
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 20: // wait a bit and check if can learn another move
+        if (gUnknown_03004210.state == 0 && !IsSEPlaying() && --gTasks[taskID].tLearnsFirstMove == 0)
+            gTasks[taskID].tState = 14;
+        break;
+    case 21: // try to learn a new move
+        switch (gTasks[taskID].tLearnMoveState)
+        {
+        case 0:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                sub_8024CEC();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 1:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 2:
+            if (gUnknown_03004210.state != 0)
+                break;
+            if (!IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tData9 = 5;
+                gTasks[taskID].tData10 = 9;
+                gTasks[taskID].tLearnMoveState++;
+            }
+        case 3:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                sub_8023A80();
+                gTasks[taskID].tLearnMoveState++;
+                sEvoCursorPos = 0;
+                sub_802BC6C();
+            }
+            break;
+        case 4:
+            if (gMain.newKeys & DPAD_UP && sEvoCursorPos != 0)
+            {
+                PlaySE(SE_SELECT);
+                nullsub_6();
+                sEvoCursorPos = 0;
+                sub_802BC6C();
+            }
+            if (gMain.newKeys & DPAD_DOWN && sEvoCursorPos == 0)
+            {
+                PlaySE(SE_SELECT);
+                nullsub_6();
+                sEvoCursorPos = 1;
+                sub_802BC6C();
+            }
+            if (gMain.newKeys & A_BUTTON)
+            {
+                sub_8023AD8();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                PlaySE(SE_SELECT);
+                if (sEvoCursorPos != 0)
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+                else
+                {
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9;
+                    if (gTasks[taskID].tLearnMoveState == 5)
+                        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                }
+            }
+            if (gMain.newKeys & B_BUTTON)
+            {
+                sub_8023AD8();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                PlaySE(SE_SELECT);
+                gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+            }
+            break;
+        case 5:
+            if (!gPaletteFade.active)
+            {
+                sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID,
+                            gPlayerPartyCount - 1, CB2_EvolutionSceneLoadGraphics,
+                            gMoveToLearn);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 6:
+            if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate)
+            {
+                var = sub_809FA30(); // moveID
+                if (var == 4)
+                    gTasks[taskID].tLearnMoveState = 9;
+                else
+                {
+                    u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
+                    if (IsHMMove2(move))
+                    {
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                        gTasks[taskID].tLearnMoveState = 11;
+                    }
+                    else
+                    {
+                        gBattleTextBuff2[0] = 0xFD;
+                        gBattleTextBuff2[1] = 2;
+                        gBattleTextBuff2[2] = move;
+                        gBattleTextBuff2[3] = (move & 0xFF00) >> 8;
+                        gBattleTextBuff2[4] = EOS;
+                        RemoveMonPPBonus(mon, var);
+                        SetMonMoveSlot(mon, gMoveToLearn, var);
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                        gTasks[taskID].tLearnMoveState++;
+                    }
+                }
+            }
+            break;
+        case 7:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 8:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tState = 19;
+            }
+            break;
+        case 9:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tData9 = 10;
+            gTasks[taskID].tData10 = 0;
+            gTasks[taskID].tLearnMoveState = 3;
+            break;
+        case 10:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tState = 14;
+            break;
+        case 11:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+                gTasks[taskID].tLearnMoveState = 5;
+            break;
+        }
+        break;
+    }
+}
+
+static void Task_TradeEvolutionScene(u8 taskID)
+{
+    u32 var;
+    struct Pokemon* mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        StringExpandPlaceholders(gStringVar4, gUnknown_08400C4A);
+        sub_8002EB0(&gUnknown_03004828->field_4, gStringVar4, gUnknown_03004828->field_34, 2, 15);
+        gTasks[taskID].tState++;
+        break;
+    case 1:
+        if (gUnknown_03004828->field_4.state == 0)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 2:
+        if (IsCryFinished())
+        {
+            m4aSongNumStop(BGM_SHINKA);
+            PlaySE(BGM_ME_SHINKA);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 3:
+        if (!IsSEPlaying())
+        {
+            PlayBGM(BGM_SHINKA);
+            gTasks[taskID].tState++;
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+        }
+        break;
+    case 4:
+        if (!gPaletteFade.active)
+        {
+            REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(17);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 5:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            gTasks[taskID].tState++;
+            sEvoInfo.field_3 = 1;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+        }
+        break;
+    case 6:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = sub_8149E7C(sEvoInfo.preEvoSpriteID, sEvoInfo.postEvoSpriteID);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 7:
+        if (--sEvoInfo.field_3 == 0)
+        {
+            sEvoInfo.field_3 = 3;
+            if (!gTasks[sEvoGraphicsTaskID].isActive)
+                gTasks[taskID].tState++;
+        }
+        break;
+    case 8:
+        sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
+        gTasks[taskID].tState++;
+        break;
+    case 9:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash_Trade(gTasks[taskID].tPostEvoSpecies);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 10:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            PlaySE(SE_EXP);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 11:
+        if (IsSEPlaying())
+        {
+            PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
+            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            BeginNormalPaletteFade(1, 0, 0x10, 0, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 12:
+        if (IsCryFinished() && !gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C60);
+            sub_8002EB0(&gUnknown_03004828->field_4, gStringVar4, gUnknown_03004828->field_34, 2, 15);
+            PlayFanfare(BGM_FANFA5);
+            gTasks[taskID].tState++;
+            SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
+            CalculateMonStats(mon);
+            EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
+            IncrementGameStat(14);
+        }
+        break;
+    case 13:
+        if (gUnknown_03004828->field_4.state == 0 && IsFanfareTaskInactive() == TRUE)
+        {
+            var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
+            if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+            {
+                u8 text[20];
+
+                gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
+                gTasks[taskID].tLearnsFirstMove = FALSE;
+                gTasks[taskID].tLearnMoveState = 0;
+                GetMonData(mon, MON_DATA_NICKNAME, text);
+                StringCopy10(gBattleTextBuff1, text);
+                if (var == 0xFFFF)
+                    gTasks[taskID].tState = 17;
+                else if (var == 0xFFFE)
+                    break;
+                else
+                    gTasks[taskID].tState = 15;
+            }
+            else
+            {
+                PlayBGM(BGM_SHINKA);
+                sub_8002EB0(&gUnknown_03004828->field_4, gOtherText_LinkStandby2, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tState++;
+            }
+        }
+        break;
+    case 14:
+        if (gUnknown_03004828->field_4.state == 0)
+        {
+            DestroyTask(taskID);
+            SetMainCallback2(gCB2_AfterEvolution);
+        }
+        break;
+    case 15:
+        if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+        {
+            sub_8024CEC();
+            PlayFanfare(BGM_FANFA1);
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 16:
+        if (gUnknown_03004828->field_4.state == 0 && IsFanfareTaskInactive() == TRUE && --gTasks[taskID].tLearnsFirstMove == 0)
+            gTasks[taskID].tState = 13;
+        break;
+    case 17:
+        switch (gTasks[taskID].tLearnMoveState)
+        {
+        case 0:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                sub_8024CEC();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 1:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 2:
+            if (gUnknown_03004828->field_4.state != 0)
+                break;
+            if (!IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tData9 = 5;
+                gTasks[taskID].tData10 = 9;
+                gTasks[taskID].tLearnMoveState++;
+            }
+        case 3:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                DrawTextWindow(&gUnknown_03004828->field_4, 24, 8, 29, 13);
+                sEvoCursorPos = 0;
+                InitWindow(&gUnknown_03004828->field_4, gOtherText_YesNoAndPlayer, gUnknown_03004828->field_34 + 128, 25, 9);
+                sub_8002F44(&gUnknown_03004828->field_4);
+                sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20);
+                sub_81150D8();
+                gTasks[taskID].tLearnMoveState++;
+                sEvoCursorPos = 0;
+            }
+            break;
+        case 4:
+            if (gMain.newKeys & DPAD_UP && sEvoCursorPos != 0)
+            {
+                PlaySE(SE_SELECT);
+                EvoDummyFunc2();
+                sEvoCursorPos = 0;
+                sub_81150D8();
+            }
+            if (gMain.newKeys & DPAD_DOWN && sEvoCursorPos == 0)
+            {
+                PlaySE(SE_SELECT);
+                EvoDummyFunc2();
+                sEvoCursorPos = 1;
+                sub_81150D8();
+            }
+            if (gMain.newKeys & A_BUTTON)
+            {
+                ZeroFillWindowRect(&gUnknown_03004828->field_4, 0x18, 8, 0x1D, 0xD);
+                DestroyMenuCursor();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                PlaySE(SE_SELECT);
+                if (sEvoCursorPos != 0)
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+                else
+                {
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9;
+                    if (gTasks[taskID].tLearnMoveState == 5)
+                        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                }
+            }
+            if (gMain.newKeys & B_BUTTON)
+            {
+                ZeroFillWindowRect(&gUnknown_03004828->field_4, 0x18, 8, 0x1D, 0xD);
+                DestroyMenuCursor();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                PlaySE(SE_SELECT);
+                gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+            }
+            break;
+        case 5:
+            if (!gPaletteFade.active)
+            {
+                sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID,
+                            gPlayerPartyCount - 1, CB2_TradeEvolutionSceneLoadGraphics,
+                            gMoveToLearn);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 6:
+            if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate)
+            {
+                var = sub_809FA30(); // moveID
+                if (var == 4)
+                    gTasks[taskID].tLearnMoveState = 9;
+                else
+                {
+                    u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
+                    if (IsHMMove2(move))
+                    {
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                        gTasks[taskID].tLearnMoveState = 11;
+                    }
+                    else
+                    {
+                        gBattleTextBuff2[0] = 0xFD;
+                        gBattleTextBuff2[1] = 2;
+                        gBattleTextBuff2[2] = move;
+                        gBattleTextBuff2[3] = (move & 0xFF00) >> 8;
+                        gBattleTextBuff2[4] = EOS;
+                        RemoveMonPPBonus(mon, var);
+                        SetMonMoveSlot(mon, gMoveToLearn, var);
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                        gTasks[taskID].tLearnMoveState++;
+                    }
+                }
+            }
+            break;
+        case 7:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 8:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tState = 15;
+            }
+            break;
+        case 9:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tData9 = 10;
+            gTasks[taskID].tData10 = 0;
+            gTasks[taskID].tLearnMoveState = 3;
+            break;
+        case 10:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tState = 13;
+            break;
+        case 11:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+                gTasks[taskID].tLearnMoveState = 5;
+            break;
+        }
+        break;
+    }
+}
+
+/*
+DizzyEgg, 27.08.2017
+NOTE:
+    Functions below are all unused.
+    What's more, they do NOT exist in Emerald.
+    That's why I think there is no reason to decompile those,
+    as they probably were prototypes for the evolution
+    functions.
+*/
+
+/*
+void unref_sub_8113B50(u8 *a, u8 *b)
+{
+    //u8 *sp0 = a;
+    //u8 *sp4 = b;
+#define sp0 a
+#define sp4 b
+    s32 sp8;
+    s32 spC = 0;
+    u32 sp10 = 0;
+    s32 sp14;
+    s32 r6;
+    u32 r8;
+
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        sEvoInfo.unk84[sp8] = 0;
+        sEvoInfo.unk4[sp8] = 0;
+        sEvoInfo.unk44[sp8] = 0;
+        for (r6 = 0; r6 < 32; r6++)
+        {
+            sEvoInfo.unk10C4[sp8][r6] = 0;
+            sEvoInfo.unk18C4[sp8][r6] = 0;
+            sEvoInfo.unk20C4[sp8][r6] = 0;
+            sEvoInfo.unk28C4[sp8][r6] = 0;
+            sEvoInfo.unkC4[sp8][r6] = 0;
+            sEvoInfo.unk8C4[sp8][r6] = 0;
+            sEvoInfo.unk30C4[sp8][r6] = 0;
+            sEvoInfo.unk38C4[sp8][r6] = 0;
+
+            sEvoInfo.unk60C4[sp8][r6] = 0;
+            sEvoInfo.unk70C4[sp8][r6] = 0;
+            sEvoInfo.unk80C4[sp8][r6] = 0;
+            sEvoInfo.unk90C4[sp8][r6] = 0;
+        }
+    }
+
+    sEvoInfo.unkA0C4 = 64;
+    r8 = 0;
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        //_08113C32
+        u32 r3 = 0;
+        u8 *r2 = sp0 + r8;
+
+        for (r6 = 0; r6 < 64; r6++)
+        {
+            sEvoInfo.unk40C4[sp8][r6 >> 1] = r2;
+            switch (r3)
+            {
+            case 0:
+                switch (r6 & 1)
+                {
+                case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk10C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk10C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                }
+                break;
+            case 1:
+                switch (r6 & r3)
+                {
+                 case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6 - 1;
+                        sEvoInfo.unk4[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6 - 1;
+                        sEvoInfo.unk4[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                }
+            }
+            //if (!((r6 + 1) & 7))
+            if ((r6 + 1) % 8 == 0)
+                r2 += 0x1D;
+            else if (r6 & 1)
+                r2 += 1;
+        }
+        if (r3)
+        {
+            sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+            sEvoInfo.unk4[sp8]++;
+        }
+        //_08113D26
+        if (!((sp8 + 1) & 7))
+            r8 += 0xE4;
+        else
+            r8 += 4;
+    }
+    //_08113D4A
+    r8 = 0;
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        //_08113D6A
+        u32 r3 = 0;
+        u8 *r2 = sp4 + r8;
+
+        for (r6 = 0; r6 < 64; r6++)
+        {
+            switch (r3)
+            {
+            case 0:
+                switch (r6 & 1)
+                {
+                case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk20C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk20C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                }
+                break;
+            case 1:
+                switch (r6 & r3)
+                {
+                 case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6 - 1;
+                        sEvoInfo.unk44[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6 - 1;
+                        sEvoInfo.unk44[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                }
+            }
+            //_08113DE4
+            if (!((r6 + 1) & 7))
+                r2 += 0x1D;
+            else if (r6 & 1)
+                r2 += 1;
+
+        }
+        if (r3)
+        {
+            sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+            sEvoInfo.unk44[sp8]++;
+        }
+        //if (!((sp8 + 1) & 7))
+        if ((sp8 + 1) % 8 == 0)
+            r8 += 0xE4;
+        else
+            r8 += 4;
+    }
+
+    for (sp8 = 0; sp8 < 0x40; sp8++)  //_08113E3A
+    {
+        if (sEvoInfo.unk4[sp8] < sEvoInfo.unk44[sp8])
+        {
+            for (spC = 0; spC < sEvoInfo.unk4[sp8]; spC++)
+            {
+                sp14 = 0x100;
+
+                for (r6 = 0; r6 < sEvoInfo.unk44[sp8]; r6++)
+                {
+                    s32 r3;
+
+                    //_08113EA4
+                    if (sEvoInfo.unk10C4[sp8][spC] > sEvoInfo.unk20C4[sp8][r6])
+                        r3 = sEvoInfo.unk10C4[sp8][spC] - sEvoInfo.unk20C4[sp8][r6];
+                    else
+                        r3 = sEvoInfo.unk20C4[sp8][r6] - sEvoInfo.unk10C4[sp8][spC];
+
+                    if (sEvoInfo.unk18C4[sp8][spC] > sEvoInfo.unk28C4[sp8][spC])
+                        r3 += sEvoInfo.unk18C4[sp8][spC] - sEvoInfo.unk28C4[sp8][spC];
+                    else
+                        r3 += sEvoInfo.unk28C4[sp8][spC] - sEvoInfo.unk18C4[sp8][spC];
+
+                    if (sp14 >= r3 && sEvoInfo.unkC4[sp8][r6] == 0 && sEvoInfo.unk8C4[sp8][r6] == 0)
+                    {
+                        sp10 = r6;
+                        sp14 = r3;
+                    }
+                }
+                //_08113F3E
+                sub_81141F0(spC, sp10, sp8);
+            }
+            //_08113F54
+
+            for (r6 = 0; r6 < sEvoInfo.unk44[sp8]; r6++)
+            {
+                if (sEvoInfo.unkC4[sp8][r6] == 0 && sEvoInfo.unk8C4[sp8][r6] == 0)
+                    sub_811430C(r6, sp8);
+            }
+        }
+        //_08113F9E
+        if (sEvoInfo.unk4[sp8] == sEvoInfo.unk44[sp8])
+        {
+            for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+                sub_81141F0(r6, r6, sp8);
+        }
+        //_08113FCC
+        if (sEvoInfo.unk4[sp8] > sEvoInfo.unk44[sp8])
+        {
+            for (sp10 = 0; sp10 < sEvoInfo.unk44[sp8]; sp10++)
+            {
+                sp14 = 0x100;
+
+                for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+                {
+                    s32 r3;
+
+                    if (sEvoInfo.unk10C4[sp8][r6] > sEvoInfo.unk20C4[sp8][sp10])
+                        r3 = sEvoInfo.unk10C4[sp8][r6] - sEvoInfo.unk20C4[sp8][sp10];
+                    else
+                        r3 = sEvoInfo.unk20C4[sp8][sp10] - sEvoInfo.unk10C4[sp8][r6];
+
+                    if (sEvoInfo.unk18C4[sp8][r6] > sEvoInfo.unk28C4[sp8][sp10])
+                        r3 += sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk28C4[sp8][sp10];
+                    else
+                        r3 += sEvoInfo.unk28C4[sp8][sp10] - sEvoInfo.unk18C4[sp8][r6];
+
+                    //r3 = abs(sEvoInfo.unk10C4[sp8][r6] - sEvoInfo.unk20C4[sp8][sp10]);
+                    //r3 += abs(sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk28C4[sp8][sp10]);
+
+                    if (sp14 > r3 && sEvoInfo.unkC4[sp8][r6] == 0)
+                    {
+                        spC = r6;
+                        sp14 = r3;
+                    }
+                }
+                //_081140C4
+                sEvoInfo.unk30C4[sp8][spC] = sEvoInfo.unk20C4[sp8][sp10];
+                sEvoInfo.unk38C4[sp8][spC] = sEvoInfo.unk28C4[sp8][sp10];
+                sEvoInfo.unkC4[sp8][spC] = 1;
+            }
+            //_08114104
+            for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+            {
+                sEvoInfo.unk20C4[sp8][r6] = sEvoInfo.unk30C4[sp8][r6];
+                sEvoInfo.unk28C4[sp8][r6] = sEvoInfo.unk38C4[sp8][r6];
+                if (sEvoInfo.unkC4[sp8][r6] != 0)
+                {
+                    sEvoInfo.unkC4[sp8][r6] = 0;
+                    sub_81141F0(r6, r6, sp8);
+                }
+                else
+                {
+                    // Ugh, can't get this part right
+                    //u8 *ptr1 = &sEvoInfo.unk10C4[sp8][r6];
+                    //u8 *ptr2 = &sEvoInfo.unk18C4[sp8][r6];
+                    //s32 r2 = *ptr1 + (*ptr2 - *ptr1) / 2;
+
+                    //u8 r0_ = sEvoInfo.unk10C4[sp8][r6];
+                    //u8 r2_ = sEvoInfo.unk18C4[sp8][r6];
+                    //s32 r2 = (r0_ - r2_) / 2;
+
+                    s32 r2 = (sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk10C4[sp8][r6]);
+                    s32 r2_ = sEvoInfo.unk10C4[sp8][r6];
+
+                    sEvoInfo.unk20C4[sp8][r6] = sEvoInfo.unk28C4[sp8][r6] = r2_ + r2 / 2;
+                    sEvoInfo.unk28C4[sp8][r6]++;
+                    sub_81141F0(r6, r6, sp8);
+                }
+            }
+        }
+        //_081141C4
+    }
+#undef sp0
+#undef sp4
+}
+*/
+__attribute__((naked))
+void unref_sub_8113B50()
+{
+    asm(".syntax unified\n\
+        push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x3C\n\
+    str r0, [sp]\n\
+    str r1, [sp, 0x4]\n\
+    movs r0, 0\n\
+    str r0, [sp, 0xC]\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x10]\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    ldr r3, _08113C60 @ =0x02014800\n\
+    mov r12, r3\n\
+    ldr r4, _08113C64 @ =0x000018c4\n\
+    add r4, r12\n\
+    mov r10, r4\n\
+    ldr r5, _08113C68 @ =0x000020c4\n\
+    add r5, r12\n\
+    mov r8, r5\n\
+_08113B7C:\n\
+    adds r0, r3, 0\n\
+    adds r0, 0x84\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    adds r0, r3, 0x4\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r4, _08113C6C @ =0x02014844\n\
+    adds r0, r1, r4\n\
+    strb r2, [r0]\n\
+    movs r6, 0\n\
+    lsls r1, 5\n\
+    mov r9, r1\n\
+    ldr r5, [sp, 0x8]\n\
+    lsls r4, r5, 6\n\
+_08113B9C:\n\
+    mov r0, r9\n\
+    adds r1, r6, r0\n\
+    ldr r5, _08113C70 @ =0x020158c4\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    mov r5, r10\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    mov r5, r8\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C74 @ =0x020170c4\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    adds r7, r3, 0\n\
+    adds r7, 0xC4\n\
+    adds r0, r1, r7\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C78 @ =0x000008c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C7C @ =0x000030c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C80 @ =0x000038c4\n\
+    adds r0, r3, r5\n\
+    adds r1, r0\n\
+    strb r2, [r1]\n\
+    lsls r1, r6, 1\n\
+    adds r1, r4\n\
+    ldr r5, _08113C84 @ =0x000060c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C88 @ =0x000070c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C8C @ =0x000080c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C90 @ =0x000090c4\n\
+    adds r0, r3, r5\n\
+    adds r1, r0\n\
+    strh r2, [r1]\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x1F\n\
+    ble _08113B9C\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x8]\n\
+    cmp r0, 0x3F\n\
+    ble _08113B7C\n\
+    ldr r1, _08113C94 @ =0x0000a0c4\n\
+    add r1, r12\n\
+    movs r0, 0x40\n\
+    strb r0, [r1]\n\
+    movs r1, 0\n\
+    mov r8, r1\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    movs r3, 0x80\n\
+    lsls r3, 5\n\
+    adds r3, r7\n\
+    mov r12, r3\n\
+    movs r4, 0xC0\n\
+    lsls r4, 5\n\
+    adds r4, r7\n\
+    mov r9, r4\n\
+    movs r5, 0\n\
+    adds r4, r7, 0\n\
+    subs r4, 0xC0\n\
+_08113C32:\n\
+    movs r3, 0\n\
+    ldr r2, [sp]\n\
+    add r2, r8\n\
+    movs r6, 0\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x30]\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r1, 7\n\
+    mov r10, r1\n\
+    movs r7, 0x1\n\
+    negs r7, r7\n\
+_08113C4A:\n\
+    asrs r0, r6, 1\n\
+    lsls r0, 2\n\
+    add r0, r10\n\
+    ldr r1, _08113C98 @ =0x020188c4\n\
+    adds r0, r1\n\
+    str r2, [r0]\n\
+    cmp r3, 0\n\
+    beq _08113C9C\n\
+    cmp r3, 0x1\n\
+    beq _08113CC6\n\
+    b _08113CF4\n\
+    .align 2, 0\n\
+_08113C60: .4byte 0x02014800\n\
+_08113C64: .4byte 0x000018c4\n\
+_08113C68: .4byte 0x000020c4\n\
+_08113C6C: .4byte 0x02014844\n\
+_08113C70: .4byte 0x020158c4\n\
+_08113C74: .4byte 0x020170c4\n\
+_08113C78: .4byte 0x000008c4\n\
+_08113C7C: .4byte 0x000030c4\n\
+_08113C80: .4byte 0x000038c4\n\
+_08113C84: .4byte 0x000060c4\n\
+_08113C88: .4byte 0x000070c4\n\
+_08113C8C: .4byte 0x000080c4\n\
+_08113C90: .4byte 0x000090c4\n\
+_08113C94: .4byte 0x0000a0c4\n\
+_08113C98: .4byte 0x020188c4\n\
+_08113C9C:\n\
+    movs r0, 0x1\n\
+    ands r0, r6\n\
+    cmp r0, 0\n\
+    beq _08113CAA\n\
+    cmp r0, 0x1\n\
+    beq _08113CB0\n\
+    b _08113CF4\n\
+_08113CAA:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113CB4\n\
+_08113CB0:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113CB4:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113CF4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r12\n\
+    strb r6, [r0]\n\
+    movs r3, 0x1\n\
+    b _08113CF4\n\
+_08113CC6:\n\
+    adds r0, r6, 0\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08113CD4\n\
+    cmp r0, 0x1\n\
+    beq _08113CDA\n\
+    b _08113CF4\n\
+_08113CD4:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113CDE\n\
+_08113CDA:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113CDE:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113CF4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r9\n\
+    strb r7, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    movs r3, 0\n\
+_08113CF4:\n\
+    adds r0, r6, 0x1\n\
+    movs r1, 0x7\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113D02\n\
+    adds r2, 0x1D\n\
+    b _08113D0C\n\
+_08113D02:\n\
+    movs r0, 0x1\n\
+    ands r0, r6\n\
+    cmp r0, 0\n\
+    beq _08113D0C\n\
+    adds r2, 0x1\n\
+_08113D0C:\n\
+    adds r7, 0x1\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x3F\n\
+    ble _08113C4A\n\
+    cmp r3, 0\n\
+    beq _08113D26\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r9\n\
+    strb r6, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+_08113D26:\n\
+    movs r0, 0x7\n\
+    ldr r2, [sp, 0x30]\n\
+    ands r2, r0\n\
+    cmp r2, 0\n\
+    bne _08113D36\n\
+    movs r3, 0xE4\n\
+    add r8, r3\n\
+    b _08113D3A\n\
+_08113D36:\n\
+    movs r0, 0x4\n\
+    add r8, r0\n\
+_08113D3A:\n\
+    adds r5, 0x20\n\
+    adds r4, 0x1\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x8]\n\
+    cmp r1, 0x3F\n\
+    bgt _08113D4A\n\
+    b _08113C32\n\
+_08113D4A:\n\
+    movs r2, 0\n\
+    mov r8, r2\n\
+    movs r3, 0\n\
+    str r3, [sp, 0x8]\n\
+    ldr r0, _08113D84 @ =0x02014844\n\
+    movs r4, 0x82\n\
+    lsls r4, 6\n\
+    adds r4, r0\n\
+    mov r10, r4\n\
+    movs r5, 0xA2\n\
+    lsls r5, 6\n\
+    adds r7, r0, r5\n\
+    movs r5, 0\n\
+    adds r4, r0, 0\n\
+    movs r0, 0x1\n\
+    mov r9, r0\n\
+_08113D6A:\n\
+    movs r3, 0\n\
+    ldr r2, [sp, 0x4]\n\
+    add r2, r8\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x30]\n\
+_08113D78:\n\
+    cmp r3, 0\n\
+    beq _08113D88\n\
+    cmp r3, 0x1\n\
+    beq _08113DB4\n\
+    b _08113DE4\n\
+    .align 2, 0\n\
+_08113D84: .4byte 0x02014844\n\
+_08113D88:\n\
+    adds r0, r6, 0\n\
+    mov r1, r9\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113D98\n\
+    cmp r0, 0x1\n\
+    beq _08113D9E\n\
+    b _08113DE4\n\
+_08113D98:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113DA2\n\
+_08113D9E:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113DA2:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113DE4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r10\n\
+    strb r6, [r0]\n\
+    movs r3, 0x1\n\
+    b _08113DE4\n\
+_08113DB4:\n\
+    adds r0, r6, 0\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08113DC2\n\
+    cmp r0, 0x1\n\
+    beq _08113DC8\n\
+    b _08113DE4\n\
+_08113DC2:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113DCC\n\
+_08113DC8:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113DCC:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113DE4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    adds r0, r7\n\
+    subs r1, r6, 0x1\n\
+    strb r1, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    movs r3, 0\n\
+_08113DE4:\n\
+    adds r1, r6, 0x1\n\
+    movs r0, 0x7\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113DF2\n\
+    adds r2, 0x1D\n\
+    b _08113DFC\n\
+_08113DF2:\n\
+    mov r0, r9\n\
+    ands r6, r0\n\
+    cmp r6, 0\n\
+    beq _08113DFC\n\
+    adds r2, 0x1\n\
+_08113DFC:\n\
+    adds r6, r1, 0\n\
+    cmp r6, 0x3F\n\
+    ble _08113D78\n\
+    cmp r3, 0\n\
+    beq _08113E14\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    adds r0, r7\n\
+    strb r6, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+_08113E14:\n\
+    movs r0, 0x7\n\
+    ldr r1, [sp, 0x30]\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    bne _08113E24\n\
+    movs r2, 0xE4\n\
+    add r8, r2\n\
+    b _08113E28\n\
+_08113E24:\n\
+    movs r3, 0x4\n\
+    add r8, r3\n\
+_08113E28:\n\
+    adds r5, 0x20\n\
+    adds r4, 0x1\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x8]\n\
+    cmp r0, 0x3F\n\
+    ble _08113D6A\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x8]\n\
+_08113E3A:\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08113EBC @ =0x02014804\n\
+    adds r2, r3, r4\n\
+    ldr r5, _08113EC0 @ =0x02014844\n\
+    adds r1, r3, r5\n\
+    ldrb r0, [r2]\n\
+    adds r3, 0x1\n\
+    str r3, [sp, 0x30]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bcc _08113E52\n\
+    b _08113F9E\n\
+_08113E52:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0xC]\n\
+    ldrb r2, [r2]\n\
+    cmp r0, r2\n\
+    bge _08113F54\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    adds r0, 0x4\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r0, r1, r0\n\
+    str r0, [sp, 0x18]\n\
+_08113E66:\n\
+    movs r2, 0x80\n\
+    lsls r2, 1\n\
+    str r2, [sp, 0x14]\n\
+    movs r6, 0\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08113EC0 @ =0x02014844\n\
+    adds r0, r3, r4\n\
+    ldr r5, [sp, 0xC]\n\
+    adds r5, 0x1\n\
+    str r5, [sp, 0x34]\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _08113F3E\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    mov r10, r0\n\
+    lsls r0, r3, 5\n\
+    ldr r2, [sp, 0xC]\n\
+    adds r1, r2, r0\n\
+    mov r9, r0\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    mov r3, r9\n\
+    adds r7, r3, r0\n\
+    mov r5, r9\n\
+    ldr r4, _08113EC4 @ =0x02014800\n\
+    ldr r2, _08113EC8 @ =0x000010c4\n\
+    adds r0, r4, r2\n\
+    adds r1, r0\n\
+    mov r8, r1\n\
+    ldrb r3, [r1]\n\
+    str r3, [sp, 0x1C]\n\
+_08113EA4:\n\
+    ldr r0, _08113ECC @ =0x000020c4\n\
+    add r0, r10\n\
+    adds r0, r5, r0\n\
+    ldr r4, [sp, 0x1C]\n\
+    ldrb r1, [r0]\n\
+    cmp r4, r1\n\
+    bls _08113ED0\n\
+    mov r2, r8\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r0]\n\
+    b _08113ED6\n\
+    .align 2, 0\n\
+_08113EBC: .4byte 0x02014804\n\
+_08113EC0: .4byte 0x02014844\n\
+_08113EC4: .4byte 0x02014800\n\
+_08113EC8: .4byte 0x000010c4\n\
+_08113ECC: .4byte 0x000020c4\n\
+_08113ED0:\n\
+    ldrb r1, [r0]\n\
+    mov r3, r8\n\
+    ldrb r0, [r3]\n\
+_08113ED6:\n\
+    subs r3, r1, r0\n\
+    ldr r1, [sp, 0xC]\n\
+    add r1, r9\n\
+    ldr r0, _08113EFC @ =0x000018c4\n\
+    add r0, r10\n\
+    adds r4, r1, r0\n\
+    ldr r0, _08113F00 @ =0x000028c4\n\
+    add r0, r10\n\
+    adds r2, r5, r0\n\
+    ldrb r0, [r4]\n\
+    ldr r1, _08113F04 @ =0x02014800\n\
+    mov r12, r1\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bls _08113F08\n\
+    adds r1, r0, 0\n\
+    ldrb r0, [r2]\n\
+    b _08113F0C\n\
+    .align 2, 0\n\
+_08113EFC: .4byte 0x000018c4\n\
+_08113F00: .4byte 0x000028c4\n\
+_08113F04: .4byte 0x02014800\n\
+_08113F08:\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r4]\n\
+_08113F0C:\n\
+    subs r1, r0\n\
+    adds r3, r1\n\
+    ldr r2, [sp, 0x14]\n\
+    cmp r2, r3\n\
+    ble _08113F2C\n\
+    ldrb r0, [r7]\n\
+    cmp r0, 0\n\
+    bne _08113F2C\n\
+    ldr r0, _08114050 @ =0x000008c4\n\
+    add r0, r12\n\
+    adds r0, r5, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F2C\n\
+    str r6, [sp, 0x10]\n\
+    str r3, [sp, 0x14]\n\
+_08113F2C:\n\
+    adds r7, 0x1\n\
+    adds r5, 0x1\n\
+    adds r6, 0x1\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08114054 @ =0x02014844\n\
+    adds r0, r3, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    blt _08113EA4\n\
+_08113F3E:\n\
+    ldr r0, [sp, 0xC]\n\
+    ldr r1, [sp, 0x10]\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    ldr r5, [sp, 0x34]\n\
+    str r5, [sp, 0xC]\n\
+    ldr r0, [sp, 0x18]\n\
+    ldrb r0, [r0]\n\
+    cmp r5, r0\n\
+    blt _08113E66\n\
+_08113F54:\n\
+    movs r6, 0\n\
+    ldr r2, _08114058 @ =0x02014800\n\
+    ldr r1, [sp, 0x8]\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r0, r1, r3\n\
+    adds r4, r2, 0\n\
+    mov r12, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _08113F9E\n\
+    mov r0, r12\n\
+    adds r0, 0x44\n\
+    adds r4, r1, r0\n\
+_08113F6E:\n\
+    ldr r5, [sp, 0x8]\n\
+    lsls r0, r5, 5\n\
+    adds r1, r6, r0\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F94\n\
+    ldr r3, _08114050 @ =0x000008c4\n\
+    adds r0, r2, r3\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F94\n\
+    adds r0, r6, 0\n\
+    adds r1, r5, 0\n\
+    bl sub_811430C\n\
+_08113F94:\n\
+    adds r6, 0x1\n\
+    ldr r2, _08114058 @ =0x02014800\n\
+    ldrb r5, [r4]\n\
+    cmp r6, r5\n\
+    blt _08113F6E\n\
+_08113F9E:\n\
+    ldr r0, [sp, 0x8]\n\
+    ldr r1, _0811405C @ =0x02014804\n\
+    adds r2, r0, r1\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r1, r0, r3\n\
+    ldrb r0, [r2]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bne _08113FCC\n\
+    movs r6, 0\n\
+    ldrb r4, [r2]\n\
+    cmp r6, r4\n\
+    bge _08113FCC\n\
+    adds r4, r2, 0\n\
+_08113FBA:\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    adds r6, 0x1\n\
+    ldrb r5, [r4]\n\
+    cmp r6, r5\n\
+    blt _08113FBA\n\
+_08113FCC:\n\
+    ldr r0, [sp, 0x8]\n\
+    ldr r1, _0811405C @ =0x02014804\n\
+    adds r2, r0, r1\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r1, r0, r3\n\
+    ldrb r0, [r2]\n\
+    ldr r4, _08114058 @ =0x02014800\n\
+    ldrb r5, [r1]\n\
+    cmp r0, r5\n\
+    bhi _08113FE2\n\
+    b _081141C4\n\
+_08113FE2:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x10]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    blt _08113FEE\n\
+    b _08114104\n\
+_08113FEE:\n\
+    str r2, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r1, 5\n\
+    mov r9, r1\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x44\n\
+    ldr r2, [sp, 0x8]\n\
+    adds r0, r2, r0\n\
+    str r0, [sp, 0x20]\n\
+    mov r3, r9\n\
+    str r3, [sp, 0x24]\n\
+_08114004:\n\
+    movs r4, 0x80\n\
+    lsls r4, 1\n\
+    str r4, [sp, 0x14]\n\
+    movs r6, 0\n\
+    ldr r5, [sp, 0x10]\n\
+    adds r5, 0x1\n\
+    str r5, [sp, 0x38]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _081140C4\n\
+    ldr r1, [sp, 0x10]\n\
+    ldr r2, [sp, 0x24]\n\
+    adds r1, r2\n\
+    mov r10, r1\n\
+    ldr r0, _08114058 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    adds r2, r0\n\
+    mov r8, r2\n\
+    ldr r7, [sp, 0x24]\n\
+    ldr r3, _08114058 @ =0x02014800\n\
+    ldr r4, _08114060 @ =0x000010c4\n\
+    adds r0, r3, r4\n\
+    adds r5, r7, r0\n\
+    ldr r0, _08114064 @ =0x020168c4\n\
+    add r0, r10\n\
+    mov r12, r0\n\
+    ldrb r1, [r0]\n\
+    str r1, [sp, 0x28]\n\
+_0811403E:\n\
+    ldrb r0, [r5]\n\
+    ldr r2, [sp, 0x28]\n\
+    cmp r0, r2\n\
+    bls _08114068\n\
+    adds r1, r0, 0\n\
+    mov r3, r12\n\
+    ldrb r0, [r3]\n\
+    b _0811406E\n\
+    .align 2, 0\n\
+_08114050: .4byte 0x000008c4\n\
+_08114054: .4byte 0x02014844\n\
+_08114058: .4byte 0x02014800\n\
+_0811405C: .4byte 0x02014804\n\
+_08114060: .4byte 0x000010c4\n\
+_08114064: .4byte 0x020168c4\n\
+_08114068:\n\
+    mov r4, r12\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r5]\n\
+_0811406E:\n\
+    subs r3, r1, r0\n\
+    ldr r1, _0811408C @ =0x02014800\n\
+    ldr r2, _08114090 @ =0x000018c4\n\
+    adds r0, r1, r2\n\
+    adds r4, r7, r0\n\
+    ldr r2, _08114094 @ =0x020170c4\n\
+    add r2, r10\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bls _08114098\n\
+    adds r1, r0, 0\n\
+    ldrb r0, [r2]\n\
+    b _0811409C\n\
+    .align 2, 0\n\
+_0811408C: .4byte 0x02014800\n\
+_08114090: .4byte 0x000018c4\n\
+_08114094: .4byte 0x020170c4\n\
+_08114098:\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r4]\n\
+_0811409C:\n\
+    subs r1, r0\n\
+    adds r3, r1\n\
+    ldr r2, [sp, 0x14]\n\
+    cmp r2, r3\n\
+    ble _081140B2\n\
+    mov r4, r8\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0\n\
+    bne _081140B2\n\
+    str r6, [sp, 0xC]\n\
+    str r3, [sp, 0x14]\n\
+_081140B2:\n\
+    movs r0, 0x1\n\
+    add r8, r0\n\
+    adds r7, 0x1\n\
+    adds r5, 0x1\n\
+    adds r6, 0x1\n\
+    ldr r1, [sp, 0x2C]\n\
+    ldrb r1, [r1]\n\
+    cmp r6, r1\n\
+    blt _0811403E\n\
+_081140C4:\n\
+    ldr r3, [sp, 0xC]\n\
+    add r3, r9\n\
+    ldr r2, _08114164 @ =0x02014800\n\
+    ldr r4, _08114168 @ =0x000030c4\n\
+    adds r1, r2, r4\n\
+    adds r1, r3, r1\n\
+    ldr r2, [sp, 0x10]\n\
+    add r2, r9\n\
+    ldr r5, _0811416C @ =0x020168c4\n\
+    adds r0, r2, r5\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08114164 @ =0x02014800\n\
+    ldr r4, _08114170 @ =0x000038c4\n\
+    adds r1, r0, r4\n\
+    adds r1, r3, r1\n\
+    ldr r5, _08114174 @ =0x020170c4\n\
+    adds r2, r5\n\
+    ldrb r0, [r2]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08114164 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    adds r3, r0\n\
+    movs r0, 0x1\n\
+    strb r0, [r3]\n\
+    ldr r0, [sp, 0x38]\n\
+    str r0, [sp, 0x10]\n\
+    ldr r1, [sp, 0x20]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bge _08114104\n\
+    b _08114004\n\
+_08114104:\n\
+    movs r6, 0\n\
+    ldr r4, _08114164 @ =0x02014800\n\
+    ldr r2, [sp, 0x8]\n\
+    ldr r3, _08114178 @ =0x02014804\n\
+    adds r0, r2, r3\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _081141C4\n\
+    adds r7, r4, 0\n\
+    mov r9, r6\n\
+    movs r5, 0xC4\n\
+    adds r5, r7\n\
+    mov r8, r5\n\
+_0811411E:\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r0, r1, 5\n\
+    adds r2, r6, r0\n\
+    ldr r3, _0811417C @ =0x000020c4\n\
+    adds r0, r7, r3\n\
+    adds r0, r2\n\
+    mov r10, r0\n\
+    ldr r5, _08114168 @ =0x000030c4\n\
+    adds r0, r7, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    mov r1, r10\n\
+    strb r0, [r1]\n\
+    ldr r3, _08114180 @ =0x000028c4\n\
+    adds r0, r7, r3\n\
+    adds r3, r2, r0\n\
+    ldr r5, _08114170 @ =0x000038c4\n\
+    adds r0, r7, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r3]\n\
+    mov r0, r8\n\
+    adds r1, r2, r0\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0\n\
+    beq _08114184\n\
+    mov r2, r9\n\
+    strb r2, [r1]\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    b _081141B4\n\
+    .align 2, 0\n\
+_08114164: .4byte 0x02014800\n\
+_08114168: .4byte 0x000030c4\n\
+_0811416C: .4byte 0x020168c4\n\
+_08114170: .4byte 0x000038c4\n\
+_08114174: .4byte 0x020170c4\n\
+_08114178: .4byte 0x02014804\n\
+_0811417C: .4byte 0x000020c4\n\
+_08114180: .4byte 0x000028c4\n\
+_08114184:\n\
+    ldr r5, _081141E0 @ =0x000010c4\n\
+    adds r1, r4, r5\n\
+    adds r1, r2, r1\n\
+    ldr r5, _081141E4 @ =0x000018c4\n\
+    adds r0, r4, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    ldrb r2, [r1]\n\
+    subs r0, r2\n\
+    lsrs r1, r0, 31\n\
+    adds r0, r1\n\
+    asrs r0, 1\n\
+    adds r2, r0\n\
+    strb r2, [r3]\n\
+    mov r0, r10\n\
+    strb r2, [r0]\n\
+    ldrb r0, [r3]\n\
+    subs r0, 0x1\n\
+    strb r0, [r3]\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+_081141B4:\n\
+    adds r6, 0x1\n\
+    ldr r4, _081141E8 @ =0x02014800\n\
+    ldr r1, [sp, 0x8]\n\
+    ldr r2, _081141EC @ =0x02014804\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    blt _0811411E\n\
+_081141C4:\n\
+    ldr r3, [sp, 0x30]\n\
+    str r3, [sp, 0x8]\n\
+    cmp r3, 0x3F\n\
+    bgt _081141CE\n\
+    b _08113E3A\n\
+_081141CE:\n\
+    add sp, 0x3C\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_081141E0: .4byte 0x000010c4\n\
+_081141E4: .4byte 0x000018c4\n\
+_081141E8: .4byte 0x02014800\n\
+_081141EC: .4byte 0x02014804\n\
+        .syntax divided");
+}
+
+void sub_81141F0(s32 a, s32 b, s32 c)
+{
+    u32 r7;
+
+    sEvoInfo.unk30C4[c][b] = sEvoInfo.unk10C4[c][a];
+    sEvoInfo.unk38C4[c][b] = sEvoInfo.unk18C4[c][a];
+
+    r7 = 0;
+    if (sEvoInfo.unk10C4[c][a] < sEvoInfo.unk20C4[c][b])
+    {
+        sEvoInfo.unkC4[c][b] = 4;
+        r7 = sEvoInfo.unk20C4[c][b] - sEvoInfo.unk10C4[c][a];
+    }
+    else if (sEvoInfo.unk10C4[c][a] > sEvoInfo.unk20C4[c][b])
+    {
+        sEvoInfo.unkC4[c][b] = 1;
+        r7 = sEvoInfo.unk10C4[c][a] - sEvoInfo.unk20C4[c][b];
+    }
+    sEvoInfo.unk80C4[c][b] = r7 * 16;
+
+    r7 = 0;
+    if (sEvoInfo.unk18C4[c][a] < sEvoInfo.unk28C4[c][b])
+    {
+        sEvoInfo.unk8C4[c][b] = 3;
+        r7 = sEvoInfo.unk28C4[c][b] - sEvoInfo.unk18C4[c][a];
+    }
+    else if (sEvoInfo.unk18C4[c][a] > sEvoInfo.unk28C4[c][b])
+    {
+        sEvoInfo.unk8C4[c][b] = 2;
+        r7 = sEvoInfo.unk18C4[c][a] - sEvoInfo.unk28C4[c][b];
+    }
+    sEvoInfo.unk90C4[c][b] = r7 * 16;
+
+    sEvoInfo.unk84[c]++;
+}
+
+void sub_811430C(u32 a, u32 b)
+{
+    u8 r2 = sEvoInfo.unk28C4[b][a];
+    u8 r3 = sEvoInfo.unk20C4[b][a];
+    s32 r7 = r2 - r3;
+
+    sEvoInfo.unk30C4[b][a] = sEvoInfo.unk38C4[b][a] = r3 + r7 / 2;
+    sEvoInfo.unkC4[b][a] = 5;
+    sEvoInfo.unk8C4[b][a] = 7;
+    sEvoInfo.unk84[b]++;
+    r7 = sEvoInfo.unk30C4[b][a] - sEvoInfo.unk20C4[b][a];
+    sEvoInfo.unk80C4[b][a] = r7 * 16;
+    r7 = sEvoInfo.unk28C4[b][a] - sEvoInfo.unk38C4[b][a];
+    sEvoInfo.unk90C4[b][a] = r7 * 16;
+}
+
+__attribute__((naked))
+void unref_sub_81143CC()
+{
+    asm(".syntax unified\n\
+            push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x14\n\
+    movs r0, 0x1\n\
+    str r0, [sp, 0x4]\n\
+    ldr r0, _08114408 @ =0x02014800\n\
+    ldr r2, _0811440C @ =0x0000a0c4\n\
+    adds r1, r0, r2\n\
+    ldrb r3, [r1]\n\
+    adds r4, r0, 0\n\
+    cmp r3, 0\n\
+    beq _081143EE\n\
+    subs r0, r3, 0x1\n\
+    strb r0, [r1]\n\
+_081143EE:\n\
+    movs r5, 0\n\
+    str r5, [sp]\n\
+_081143F2:\n\
+    movs r3, 0\n\
+    adds r2, r4, 0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x84\n\
+    ldr r1, [sp]\n\
+    adds r0, r1, r0\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x8]\n\
+    bl _08114D84\n\
+    .align 2, 0\n\
+_08114408: .4byte 0x02014800\n\
+_0811440C: .4byte 0x0000a0c4\n\
+_08114410:\n\
+    ldr r5, [sp]\n\
+    lsls r0, r5, 5\n\
+    adds r1, r3, r0\n\
+    adds r2, 0xC4\n\
+    adds r1, r2\n\
+    ldrb r2, [r1]\n\
+    mov r8, r0\n\
+    adds r0, r3, 0x1\n\
+    mov r10, r0\n\
+    cmp r2, 0xC\n\
+    bls _08114428\n\
+    b _081148D2\n\
+_08114428:\n\
+    lsls r0, r2, 2\n\
+    ldr r1, _08114434 @ =_08114438\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_08114434: .4byte _08114438\n\
+    .align 2, 0\n\
+_08114438:\n\
+    .4byte _081148D2\n\
+    .4byte _0811446C\n\
+    .4byte _081144F0\n\
+    .4byte _0811457C\n\
+    .4byte _08114600\n\
+    .4byte _0811468C\n\
+    .4byte _081146C8\n\
+    .4byte _08114704\n\
+    .4byte _08114740\n\
+    .4byte _0811477C\n\
+    .4byte _081147D0\n\
+    .4byte _08114810\n\
+    .4byte _08114858\n\
+_0811446C:\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r2, [sp]\n\
+    lsls r1, r2, 6\n\
+    adds r0, r1\n\
+    ldr r5, _081144E0 @ =0x000060c4\n\
+    adds r2, r4, r5\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081144E4 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _081144A6\n\
+    b _081148D2\n\
+_081144A6:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _081144E8 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _081144EC @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_081144B8:\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _081144D8\n\
+    b _081148A0\n\
+_081144D8:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _081144B8\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081144E0: .4byte 0x000060c4\n\
+_081144E4: .4byte 0x000080c4\n\
+_081144E8: .4byte 0x000030c4\n\
+_081144EC: .4byte 0x000020c4\n\
+_081144F0:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114568 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _0811456C @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114570 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _0811452C\n\
+    b _081148D2\n\
+_0811452C:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _08114574 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114578 @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811453E:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114548\n\
+    b _081148B8\n\
+_08114548:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r6, r5\n\
+    blt _0811453E\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114568: .4byte 0x02014800\n\
+_0811456C: .4byte 0x000060c4\n\
+_08114570: .4byte 0x000080c4\n\
+_08114574: .4byte 0x000030c4\n\
+_08114578: .4byte 0x000020c4\n\
+_0811457C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _081145F0 @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081145F4 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _081145B6\n\
+    b _081148D2\n\
+_081145B6:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _081145F8 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _081145FC @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_081145C8:\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _081145E8\n\
+    b _081148AC\n\
+_081145E8:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _081145C8\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081145F0: .4byte 0x000060c4\n\
+_081145F4: .4byte 0x000080c4\n\
+_081145F8: .4byte 0x000030c4\n\
+_081145FC: .4byte 0x000020c4\n\
+_08114600:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114678 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _0811467C @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114680 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _0811463C\n\
+    b _081148D2\n\
+_0811463C:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _08114684 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114688 @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811464E:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114658\n\
+    b _081148B8\n\
+_08114658:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r6, r5\n\
+    blt _0811464E\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114678: .4byte 0x02014800\n\
+_0811467C: .4byte 0x000060c4\n\
+_08114680: .4byte 0x000080c4\n\
+_08114684: .4byte 0x000030c4\n\
+_08114688: .4byte 0x000020c4\n\
+_0811468C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r5, _081146C0 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _081146C4 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _081146B4\n\
+    b _081148D2\n\
+_081146B4:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0x9\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081146C0: .4byte 0x02014800\n\
+_081146C4: .4byte 0x000030c4\n\
+_081146C8:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _081146FC @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114700 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _081146F0\n\
+    b _081148D2\n\
+_081146F0:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xA\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081146FC: .4byte 0x02014800\n\
+_08114700: .4byte 0x000030c4\n\
+_08114704:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114738 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _0811473C @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _0811472C\n\
+    b _081148D2\n\
+_0811472C:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114738: .4byte 0x02014800\n\
+_0811473C: .4byte 0x000030c4\n\
+_08114740:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114774 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114778 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _08114768\n\
+    b _081148D2\n\
+_08114768:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xC\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114774: .4byte 0x02014800\n\
+_08114778: .4byte 0x000030c4\n\
+_0811477C:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r6, _081147B4 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r5, r3, r0\n\
+    ldr r1, _081147B8 @ =0x000030c4\n\
+    adds r4, r6, r1\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldr r2, _081147BC @ =0x000020c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _081147C0\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    mov r4, sp\n\
+    ldrb r4, [r4, 0x4]\n\
+    strb r4, [r0]\n\
+    b _08114844\n\
+    .align 2, 0\n\
+_081147B4: .4byte 0x02014800\n\
+_081147B8: .4byte 0x000030c4\n\
+_081147BC: .4byte 0x000020c4\n\
+_081147C0:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x1\n\
+    strb r1, [r0]\n\
+    adds r0, r3, 0x1\n\
+    mov r10, r0\n\
+    b _081148D2\n\
+_081147D0:\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    ldr r6, _08114804 @ =0x02014800\n\
+    mov r2, r8\n\
+    adds r5, r3, r2\n\
+    ldr r0, _08114808 @ =0x000030c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _0811480C @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114882\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x2\n\
+    b _08114842\n\
+    .align 2, 0\n\
+_08114804: .4byte 0x02014800\n\
+_08114808: .4byte 0x000030c4\n\
+_0811480C: .4byte 0x000020c4\n\
+_08114810:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    ldr r6, _0811484C @ =0x02014800\n\
+    mov r1, r8\n\
+    adds r5, r3, r1\n\
+    ldr r2, _08114850 @ =0x000030c4\n\
+    adds r4, r6, r2\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldr r1, _08114854 @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114882\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x3\n\
+_08114842:\n\
+    strb r1, [r0]\n\
+_08114844:\n\
+    adds r5, r3, 0x1\n\
+    mov r10, r5\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_0811484C: .4byte 0x02014800\n\
+_08114850: .4byte 0x000030c4\n\
+_08114854: .4byte 0x000020c4\n\
+_08114858:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    ldr r6, _08114894 @ =0x02014800\n\
+    mov r1, r8\n\
+    adds r5, r3, r1\n\
+    ldr r2, _08114898 @ =0x000030c4\n\
+    adds r4, r6, r2\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _0811489C @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _081148C4\n\
+_08114882:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    mov r2, sp\n\
+    ldrb r2, [r2, 0x4]\n\
+    strb r2, [r0]\n\
+    adds r4, r3, 0x1\n\
+    mov r10, r4\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114894: .4byte 0x02014800\n\
+_08114898: .4byte 0x000030c4\n\
+_0811489C: .4byte 0x000020c4\n\
+_081148A0:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r5, 0\n\
+    strb r5, [r0]\n\
+    b _081148D2\n\
+_081148AC:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+_081148B8:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+_081148C4:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x4\n\
+    strb r1, [r0]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+_081148D2:\n\
+    ldr r0, _081148F4 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r1, r3, r4\n\
+    ldr r5, _081148F8 @ =0x000008c4\n\
+    adds r2, r0, r5\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    adds r4, r0, 0\n\
+    cmp r1, 0xC\n\
+    bls _081148E8\n\
+    b _08114D76\n\
+_081148E8:\n\
+    lsls r0, r1, 2\n\
+    ldr r1, _081148FC @ =_08114900\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_081148F4: .4byte 0x02014800\n\
+_081148F8: .4byte 0x000008c4\n\
+_081148FC: .4byte _08114900\n\
+    .align 2, 0\n\
+_08114900:\n\
+    .4byte _08114D76\n\
+    .4byte _08114934\n\
+    .4byte _081149B8\n\
+    .4byte _08114A3C\n\
+    .4byte _08114AC0\n\
+    .4byte _08114B44\n\
+    .4byte _08114B7C\n\
+    .4byte _08114BB4\n\
+    .4byte _08114BEC\n\
+    .4byte _08114C24\n\
+    .4byte _08114C78\n\
+    .4byte _08114CB8\n\
+    .4byte _08114CF8\n\
+_08114934:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r2, [sp]\n\
+    lsls r1, r2, 6\n\
+    adds r0, r1\n\
+    ldr r5, _081149A8 @ =0x000070c4\n\
+    adds r2, r4, r5\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081149AC @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _0811496A\n\
+    b _08114D76\n\
+_0811496A:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _081149B0 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    movs r3, 0\n\
+    ldr r0, _081149B4 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811497E:\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _0811499E\n\
+    b _08114D4C\n\
+_0811499E:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _0811497E\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_081149A8: .4byte 0x000070c4\n\
+_081149AC: .4byte 0x000090c4\n\
+_081149B0: .4byte 0x000038c4\n\
+_081149B4: .4byte 0x000028c4\n\
+_081149B8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114A28 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114A2C @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114A30 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _081149F0\n\
+    b _08114D76\n\
+_081149F0:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114A34 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114A38 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114A02:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114A0C\n\
+    b _08114D3C\n\
+_08114A0C:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    cmp r6, r5\n\
+    blt _08114A02\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114A28: .4byte 0x02014800\n\
+_08114A2C: .4byte 0x000070c4\n\
+_08114A30: .4byte 0x000090c4\n\
+_08114A34: .4byte 0x000038c4\n\
+_08114A38: .4byte 0x000028c4\n\
+_08114A3C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114AB0 @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114AB4 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _08114A72\n\
+    b _08114D76\n\
+_08114A72:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114AB8 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    movs r3, 0\n\
+    ldr r0, _08114ABC @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114A86:\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114AA6\n\
+    b _08114D4C\n\
+_08114AA6:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _08114A86\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114AB0: .4byte 0x000070c4\n\
+_08114AB4: .4byte 0x000090c4\n\
+_08114AB8: .4byte 0x000038c4\n\
+_08114ABC: .4byte 0x000028c4\n\
+_08114AC0:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114B30 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114B34 @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114B38 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _08114AF8\n\
+    b _08114D76\n\
+_08114AF8:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114B3C @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114B40 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114B0A:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114B14\n\
+    b _08114D5C\n\
+_08114B14:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    cmp r6, r5\n\
+    blt _08114B0A\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114B30: .4byte 0x02014800\n\
+_08114B34: .4byte 0x000070c4\n\
+_08114B38: .4byte 0x000090c4\n\
+_08114B3C: .4byte 0x000038c4\n\
+_08114B40: .4byte 0x000028c4\n\
+_08114B44:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r5, _08114B70 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114B74 @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114B64\n\
+    b _08114D76\n\
+_08114B64:\n\
+    ldr r2, _08114B78 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0x9\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114B70: .4byte 0x02014800\n\
+_08114B74: .4byte 0x000038c4\n\
+_08114B78: .4byte 0x000008c4\n\
+_08114B7C:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114BA8 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114BAC @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114B9C\n\
+    b _08114D76\n\
+_08114B9C:\n\
+    ldr r2, _08114BB0 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xA\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114BA8: .4byte 0x02014800\n\
+_08114BAC: .4byte 0x000038c4\n\
+_08114BB0: .4byte 0x000008c4\n\
+_08114BB4:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114BE0 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114BE4 @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114BD4\n\
+    b _08114D76\n\
+_08114BD4:\n\
+    ldr r2, _08114BE8 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114BE0: .4byte 0x02014800\n\
+_08114BE4: .4byte 0x000038c4\n\
+_08114BE8: .4byte 0x000008c4\n\
+_08114BEC:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114C18 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114C1C @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114C0C\n\
+    b _08114D76\n\
+_08114C0C:\n\
+    ldr r2, _08114C20 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xC\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114C18: .4byte 0x02014800\n\
+_08114C1C: .4byte 0x000038c4\n\
+_08114C20: .4byte 0x000008c4\n\
+_08114C24:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r6, _08114C58 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r5, r3, r0\n\
+    ldr r1, _08114C5C @ =0x000038c4\n\
+    adds r4, r6, r1\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DB4\n\
+    ldr r2, _08114C60 @ =0x000028c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _08114C68\n\
+    ldr r4, _08114C64 @ =0x000008c4\n\
+    adds r0, r6, r4\n\
+    adds r0, r5, r0\n\
+    mov r5, sp\n\
+    ldrb r5, [r5, 0x4]\n\
+    strb r5, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114C58: .4byte 0x02014800\n\
+_08114C5C: .4byte 0x000038c4\n\
+_08114C60: .4byte 0x000028c4\n\
+_08114C64: .4byte 0x000008c4\n\
+_08114C68:\n\
+    ldr r1, _08114C74 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x1\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114C74: .4byte 0x000008c4\n\
+_08114C78:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114CA8 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114CAC @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _08114CB0 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114D1E\n\
+    ldr r1, _08114CB4 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x2\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114CA8: .4byte 0x02014800\n\
+_08114CAC: .4byte 0x000038c4\n\
+_08114CB0: .4byte 0x000028c4\n\
+_08114CB4: .4byte 0x000008c4\n\
+_08114CB8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114CE8 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114CEC @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DB4\n\
+    ldr r1, _08114CF0 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114D1E\n\
+    ldr r1, _08114CF4 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x3\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114CE8: .4byte 0x02014800\n\
+_08114CEC: .4byte 0x000038c4\n\
+_08114CF0: .4byte 0x000028c4\n\
+_08114CF4: .4byte 0x000008c4\n\
+_08114CF8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114D2C @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114D30 @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _08114D34 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _08114D6C\n\
+_08114D1E:\n\
+    ldr r2, _08114D38 @ =0x000008c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    mov r4, sp\n\
+    ldrb r4, [r4, 0x4]\n\
+    strb r4, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114D2C: .4byte 0x02014800\n\
+_08114D30: .4byte 0x000038c4\n\
+_08114D34: .4byte 0x000028c4\n\
+_08114D38: .4byte 0x000008c4\n\
+_08114D3C:\n\
+    ldr r0, _08114D48 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114D48: .4byte 0x000008c4\n\
+_08114D4C:\n\
+    ldr r0, _08114D58 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    strb r3, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114D58: .4byte 0x000008c4\n\
+_08114D5C:\n\
+    ldr r0, _08114D68 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114D68: .4byte 0x000008c4\n\
+_08114D6C:\n\
+    ldr r1, _08114DAC @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x4\n\
+_08114D74:\n\
+    strb r1, [r0]\n\
+_08114D76:\n\
+    mov r3, r10\n\
+    ldr r2, _08114DB0 @ =0x02014800\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x84\n\
+    ldr r4, [sp]\n\
+    adds r0, r4, r0\n\
+    adds r4, r2, 0\n\
+_08114D84:\n\
+    ldrb r0, [r0]\n\
+    cmp r3, r0\n\
+    bge _08114D8E\n\
+    bl _08114410\n\
+_08114D8E:\n\
+    ldr r5, [sp, 0x8]\n\
+    str r5, [sp]\n\
+    cmp r5, 0x3F\n\
+    bgt _08114D9A\n\
+    bl _081143F2\n\
+_08114D9A:\n\
+    ldr r0, [sp, 0x4]\n\
+    add sp, 0x14\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
+_08114DAC: .4byte 0x000008c4\n\
+_08114DB0: .4byte 0x02014800\n\
+        .syntax divided");
+}
+
+void sub_8114DB4(u32 a, u8 b)
+{
+    u8 *r2 = sEvoInfo.unk40C4[a][b / 2];
+
+    if (b % 2 != 0)
+        *r2 |= 0xF0;
+    else
+        *r2 |= 0x0F;
+}
+
+void sub_8114DF0(u32 a, u8 b)
+{
+    u8 *r2 = sEvoInfo.unk40C4[a][b / 2];
+    u8 *r1 = r2 + 0x6000;
+
+    if (b % 2 != 0)
+    {
+        if (!(*r1 & 0xF0))
+            *r2 &= 0x0F;
+    }
+    else
+    {
+        if (!(*r1 & 0x0F))
+            *r2 &= 0xF0;
+    }
+}
+
+__attribute__((naked))
+void sub_8114E48()
+{
+    asm(".syntax unified\n\
+        push {r4-r7,lr}\n\
+    adds r4, r0, 0\n\
+    lsls r1, 24\n\
+    lsrs r6, r1, 24\n\
+    ldr r1, _08114E6C @ =0x02014800\n\
+    ldr r2, _08114E70 @ =0x0000a0c4\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    adds r5, r1, 0\n\
+    cmp r0, 0\n\
+    bne _08114E60\n\
+    b _08114F5E\n\
+_08114E60:\n\
+    movs r1, 0\n\
+    movs r3, 0\n\
+    cmp r4, 0\n\
+    bne _08114E74\n\
+    movs r1, 0x1\n\
+    b _08114EA6\n\
+    .align 2, 0\n\
+_08114E6C: .4byte 0x02014800\n\
+_08114E70: .4byte 0x0000a0c4\n\
+_08114E74:\n\
+    subs r0, r4, 0x1\n\
+    lsls r0, 5\n\
+    adds r2, r3, r0\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EA6\n\
+    ldr r7, _08114EC4 @ =0x000008c4\n\
+    adds r0, r5, r7\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EA6\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x1F\n\
+    bgt _08114EA6\n\
+    cmp r4, 0\n\
+    bne _08114E74\n\
+    lsls r0, r1, 24\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    adds r0, r1\n\
+    lsrs r1, r0, 24\n\
+_08114EA6:\n\
+    cmp r3, 0x20\n\
+    bne _08114EB4\n\
+    lsls r0, r1, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r2\n\
+    lsrs r1, r0, 24\n\
+_08114EB4:\n\
+    movs r3, 0\n\
+    cmp r4, 0x3F\n\
+    bne _08114EC8\n\
+    lsls r0, r1, 24\n\
+    movs r7, 0x80\n\
+    lsls r7, 17\n\
+    adds r0, r7\n\
+    b _08114EF8\n\
+    .align 2, 0\n\
+_08114EC4: .4byte 0x000008c4\n\
+_08114EC8:\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 5\n\
+    adds r2, r3, r0\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EFA\n\
+    ldr r7, _08114F64 @ =0x000008c4\n\
+    adds r0, r5, r7\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EFA\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x1F\n\
+    bgt _08114EFA\n\
+    cmp r4, 0x3F\n\
+    bne _08114EC8\n\
+    lsls r0, r1, 24\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    adds r0, r1\n\
+_08114EF8:\n\
+    lsrs r1, r0, 24\n\
+_08114EFA:\n\
+    cmp r3, 0x20\n\
+    bne _08114F08\n\
+    lsls r0, r1, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r2\n\
+    lsrs r1, r0, 24\n\
+_08114F08:\n\
+    cmp r1, 0x2\n\
+    beq _08114F5E\n\
+    subs r0, r6, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r0, 0\n\
+    bge _08114F18\n\
+    movs r1, 0\n\
+_08114F18:\n\
+    adds r0, r6, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3F\n\
+    ble _08114F26\n\
+    movs r2, 0x3F\n\
+_08114F26:\n\
+    lsls r1, 24\n\
+    asrs r3, r1, 24\n\
+    lsls r0, r2, 24\n\
+    asrs r2, r0, 24\n\
+    adds r6, r1, 0\n\
+    adds r7, r0, 0\n\
+    cmp r3, r2\n\
+    bge _08114F7C\n\
+    cmp r4, 0\n\
+    beq _08114F7C\n\
+    subs r0, r4, 0x1\n\
+    lsls r5, r0, 7\n\
+    ldr r0, _08114F68 @ =0x020188c4\n\
+    mov r12, r0\n\
+_08114F42:\n\
+    asrs r0, r3, 1\n\
+    lsls r0, 2\n\
+    adds r0, r5\n\
+    add r0, r12\n\
+    ldr r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08114F6C\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF0\n\
+_08114F58:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08114F72\n\
+_08114F5E:\n\
+    movs r0, 0x1\n\
+    b _08114FCA\n\
+    .align 2, 0\n\
+_08114F64: .4byte 0x000008c4\n\
+_08114F68: .4byte 0x020188c4\n\
+_08114F6C:\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF\n\
+    b _08114F58\n\
+_08114F72:\n\
+    adds r3, 0x1\n\
+    cmp r3, r2\n\
+    bge _08114F7C\n\
+    cmp r4, 0\n\
+    bne _08114F42\n\
+_08114F7C:\n\
+    asrs r3, r6, 24\n\
+    asrs r1, r7, 24\n\
+    cmp r3, r1\n\
+    bge _08114FC8\n\
+    cmp r4, 0x3F\n\
+    beq _08114FC8\n\
+    adds r0, r4, 0x1\n\
+    lsls r5, r0, 7\n\
+    ldr r6, _08114FB0 @ =0x020188c4\n\
+    adds r2, r1, 0\n\
+_08114F90:\n\
+    asrs r0, r3, 1\n\
+    lsls r0, 2\n\
+    adds r0, r5\n\
+    adds r0, r6\n\
+    ldr r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08114FB4\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF0\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08114FBE\n\
+    b _08114F5E\n\
+    .align 2, 0\n\
+_08114FB0: .4byte 0x020188c4\n\
+_08114FB4:\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08114F5E\n\
+_08114FBE:\n\
+    adds r3, 0x1\n\
+    cmp r3, r2\n\
+    bge _08114FC8\n\
+    cmp r4, 0x3F\n\
+    bne _08114F90\n\
+_08114FC8:\n\
+    movs r0, 0\n\
+_08114FCA:\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+        .syntax divided");
+}
+
+// Functions below are vblank callbacks and are used
+
+static void EvoDummyFunc(void)
+{
+
+}
+
+static void VBlankCB_EvolutionScene(void)
+{
+    REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803
+    REG_BG0HOFS = gUnknown_030042A4;
+    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG1HOFS = gUnknown_030042C0;
+    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG2HOFS = gUnknown_03004288;
+    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG3HOFS = gUnknown_030041B0;
+    REG_BG3VOFS = gUnknown_030041B8;
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_8089668();
+}
+
+static void VBlankCB_TradeEvolutionScene(void)
+{
+    REG_BG0HOFS = gUnknown_030042A4;
+    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG1HOFS = gUnknown_030042C0;
+    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG2HOFS = gUnknown_03004288;
+    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG3HOFS = gUnknown_030041B0;
+    REG_BG3VOFS = gUnknown_030041B8;
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_8089668();
+}
+
+static void sub_81150D8(void)
+{
+    sub_814A880(200, 72 + (sEvoCursorPos * 16));
+}
+
+static void EvoDummyFunc2(void)
+{
+
+}
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index a8f6b6b9b..ff8e8504c 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -13,7 +13,7 @@
 #include "flags.h"
 #include "item_menu.h"
 #include "metatile_behavior.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "secret_base.h"
@@ -57,7 +57,7 @@ extern u8 gUnknown_081A4363[];
 extern u8 gUnknown_081C346A[];
 extern u8 gUnknown_081616E1[];
 extern u8 Event_WorldMap[];
-extern u8 Event_RunningShoesManual[];
+extern u8 S_RunningShoesManual[];
 extern u8 PictureBookShelfScript[];
 extern u8 BookshelfScript[];
 extern u8 PokemonCenterBookshelfScript[];
@@ -70,13 +70,13 @@ extern u8 gUnknown_0815F43A[];
 extern u8 gUnknown_0815F523[];
 extern u8 gUnknown_0815F528[];
 extern u8 UseSurfScript[];
-extern u8 UseWaterfallScript[];
-extern u8 CannotUseWaterfallScript[];
+extern u8 S_UseWaterfall[];
+extern u8 S_CannotUseWaterfall[];
 extern u8 UseDiveScript[];
-extern u8 UnderwaterUseDiveScript[];
-extern u8 GraniteCave_B1F_EventScript_1C6BC5[];
+extern u8 S_UseDiveUnderwater[];
+extern u8 S_FallDownHole[];
 extern u8 gUnknown_081A14B8[];
-extern u8 Event_EggHatch[];
+extern u8 S_EggHatch[];
 extern u8 gUnknown_0815FD0D[];
 extern u8 gUnknown_081C6BDE[];
 
@@ -391,7 +391,7 @@ static u8 *sub_8068500(struct MapPosition *position, u8 b, u8 c)
     if (MetatileBehavior_IsRegionMap(b) == TRUE)
         return Event_WorldMap;
     if (sub_805791C(b) == TRUE)
-        return Event_RunningShoesManual;
+        return S_RunningShoesManual;
     if (MetatileBehavior_IsPictureBookShelf(b) == TRUE)
         return PictureBookShelfScript;
     if (MetatileBehavior_IsBookShelf(b) == TRUE)
@@ -428,9 +428,9 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
     if (MetatileBehavior_IsWaterfall(b) == TRUE)
     {
         if (FlagGet(BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
-            return UseWaterfallScript;
+            return S_UseWaterfall;
         else
-            return CannotUseWaterfallScript;
+            return S_CannotUseWaterfall;
     }
     return NULL;
 }
@@ -447,9 +447,9 @@ static bool32 sub_8068770(void)
 
 static bool32 sub_80687A4(void)
 {
-    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == 5 && sub_8068F18() == 1)
+    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
     {
-        ScriptContext1_SetupScript(UnderwaterUseDiveScript);
+        ScriptContext1_SetupScript(S_UseDiveUnderwater);
         return TRUE;
     }
     return FALSE;
@@ -485,7 +485,7 @@ bool8 sub_8068870(u16 a)
 {
     if (MetatileBehavior_IsCrackedFloorHole(a))
     {
-        ScriptContext1_SetupScript(GraniteCave_B1F_EventScript_1C6BC5);
+        ScriptContext1_SetupScript(S_FallDownHole);
         return TRUE;
     }
     return FALSE;
@@ -503,7 +503,7 @@ bool8 sub_8068894(void)
     if (sub_80422A0())
     {
         IncrementGameStat(13);
-        ScriptContext1_SetupScript(Event_EggHatch);
+        ScriptContext1_SetupScript(S_EggHatch);
         return TRUE;
     }
     if (SafariZoneTakeStep() == TRUE)
@@ -549,14 +549,14 @@ static bool8 overworld_poison_step(void)
 {
     u16 *ptr;
 
-    if (gMapHeader.mapType != 9)
+    if (gMapHeader.mapType != MAP_TYPE_SECRET_BASE)
     {
         ptr = GetVarPointer(VAR_POISON_STEP_COUNTER);
         (*ptr)++;
         (*ptr) %= 4;
         if (*ptr == 0)
         {
-            switch (overworld_poison())
+            switch (DoPoisonFieldEffect())
             {
             case 0:
                 return FALSE;
@@ -698,7 +698,7 @@ static void sub_8068C30(struct MapHeader *unused, s8 b, struct MapPosition *posi
 
         warp1_set_2(warpEvent->unk7, warpEvent->mapNum, warpEvent->mapGroup);
         sub_80535C4(position->x, position->y);
-        mapHeader = get_mapheader_by_bank_and_number(warpEvent->unk7, warpEvent->mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->unk7, warpEvent->mapNum);
         if (mapHeader->events->warps[warpEvent->mapGroup].mapNum == 0x7F)
             saved_warp2_set(mapHeader->events->warps[b].mapGroup, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, b);
     }
@@ -730,7 +730,7 @@ static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b,
     return FALSE;
 }
 
-static s8 map_warp_check(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
+static s8 map_warp_check(struct MapHeader *mapHeader, u16 x, u16 y, u8 warpId)
 {
     s32 i;
     struct WarpEvent *warpEvent = mapHeader->events->warps;
@@ -738,9 +738,9 @@ static s8 map_warp_check(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
 
     for (i = 0; i < warpCount; i++, warpEvent++)
     {
-        if ((u16)warpEvent->x == b && (u16)warpEvent->y == c)
+        if ((u16)warpEvent->x == x && (u16)warpEvent->y == y)
         {
-            if ((u8)warpEvent->warpId == d || (u8)warpEvent->warpId == 0)
+            if ((u8)warpEvent->warpId == warpId || (u8)warpEvent->warpId == 0)
                 return i;
         }
     }
@@ -767,7 +767,7 @@ static u8 *trigger_activate(struct CoordEvent *coordEvent)
     return NULL;
 }
 
-static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
+static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 x, u16 y, u8 d)
 {
     s32 i;
     struct CoordEvent *coordEvents = mapHeader->events->coordEvents;
@@ -776,7 +776,7 @@ static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 b, u16
 
     for (i = 0; i < coordEventCount; i++)
     {
-        if ((u16)coordEvents[i].x == b && (u16)coordEvents[i].y == c)
+        if ((u16)coordEvents[i].x == x && (u16)coordEvents[i].y == y)
         {
             if (coordEvents[i].unk4 == d || coordEvents[i].unk4 == 0)
             {
@@ -813,7 +813,7 @@ static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *mapHea
 
 int dive_warp(struct MapPosition *position, u16 b)
 {
-    if (gMapHeader.mapType == 5 && sub_805750C(b) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_805750C(b) == 0)
     {
         if (sub_80538B0(position->x - 7, position->y - 7))
         {
@@ -843,7 +843,7 @@ u8 sub_8068F18(void)
 
     PlayerGetDestCoords(&x, &y);
     r5 = MapGridGetMetatileBehaviorAt(x, y);
-    if (gMapHeader.mapType == 5 && sub_805750C(r5) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_805750C(r5) == 0)
     {
         if (sub_80538B0(x - 7, y - 7) == TRUE)
             return 1;
diff --git a/src/field_door.c b/src/field_door.c
index 791ed4c94..ab46f0696 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -3,6 +3,7 @@
 #include "field_camera.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
+#include "songs.h"
 #include "task.h"
 
 extern struct DoorAnimFrame gDoorOpenAnimFrames[];
@@ -212,10 +213,10 @@ bool8 FieldIsDoorAnimationRunning(void)
     return FuncIsActiveTask(Task_AnimateDoor);
 }
 
-u32 sub_8058790(u32 x, u32 y)
+u32 GetDoorSoundEffect(u32 x, u32 y)
 {
     if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0)
-        return 8;
+        return SE_DOOR;
     else
-        return 18;
+        return SE_JIDO_DOA;
 }
diff --git a/src/field_effect.c b/src/field_effect.c
index cffed2614..0625e9d18 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -9,7 +9,7 @@
 #include "menu.h"
 #include "palette.h"
 #include "text.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "sound.h"
 #include "songs.h"
@@ -28,7 +28,7 @@
 
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 
-EWRAM_DATA u32 gUnknown_0202FF84[8] = {0};
+EWRAM_DATA u32 gFieldEffectArguments[8] = {0};
 
 const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
 const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
@@ -1203,10 +1203,10 @@ void task00_8084310(u8 taskId)
         {
             return;
         }
-        gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-        if ((int)gUnknown_0202FF84[0] > 5)
+        gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+        if ((int)gFieldEffectArguments[0] > 5)
         {
-            gUnknown_0202FF84[0] = 0;
+            gFieldEffectArguments[0] = 0;
         }
         FieldEffectStart(FLDEFF_USE_FLY);
         task->data[0]++;
@@ -1665,7 +1665,7 @@ bool8 FldEff_UseWaterfall(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8086F64, 0xff);
-    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[1] = gFieldEffectArguments[0];
     sub_8086F64(taskId);
     return FALSE;
 }
@@ -1689,7 +1689,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
     {
         FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
-        gUnknown_0202FF84[0] = task->data[1];
+        gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
     }
@@ -1738,8 +1738,8 @@ bool8 FldEff_UseDive(void)
 {
     u8 taskId;
     taskId = CreateTask(Task_Dive, 0xff);
-    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
-    gTasks[taskId].data[14] = gUnknown_0202FF84[1];
+    gTasks[taskId].data[15] = gFieldEffectArguments[0];
+    gTasks[taskId].data[14] = gFieldEffectArguments[1];
     Task_Dive(taskId);
     return FALSE;
 }
@@ -1759,7 +1759,7 @@ bool8 sub_8087124(struct Task *task)
 bool8 dive_2_unknown(struct Task *task)
 {
     ScriptContext2_Enable();
-    gUnknown_0202FF84[0] = task->data[15];
+    gFieldEffectArguments[0] = task->data[15];
     FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     task->data[0]++;
     return FALSE;
@@ -1820,10 +1820,10 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite
 {
     sprite->pos2.y = 0;
     task->data[3] = 1;
-    gUnknown_0202FF84[0] = mapObject->coords2.x;
-    gUnknown_0202FF84[1] = mapObject->coords2.y;
-    gUnknown_0202FF84[2] = sprite->subpriority - 1;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
+    gFieldEffectArguments[0] = mapObject->coords2.x;
+    gFieldEffectArguments[1] = mapObject->coords2.y;
+    gFieldEffectArguments[2] = sprite->subpriority - 1;
+    gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
     PlaySE(SE_W153);
     task->data[0]++;
@@ -1924,10 +1924,10 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite
 {
     if (sub_807D770())
     {
-        gUnknown_0202FF84[0] = mapObject->coords2.x;
-        gUnknown_0202FF84[1] = mapObject->coords2.y;
-        gUnknown_0202FF84[2] = sprite->subpriority - 1;
-        gUnknown_0202FF84[3] = sprite->oam.priority;
+        gFieldEffectArguments[0] = mapObject->coords2.x;
+        gFieldEffectArguments[1] = mapObject->coords2.y;
+        gFieldEffectArguments[2] = sprite->subpriority - 1;
+        gFieldEffectArguments[3] = sprite->oam.priority;
         task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
         task->data[0]++;
     }
@@ -1966,9 +1966,9 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36]
 u8 FldEff_LavaridgeGymWarp(void)
 {
     u8 spriteId;
-    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
-    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    sub_8060470((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = 1;
     return spriteId;
 }
@@ -2009,10 +2009,10 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
     {
         if (task->data[1] > 3)
         {
-            gUnknown_0202FF84[0] = mapObject->coords2.x;
-            gUnknown_0202FF84[1] = mapObject->coords2.y;
-            gUnknown_0202FF84[2] = sprite->subpriority - 1;
-            gUnknown_0202FF84[3] = sprite->oam.priority;
+            gFieldEffectArguments[0] = mapObject->coords2.x;
+            gFieldEffectArguments[1] = mapObject->coords2.y;
+            gFieldEffectArguments[2] = sprite->subpriority - 1;
+            gFieldEffectArguments[3] = sprite->oam.priority;
             task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
             task->data[0]++;
         } else
@@ -2064,9 +2064,9 @@ bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite
 u8 FldEff_PopOutOfAsh(void)
 {
     u8 spriteId;
-    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
-    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    sub_8060470((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = 1;
     return spriteId;
 }
@@ -2385,26 +2385,26 @@ void sub_8088890(struct Sprite *);
 bool8 FldEff_FieldMoveShowMon(void)
 {
     u8 taskId;
-    if (is_light_level_1_2_3_5_or_6(sav1_map_get_light_level()) == TRUE)
+    if (is_map_type_1_2_3_5_or_6(Overworld_GetMapTypeOfSaveblockLocation()) == TRUE)
     {
         taskId = CreateTask(sub_8088120, 0xff);
     } else
     {
         taskId = CreateTask(sub_808847C, 0xff);
     }
-    gTasks[taskId].data[15] = sub_8088830(gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+    gTasks[taskId].data[15] = sub_8088830(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     return FALSE;
 }
 
 bool8 FldEff_FieldMoveShowMonInit(void)
 {
     struct Pokemon *pokemon;
-    u32 flag = gUnknown_0202FF84[0] & 0x80000000;
-    pokemon = &gPlayerParty[(u8)gUnknown_0202FF84[0]];
-    gUnknown_0202FF84[0] = GetMonData(pokemon, MON_DATA_SPECIES);
-    gUnknown_0202FF84[1] = GetMonData(pokemon, MON_DATA_OT_ID);
-    gUnknown_0202FF84[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
-    gUnknown_0202FF84[0] |= flag;
+    u32 flag = gFieldEffectArguments[0] & 0x80000000;
+    pokemon = &gPlayerParty[(u8)gFieldEffectArguments[0]];
+    gFieldEffectArguments[0] = GetMonData(pokemon, MON_DATA_SPECIES);
+    gFieldEffectArguments[1] = GetMonData(pokemon, MON_DATA_OT_ID);
+    gFieldEffectArguments[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
+    gFieldEffectArguments[0] |= flag;
     FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     return FALSE;
@@ -2879,9 +2879,9 @@ u8 FldEff_UseSurf(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8088954, 0xff);
-    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[15] = gFieldEffectArguments[0];
     sav1_reset_battle_music_maybe();
-    sub_8053FB0(0x016d);
+    Overworld_ChangeMusicTo(0x016d);
     return FALSE;
 }
 
@@ -2919,7 +2919,7 @@ void sub_8088A30(struct Task *task)
     mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
     {
-        gUnknown_0202FF84[0] = task->data[15] | 0x80000000;
+        gFieldEffectArguments[0] = task->data[15] | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
     }
@@ -2934,9 +2934,9 @@ void sub_8088A78(struct Task *task)
         sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(3));
         FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
         FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18));
-        gUnknown_0202FF84[0] = task->data[1];
-        gUnknown_0202FF84[1] = task->data[2];
-        gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
+        gFieldEffectArguments[0] = task->data[1];
+        gFieldEffectArguments[1] = task->data[2];
+        gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
         task->data[0]++;
     }
@@ -2970,7 +2970,7 @@ u8 FldEff_NPCFlyOut(void)
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
     sprite->callback = sub_8088BC4;
-    sprite->data1 = gUnknown_0202FF84[0];
+    sprite->data1 = gFieldEffectArguments[0];
     PlaySE(SE_W019);
     return spriteId;
 }
@@ -3009,7 +3009,7 @@ u8 FldEff_UseFly(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8088C70, 0xfe);
-    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[1] = gFieldEffectArguments[0];
     return 0;
 }
 
@@ -3040,7 +3040,7 @@ void sub_8088CF8(struct Task *task)
     if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
     {
         task->data[0]++;
-        gUnknown_0202FF84[0] = task->data[1];
+        gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     }
 }
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index e614d899a..d95177821 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -15,7 +15,7 @@
 #include "map_obj_lock.h"
 #include "metatile_behavior.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -40,8 +40,8 @@ void palette_bg_fill_black(void)
 
 void pal_fill_for_map_transition(void)
 {
-    u8 map_light = get_map_light_from_warp0();
-    switch (fade_type_for_given_maplight_pair(map_light, sav1_map_get_light_level()))
+    u8 map_light = get_map_type_from_warp0();
+    switch (fade_type_for_given_maplight_pair(map_light, Overworld_GetMapTypeOfSaveblockLocation()))
     {
     case 0:
         fade_screen(0, 0);
@@ -61,7 +61,7 @@ void pal_fill_black(void)
 
 void fade_8080918(void)
 {
-    u8 light_level = sav1_map_get_light_level();
+    u8 light_level = Overworld_GetMapTypeOfSaveblockLocation();
     switch (sub_810CDB8(light_level, warp1_get_mapheader()->mapType))
     {
     case 0:
@@ -547,7 +547,7 @@ void sub_808115C(u8 taskId)
     case 0:
         FreezeMapObjects();
         PlayerGetDestCoords(x, y);
-        PlaySE(sub_8058790(*x, *y - 1));
+        PlaySE(GetDoorSoundEffect(*x, *y - 1));
         task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
         task->data[0] = 1;
         break;
diff --git a/src/field_ground_effect.c b/src/field_ground_effect.c
index 42862d0ff..2a398ba22 100644
--- a/src/field_ground_effect.c
+++ b/src/field_ground_effect.c
@@ -1,11 +1,38 @@
 #include "global.h"
 #include "field_ground_effect.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_map_obj_helpers.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
 
-extern u32 gUnknown_08376008[];
+static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8);
+static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8);
+static void DoTracksGroundEffect_BikeTireTracks(
+    struct MapObject *mapObj, struct Sprite *sprite, u8);
+void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite);
+u8 GetReflectionTypeByMetatileBehavior(u32 behavior);
 
-void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_Reflection(mapObj, flags);
@@ -17,7 +44,7 @@ void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
     GetGroundEffectFlags_HotSprings(mapObj, flags);
 }
 
-void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_Reflection(mapObj, flags);
@@ -31,7 +58,7 @@ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
     GetGroundEffectFlags_HotSprings(mapObj, flags);
 }
 
-void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
@@ -101,7 +128,7 @@ void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags)
         *flags |= 0x100;
     }
     else if (MetatileBehavior_IsSandOrDeepSand(mapObj->mapobj_unk_1F)
-     || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->mapobj_unk_1F))
+             || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->mapobj_unk_1F))
     {
         *flags |= 0x80;
     }
@@ -110,7 +137,7 @@ void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_20)
         {
@@ -127,8 +154,10 @@ void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags)
 
 void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *flags)
 {
-    if ((MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1E) && MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1F))
-     || (MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1E) && MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1F)))
+    if ((MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1E)
+         && MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1F))
+        || (MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1E)
+            && MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1F)))
     {
         if (!mapObj->mapobj_bit_19)
         {
@@ -146,7 +175,7 @@ void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *fla
 void GetGroundEffectFlags_Puddle(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1F))
     {
         *flags |= 0x400;
     }
@@ -161,7 +190,7 @@ void GetGroundEffectFlags_Ripple(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_18)
         {
@@ -179,7 +208,7 @@ void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_HotSprings(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_21)
         {
@@ -204,8 +233,7 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
 {
     typedef bool8 (*MetatileFunc)(u8);
 
-    static const MetatileFunc metatileFuncs[] =
-    {
+    static const MetatileFunc metatileFuncs[] = {
         MetatileBehavior_IsTallGrass,
         MetatileBehavior_IsLongGrass,
         MetatileBehavior_IsPuddle,
@@ -214,14 +242,13 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
         MetatileBehavior_IsATile,
     };
 
-    static const u32 jumpLandingFlags[] =
-    {
-        0x00001000,  // Landing in tall grass
-        0x00002000,  // Landing in long grass
-        0x00004000,  // Landing on puddle
-        0x00008000,  // Landing on surfable water or underwater
-        0x00004000,  // Landing on shallow flowing water
-        0x00010000,  // Landing on any other type of ground
+    static const u32 jumpLandingFlags[] = {
+        0x00001000, // Landing in tall grass
+        0x00002000, // Landing in long grass
+        0x00004000, // Landing on puddle
+        0x00008000, // Landing on surfable water or underwater
+        0x00004000, // Landing on shallow flowing water
+        0x00010000, // Landing on any other type of ground
     };
 
     if (mapObj->mapobj_bit_5 && !mapObj->mapobj_bit_25)
@@ -238,3 +265,529 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
         }
     }
 }
+
+u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+
+    // ceil div by tile width?
+    s16 width = (info->width + 8) >> 4;
+    s16 height = (info->height + 8) >> 4;
+    s16 i;
+    s16 j;
+    u8 result;
+    u8 b;
+    s16 one;
+
+#define RETURN_REFLECTION_TYPE_AT(x, y)              \
+    b = MapGridGetMetatileBehaviorAt(x, y);          \
+    result = GetReflectionTypeByMetatileBehavior(b); \
+    if (result != 0)                                 \
+        return result;
+
+    for (i = 0, one = 1; i < height; i++)
+    {
+        RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x, mapObj->coords2.y + one + i)
+        RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x, mapObj->coords3.y + one + i)
+        for (j = 1; j < width; j++)
+        {
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x + j, mapObj->coords2.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x - j, mapObj->coords2.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x + j, mapObj->coords3.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x - j, mapObj->coords3.y + one + i)
+        }
+    }
+    return 0;
+
+#undef RETURN_REFLECTION_TYPE_AT
+}
+
+u8 GetReflectionTypeByMetatileBehavior(u32 behavior)
+{
+    if (MetatileBehavior_IsIce(behavior))
+        return 1;
+    else if (MetatileBehavior_IsReflective(behavior))
+        return 2;
+    else
+        return 0;
+}
+
+u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z)
+{
+    static bool8 (*const unknown_08376040[])(u8) = {
+        MetatileBehavior_IsJumpSouth,
+        MetatileBehavior_IsJumpNorth,
+        MetatileBehavior_IsJumpWest,
+        MetatileBehavior_IsJumpEast,
+    };
+
+    u8 b;
+    u8 index = z;
+
+    if (index == 0)
+        return 0;
+    else if (index > 4)
+        index -= 4;
+
+    index--;
+    b = MapGridGetMetatileBehaviorAt(x, y);
+
+    if (unknown_08376040[index](b) == 1)
+        return index + 1;
+
+    return 0;
+}
+
+void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_4)
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1E))
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1F))
+        return;
+
+    sprite->subspriteTableNum = 4;
+
+    if (ZCoordToPriority(mapObj->elevation) == 1)
+        sprite->subspriteTableNum = 5;
+}
+
+bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y)
+{
+    u8 mapZ;
+
+    if (z == 0)
+        return FALSE;
+
+    mapZ = MapGridGetZCoordAt(x, y);
+
+    if (mapZ == 0 || mapZ == 0xF)
+        return FALSE;
+
+    if (mapZ != z)
+        return TRUE;
+
+    return FALSE;
+}
+
+static const u8 sUnknown_08376050[] = {
+    0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
+};
+
+// Each byte corresponds to a sprite priority for a field object.
+// This is directly the inverse of gFieldObjectPriorities_08376070.
+static const u8 sFieldObjectPriorities_08376060[] = {
+    2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
+};
+
+// Each byte corresponds to a sprite priority for a field object.
+// This is the inverse of gFieldObjectPriorities_08376060.
+// 1 = Above player sprite
+// 2 = Below player sprite
+static const u8 sFieldObjectPriorities_08376070[] = {
+    1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1,
+};
+
+void FieldObjectUpdateZCoordAndPriority(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_26)
+        return;
+
+    FieldObjectUpdateZCoord(mapObj);
+
+    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[mapObj->elevation];
+    sprite->oam.priority = sFieldObjectPriorities_08376060[mapObj->elevation];
+}
+
+void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z)
+{
+    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[z];
+    sprite->oam.priority = sFieldObjectPriorities_08376060[z];
+}
+
+u8 ZCoordToPriority(u8 z)
+{
+    return sFieldObjectPriorities_08376060[z];
+}
+
+void FieldObjectUpdateZCoord(struct MapObject *mapObj)
+{
+    u8 z = MapGridGetZCoordAt(mapObj->coords2.x, mapObj->coords2.y);
+    u8 z2 = MapGridGetZCoordAt(mapObj->coords3.x, mapObj->coords3.y);
+
+    if (z == 0xF || z2 == 0xF)
+        return;
+
+    mapObj->mapobj_unk_0B_0 = z;
+
+    if (z != 0 && z != 0xF)
+        mapObj->elevation = z;
+}
+
+void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
+{
+    s32 tmp = sprite->centerToCornerVecY;
+    u32 tmpa = *(u16 *)&sprite->pos1.y;
+    u32 tmpb = *(u16 *)&gSpriteCoordOffsetY;
+    s32 tmp2 = (tmpa - tmp) + tmpb;
+    u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2;
+    sprite->subpriority = tmp3 + sUnknown_08376050[a] + b;
+}
+
+void FieldObjectUpdateSubpriority(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_26)
+        return;
+
+    SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1);
+}
+
+bool8 AreZCoordsCompatible(u8 a, u8 b)
+{
+    if (a == 0 || b == 0)
+        return TRUE;
+
+    if (a != b)
+        return FALSE;
+
+    return TRUE;
+}
+
+void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(4);
+}
+
+void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(4);
+}
+
+void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(17);
+}
+
+void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(17);
+}
+
+void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    SetUpReflection(mapObj, sprite, 0);
+}
+
+void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    SetUpReflection(mapObj, sprite, 1);
+}
+
+void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_FEET_IN_FLOWING_WATER, mapObj);
+}
+
+static void (*const gUnknown_08376080[])(struct MapObject *mapObj, struct Sprite *sprite, u8 a) = {
+    nullsub, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks,
+};
+
+void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+    gUnknown_08376080[info->tracks](mapObj, sprite, 0);
+}
+
+void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+    gUnknown_08376080[info->tracks](mapObj, sprite, 1);
+}
+
+static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+}
+
+static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+    // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
+    u16 sandFootprints_FieldEffectData[2] = { 0xD, 0x18 };
+
+    gFieldEffectArguments[0] = mapObj->coords3.x;
+    gFieldEffectArguments[1] = mapObj->coords3.y;
+    gFieldEffectArguments[2] = 149;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = mapObj->mapobj_unk_18;
+    FieldEffectStart(sandFootprints_FieldEffectData[a]);
+}
+
+static void DoTracksGroundEffect_BikeTireTracks(
+    struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+    //  Specifies which bike track shape to show next.
+    //  For example, when the bike turns from up to right, it will show
+    //  a track that curves to the right.
+    //  Each 4-byte row corresponds to the initial direction of the bike, and
+    //  each byte in that row is for the next direction of the bike in the order
+    //  of down, up, left, right.
+    static const u8 bikeTireTracks_Transitions[4][4] = {
+        1, 2, 7, 8,
+        1, 2, 6, 5,
+        5, 8, 3, 4,
+        6, 7, 3, 4,
+    };
+
+    if (mapObj->coords2.x != mapObj->coords3.x || mapObj->coords2.y != mapObj->coords3.y)
+    {
+        gFieldEffectArguments[0] = mapObj->coords3.x;
+        gFieldEffectArguments[1] = mapObj->coords3.y;
+        gFieldEffectArguments[2] = 149;
+        gFieldEffectArguments[3] = 2;
+        gFieldEffectArguments[4] =
+            bikeTireTracks_Transitions[mapObj->mapobj_unk_20][mapObj->mapobj_unk_18 - 5];
+        FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS);
+    }
+}
+
+void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    DoRippleFieldEffect(mapObj, sprite);
+}
+
+void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SPLASH, mapObj);
+}
+
+void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SAND_PILE, mapObj);
+}
+
+void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 spriteId;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_TALL_GRASS);
+
+    spriteId = sub_8126FF0(
+        mapObj->localId, mapObj->mapNum, mapObj->mapGroup, mapObj->coords2.x, mapObj->coords2.y);
+
+    if (spriteId == MAX_SPRITES)
+        GroundEffect_SpawnOnTallGrass(mapObj, sprite);
+}
+
+void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
+}
+
+void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
+}
+
+void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
+}
+
+void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_DUST);
+}
+
+void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SHORT_GRASS, mapObj);
+}
+
+void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_HOT_SPRINGS_WATER, mapObj);
+}
+
+void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    FieldEffectStart(FLDEFF_BUBBLES);
+}
+
+static void (*const gUnknown_083760A0[])(struct MapObject *mapObj, struct Sprite *sprite) = {
+    GroundEffect_SpawnOnTallGrass,
+    sub_8063E94,
+    sub_8063EE0,
+    sub_8063F2C,
+    GroundEffect_WaterReflection,
+    GroundEffect_IceReflection,
+    GroundEffect_FlowingWater,
+    sub_8063FA0,
+    sub_8063FCC,
+    GroundEffect_Ripple,
+    GroundEffect_StepOnPuddle,
+    GroundEffect_SandPile,
+    GroundEffect_JumpOnTallGrass,
+    GroundEffect_JumpOnLongGrass,
+    GroundEffect_JumpOnShallowWater,
+    GroundEffect_JumpOnWater,
+    GroundEffect_JumpLandingDust,
+    GroundEffect_ShortGrass,
+    GroundEffect_HotSprings,
+    GroundEffect_Seaweed
+};
+
+void sub_8064218(struct MapObject *mapObj, struct Sprite *sprite, u32 flags)
+{
+    u8 i;
+    for (i = 0; i < ARRAY_COUNT(gUnknown_083760A0); i++, flags >>= 1)
+        if (flags & 1)
+            gUnknown_083760A0[i](mapObj, sprite);
+}
+
+void filters_out_some_ground_effects(struct MapObject *mapObj, u32 *flags)
+{
+    if (mapObj->mapobj_bit_4)
+    {
+        mapObj->mapobj_bit_18 = 0;
+        mapObj->mapobj_bit_20 = 0;
+        mapObj->mapobj_bit_19 = 0;
+        mapObj->mapobj_bit_21 = 0;
+        *flags &= 0xFFF9F7BD;
+    }
+}
+
+void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *mapObj, u32 *flags)
+{
+    if (mapObj->mapobj_bit_5)
+        *flags &= 0xFFFFFBFF;
+}
+
+void DoGroundEffects_OnSpawn(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_2)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnSpawn(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_2 = 0;
+        mapObj->mapobj_bit_4 = 0;
+    }
+}
+
+void DoGroundEffects_OnBeginStep(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_2)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnBeginStep(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        filters_out_some_ground_effects(mapObj, &flags);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_2 = 0;
+        mapObj->mapobj_bit_4 = 0;
+    }
+}
+
+void DoGroundEffects_OnFinishStep(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_3)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnFinishStep(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        FilterOutStepOnPuddleGroundEffectIfJumping(mapObj, &flags);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_3 = 0;
+        mapObj->mapobj_bit_5 = 0;
+    }
+}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index f60b1b233..0e7cd7896 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -11,7 +11,7 @@
 #include "fieldmap.h"
 #include "palette.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "metatile_behavior.h"
 #include "map_constants.h"
@@ -3244,7 +3244,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m
         return FindFieldObjectTemplateInArrayByLocalId(localId, gSaveBlock1.mapObjectTemplates, gMapHeader.events->mapObjectCount);
     else
     {
-        struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+        struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
 
         return FindFieldObjectTemplateInArrayByLocalId(localId, mapHeader->events->mapObjects, mapHeader->events->mapObjectCount);
     }
@@ -3895,11 +3895,11 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
     {
         if (!(sprite->data7 & 4) && sprite->animNum == 4)
         {
-            gUnknown_0202FF84[0] = mapObject->coords2.x;
-            gUnknown_0202FF84[1] = mapObject->coords2.y;
-            gUnknown_0202FF84[2] = sprite->subpriority - 1;
-            gUnknown_0202FF84[3] = sprite->oam.priority;
-            FieldEffectStart(0x17);
+            gFieldEffectArguments[0] = mapObject->coords2.x;
+            gFieldEffectArguments[1] = mapObject->coords2.y;
+            gFieldEffectArguments[2] = sprite->subpriority - 1;
+            gFieldEffectArguments[3] = sprite->oam.priority;
+            FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
             sprite->animNum = 0;
         }
         return 0;
@@ -3934,11 +3934,11 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp
     sprite->data1 = 3;
     sprite->data2 = 0;
     sprite->data7 |= 2;
-    gUnknown_0202FF84[0] = mapObject->coords2.x;
-    gUnknown_0202FF84[1] = mapObject->coords2.y;
-    gUnknown_0202FF84[2] = sprite->subpriority - 1;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
-    FieldEffectStart(0x17);
+    gFieldEffectArguments[0] = mapObject->coords2.x;
+    gFieldEffectArguments[1] = mapObject->coords2.y;
+    gFieldEffectArguments[2] = sprite->subpriority - 1;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
     return 1;
 }
 
@@ -5086,8 +5086,8 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data0];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(0x1c);
+        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data7 ++;
     }
@@ -5106,8 +5106,8 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data0];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(0x1d);
+        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data7 ++;
     }
@@ -5364,53 +5364,36 @@ u8 sub_805FF20(struct MapObject *mapObject, u8 direction)
 }
 
 bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject2 *mapObject, s16 x, s16 y);
-bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y);
+static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y);
 bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
 
 u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
 {
     if (IsCoordOutsideFieldObjectMovementRect((struct MapObject2 *)mapObject, x, y))
-    {
         return 1;
-    }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
-    {
+    else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
         return 2;
-    } else if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))
-    {
+    else if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))
         return 2;
-    }
-    if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
+    else if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
         return 3;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
+    else if (DoesObjectCollideWithObjectAt(mapObject, x, y))
         return 4;
-    }
     return 0;
 }
 
 u8 sub_8060024(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
 {
-    u8 flags;
-    flags = 0;
+    u8 flags = 0;
+
     if (IsCoordOutsideFieldObjectMovementRect((struct MapObject2 *)mapObject, x, y))
-    {
         flags |= 1;
-    }
     if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)))
-    {
         flags |= 2;
-    }
     if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
         flags |= 4;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
+    if (DoesObjectCollideWithObjectAt(mapObject, x, y))
         flags |= 8;
-    }
     return flags;
 }
 
@@ -5418,25 +5401,22 @@ bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject2 *mapObject, s16 x,
 {
     s16 minv;
     s16 maxv;
+
     if (mapObject->mapobj_unk_19 != 0)
     {
         minv = mapObject->coords1.x - (mapObject->mapobj_unk_19);
         maxv = mapObject->coords1.x + (mapObject->mapobj_unk_19);
         if (minv > x || maxv < x)
-        {
-            return 1;
-        }
+            return TRUE;
     }
     if (mapObject->mapobj_unk_19b != 0)
     {
         minv = mapObject->coords1.y - (mapObject->mapobj_unk_19b);
         maxv = mapObject->coords1.y + (mapObject->mapobj_unk_19b);
         if (minv > y || maxv < y)
-        {
-            return 1;
-        }
+            return TRUE;
     }
-    return 0;
+    return FALSE;
 }
 
 bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
@@ -5448,23 +5428,19 @@ bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16
     return 0;
 }
 
-bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y)
 {
-    struct MapObject *mapObject2;
     u8 i;
-    for (i=0; i<16; i++)
+
+    for (i = 0; i < 16; i++)
     {
-        mapObject2 = &gMapObjects[i];
+        struct MapObject *mapObject2 = &gMapObjects[i];
+
         if (mapObject2->active && mapObject2 != mapObject)
         {
-            if ((mapObject2->coords2.x != x || mapObject2->coords2.y != y) && (mapObject2->coords3.x != x || mapObject2->coords3.y != y))
-            {
-                continue;
-            }
-            if (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, mapObject2->mapobj_unk_0B_0))
-            {
-                return 1;
-            }
+            if (((mapObject2->coords2.x == x && mapObject2->coords2.y == y) || (mapObject2->coords3.x == x && mapObject2->coords3.y == y))
+             && AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, mapObject2->mapobj_unk_0B_0))
+                return TRUE;
         }
     }
     return 0;
@@ -7490,24 +7466,24 @@ bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x0);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     sprite->data2 = 1;
     return TRUE;
 }
 
 bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x21);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
     sprite->data2 = 1;
     return TRUE;
 }
 
 bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x2e);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data2 = 1;
     return TRUE;
 }
@@ -8303,12 +8279,12 @@ void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 void sub_80634E8(struct MapObject *, struct Sprite *);
-void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *);
+static void UpdateMapObjSpriteVisibility(struct MapObject *, struct Sprite *);
 
 void sub_80634D0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80634E8(mapObject, sprite);
-    npc_update_obj_anim_flag(mapObject, sprite);
+    UpdateMapObjSpriteVisibility(mapObject, sprite);
 }
 
 #ifdef NONMATCHING
@@ -8464,7 +8440,7 @@ _080635C0:\n\
 }
 #endif
 
-void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite)
+void UpdateMapObjSpriteVisibility(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sprite->invisible = 0;
     if (mapObject->mapobj_bit_13 || mapObject->mapobj_bit_14)
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 87be8e011..93cd57557 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -294,7 +294,7 @@ void sub_8064990(u8 a1, u8 dir)
 
 u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
     return FieldEffectStart(fieldEffectId);
 }
 
@@ -310,9 +310,9 @@ void DoShadowFieldEffect(struct MapObject *mapObject)
 void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
 {
     const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    gUnknown_0202FF84[0] = sprite->pos1.x;
-    gUnknown_0202FF84[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
-    gUnknown_0202FF84[2] = 151;
-    gUnknown_0202FF84[3] = 3;
-    FieldEffectStart(5);
+    gFieldEffectArguments[0] = sprite->pos1.x;
+    gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
+    gFieldEffectArguments[2] = 151;
+    gFieldEffectArguments[3] = 3;
+    FieldEffectStart(FLDEFF_RIPPLE);
 }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 2a7b2f3e0..c8099a73d 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -14,7 +14,7 @@
 #include "metatile_behavior.h"
 #include "party_menu.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rotating_gate.h"
 #include "script.h"
 #include "songs.h"
@@ -666,10 +666,10 @@ void PlayerAvatarTransition_Surfing(struct MapObject *a)
     sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(3));
     FieldObjectTurn(a, a->placeholder18);
     SetPlayerAvatarStateMask(8);
-    gUnknown_0202FF84[0] = a->coords2.x;
-    gUnknown_0202FF84[1] = a->coords2.y;
-    gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
-    unk = FieldEffectStart(8);
+    gFieldEffectArguments[0] = a->coords2.x;
+    gFieldEffectArguments[1] = a->coords2.y;
+    gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
+    unk = FieldEffectStart(FLDEFF_SURF_BLOB);
     a->mapobj_unk_1A = unk;
     sub_8127ED0(unk, 1);
 }
@@ -1226,11 +1226,11 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
         FieldObjectClearAnimIfSpecialAnimFinished(c);
         FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId(task->data[2]));
         FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId(task->data[2]));
-        gUnknown_0202FF84[0] = c->coords2.x;
-        gUnknown_0202FF84[1] = c->coords2.y;
-        gUnknown_0202FF84[2] = c->elevation;
-        gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority;
-        FieldEffectStart(10);
+        gFieldEffectArguments[0] = c->coords2.x;
+        gFieldEffectArguments[1] = c->coords2.y;
+        gFieldEffectArguments[2] = c->elevation;
+        gFieldEffectArguments[3] = gSprites[c->spriteId].oam.priority;
+        FieldEffectStart(FLDEFF_DUST);
         PlaySE(SE_W070);
         task->data[0]++;
     }
@@ -1406,7 +1406,7 @@ static void sub_805A2D0(u8 taskId)
 
 /* Fishing */
 
-static u8 (*const gUnknown_0830FCB4[])(struct Task *) =
+static u8 (*const sFishingStateFuncs[])(struct Task *) =
 {
     Fishing1,
     Fishing2,
@@ -1429,17 +1429,33 @@ static u8 (*const gUnknown_0830FCB4[])(struct Task *) =
 static void Task_Fishing(u8 taskId);
 static void sub_805A954(void);
 
-void StartFishing(u8 a)
+#define tStep              data[0]
+#define tFrameCounter      data[1]
+#define tNumDots           data[2]
+#define tDotsRequired      data[3]
+#define tRoundsPlayed      data[12]
+#define tMinRoundsRequired data[13]
+#define tPlayerGfxId       data[14]
+#define tFishingRod        data[15]
+
+#define FISHING_START_ROUND 3
+#define FISHING_GOT_BITE 6
+#define FISHING_ON_HOOK 9
+#define FISHING_NO_BITE 11
+#define FISHING_GOT_AWAY 12
+#define FISHING_SHOW_RESULT 13
+
+void StartFishing(u8 rod)
 {
     u8 taskId = CreateTask(Task_Fishing, 0xFF);
 
-    gTasks[taskId].data[15] = a;
+    gTasks[taskId].tFishingRod = rod;
     Task_Fishing(taskId);
 }
 
 static void Task_Fishing(u8 taskId)
 {
-    while (gUnknown_0830FCB4[gTasks[taskId].data[0]](&gTasks[taskId]))
+    while (sFishingStateFuncs[gTasks[taskId].tStep](&gTasks[taskId]))
         ;
 }
 
@@ -1447,7 +1463,7 @@ u8 Fishing1(struct Task *task)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.unk6 = 1;
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
@@ -1457,23 +1473,25 @@ u8 Fishing2(struct Task *task)
     const s16 arr1[] = {1, 1, 1};
     const s16 arr2[] = {1, 3, 6};
 
-    task->data[12] = 0;
-    task->data[13] = arr1[task->data[15]] + (Random() % arr2[task->data[15]]);
-    task->data[14] = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId;
+    task->tRoundsPlayed = 0;
+    task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
+    task->tPlayerGfxId = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId;
     playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
     FieldObjectClearAnimIfSpecialAnimActive(playerMapObj);
     playerMapObj->mapobj_bit_11 = 1;
     sub_8059C3C(playerMapObj->mapobj_unk_18);
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
 u8 Fishing3(struct Task *task)
 {
     sub_805A954();
-    task->data[1]++;
-    if (task->data[1] > 0x3B)
-        task->data[0]++;
+    
+    // Wait one second before starting dot game
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= 60)
+        task->tStep++;
     return 0;
 }
 
@@ -1482,87 +1500,92 @@ u8 Fishing4(struct Task *task)
     u32 randVal;
 
     MenuDisplayMessageBox();
-    task->data[0]++;
-    task->data[1] = 0;
-    task->data[2] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
+    task->tNumDots = 0;
     randVal = Random();
     randVal %= 10;
-    task->data[3] = randVal + 1;
-    if (task->data[12] == 0)
-        task->data[3] = randVal + 4;
-    if (task->data[3] > 9)
-        task->data[3] = 10;
+    task->tDotsRequired = randVal + 1;
+    if (task->tRoundsPlayed == 0)
+        task->tDotsRequired = randVal + 4;
+    if (task->tDotsRequired >= 10)
+        task->tDotsRequired = 10;
     return 1;
 }
 
+// Play a round of the dot game
 u8 Fishing5(struct Task *task)
 {
     const u8 dot[] = _("·");
 
     sub_805A954();
-    task->data[1]++;
+    task->tFrameCounter++;
     if (gMain.newKeys & A_BUTTON)
     {
-        task->data[0] = 11;
-        if (task->data[12] != 0)
-            task->data[0] = 12;
+        task->tStep = FISHING_NO_BITE;
+        if (task->tRoundsPlayed != 0)
+            task->tStep = FISHING_GOT_AWAY;
         return 1;
     }
     else
     {
-        if (task->data[1] > 0x13)
+        if (task->tFrameCounter >= 20)
         {
-            task->data[1] = 0;
-            if (task->data[2] >= task->data[3])
+            task->tFrameCounter = 0;
+            if (task->tNumDots >= task->tDotsRequired)
             {
-                task->data[0]++;
-                if (task->data[12] != 0)
-                    task->data[0]++;
-                task->data[12]++;
+                task->tStep++;
+                if (task->tRoundsPlayed != 0)
+                    task->tStep++;
+                task->tRoundsPlayed++;
             }
             else
             {
-                MenuPrint(dot, task->data[2] + 4, 15);
-                task->data[2]++;
+                MenuPrint(dot, task->tNumDots + 4, 15);
+                task->tNumDots++;
             }
         }
         return 0;
     }
 }
 
+// Determine if fish bites
 u8 Fishing6(struct Task *task)
 {
     sub_805A954();
-    task->data[0]++;
-    if (!GetFishingWildMonListHeader() || (Random() & 1))
-        task->data[0] = 11;
+    task->tStep++;
+    if (!DoesCurrentMapHaveFishingMons() || (Random() & 1))
+        task->tStep = FISHING_NO_BITE;
     else
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FE08(player_get_direction_lower_nybble()));
     return 1;
 }
 
+// Oh! A Bite!
 u8 Fishing7(struct Task *task)
 {
     sub_805A954();
     MenuPrint(gOtherText_OhABite, 4, 17);
-    task->data[0]++;
-    task->data[1] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
     return 0;
 }
 
+// We have a bite. Now, wait for the player to press A, or the timer to expire.
 u8 Fishing8(struct Task *task)
 {
-    const s16 arr[3] = {36, 33, 30};
+    const s16 reelTimeouts[3] = {36, 33, 30};
 
     sub_805A954();
-    task->data[1]++;
-    if (task->data[1] >= arr[task->data[15]])
-        task->data[0] = 12;
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= reelTimeouts[task->tFishingRod])
+        task->tStep = FISHING_GOT_AWAY;
     else if (gMain.newKeys & A_BUTTON)
-        task->data[0]++;
+        task->tStep++;
     return 0;
 }
 
+// Determine if we're going to play the dot game again
 u8 Fishing9(struct Task *task)
 {
     const s16 arr[][2] =
@@ -1573,17 +1596,18 @@ u8 Fishing9(struct Task *task)
     };
 
     sub_805A954();
-    task->data[0]++;
-    if (task->data[12] < task->data[13])
+    task->tStep++;
+    if (task->tRoundsPlayed < task->tMinRoundsRequired)
     {
-        task->data[0] = 3;
+        task->tStep = FISHING_START_ROUND;
     }
-    else if (task->data[12] < 2)
+    else if (task->tRoundsPlayed < 2)
     {
-        s16 randVal = Random() % 100;
+        // probability of having to play another round
+        s16 probability = Random() % 100;
 
-        if (arr[task->data[15]][task->data[12]] > randVal)
-            task->data[0] = 3;
+        if (arr[task->tFishingRod][task->tRoundsPlayed] > probability)
+            task->tStep = FISHING_START_ROUND;
     }
     return 0;
 }
@@ -1591,72 +1615,73 @@ u8 Fishing9(struct Task *task)
 u8 Fishing10(struct Task *task)
 {
     sub_805A954();
-    sub_8072044(gOtherText_PokeOnHook);
+    MenuPrintMessageDefaultCoords(gOtherText_PokeOnHook);
     MenuDisplayMessageBox();
-    task->data[0]++;
-    task->data[1] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
     return 0;
 }
 
 u8 Fishing11(struct Task *task)
 {
-    if (task->data[1] == 0)
-    {
+    if (task->tFrameCounter == 0)
         sub_805A954();
-        if (task->data[1] == 0)
+
+    if (task->tFrameCounter == 0)
+    {
+        if (MenuUpdateWindowText())
         {
-            if (MenuUpdateWindowText())
-            {
-                struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-
-                sub_805B980(playerMapObj, task->data[14]);
-                FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
-                if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-                    sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
-                gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
-                gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
-                MenuZeroFillScreen();
-                task->data[1]++;
-                return 0;
-            }
-            else
-            {
-                if (task->data[1] == 0)
-                    return 0;
-            }
+            struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+            sub_805B980(playerMapObj, task->tPlayerGfxId);
+            FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
+            if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+                sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
+            gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+            gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+            MenuZeroFillScreen();
+            task->tFrameCounter++;
+            return 0;
         }
     }
-    gPlayerAvatar.unk6 = 0;
-    ScriptContext2_Disable();
-    FishingWildEncounter(task->data[15]);
-    sub_80BE97C(1);
-    DestroyTask(FindTaskIdByFunc(Task_Fishing));
+
+    if (task->tFrameCounter != 0)
+    {
+        gPlayerAvatar.unk6 = 0;
+        ScriptContext2_Disable();
+        FishingWildEncounter(task->tFishingRod);
+        sub_80BE97C(1);
+        DestroyTask(FindTaskIdByFunc(Task_Fishing));
+    }
     return 0;
 }
 
+// Not even a nibble
 u8 Fishing12(struct Task *task)
 {
     sub_805A954();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
-    sub_8072044(gOtherText_NotEvenANibble);
-    task->data[0] = 13;
+    MenuPrintMessageDefaultCoords(gOtherText_NotEvenANibble);
+    task->tStep = FISHING_SHOW_RESULT;
     return 1;
 }
 
+// It got away
 u8 Fishing13(struct Task *task)
 {
     sub_805A954();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
-    sub_8072044(gOtherText_ItGotAway);
-    task->data[0]++;
+    MenuPrintMessageDefaultCoords(gOtherText_ItGotAway);
+    task->tStep++;
     return 1;
 }
 
+// Display the message
 u8 Fishing14(struct Task *task)
 {
     sub_805A954();
     MenuDisplayMessageBox();
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
@@ -1667,13 +1692,13 @@ u8 Fishing15(struct Task *task)
     {
         struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
 
-        sub_805B980(playerMapObj, task->data[14]);
+        sub_805B980(playerMapObj, task->tPlayerGfxId);
         FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
         if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
             sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
         gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
         gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
-        task->data[0]++;
+        task->tStep++;
     }
     return 0;
 }
@@ -1692,6 +1717,10 @@ u8 Fishing16(struct Task *task)
     return 0;
 }
 
+#undef tStep
+#undef tFrameCounter
+#undef tFishingRod
+
 static void sub_805A954(void)
 {
     struct Sprite *playerSprite = &gSprites[gPlayerAvatar.spriteId];
diff --git a/src/field_poison.c b/src/field_poison.c
index 8c9e029e1..1244b9c62 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -108,7 +108,7 @@ void ExecuteWhiteOut(void)
     ScriptContext1_Stop();
 }
 
-s32 overworld_poison(void)
+s32 DoPoisonFieldEffect(void)
 {
     struct Pokemon *pkmn = &gPlayerParty[0];
     u32 numPoisoned = 0;
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 79913e1c5..1464a99b1 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -3,7 +3,7 @@
 #include "field_camera.h"
 #include "menu.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "task.h"
 #include "text.h"
@@ -21,11 +21,11 @@ extern u16 gUnknown_03004DE0[][0x3C0];
 
 const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
 
-const s32 gUnknown_0839ACE8 = 4;
+const s32 gMaxFlashLevel = 4;
 
-const static u32 gUnknown_0839ACEC[3] =
+const static struct UnknownTaskStruct gUnknown_0839ACEC =
 {
-    REG_ADDR_WIN0H,
+    (void *)REG_ADDR_WIN0H,
     ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
     1
 };
@@ -137,11 +137,11 @@ static u8 sub_8081534(s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, u8 a6)
 
 void sub_8081594(u8 a1)
 {
-    u8 index = sav1_get_flash_used_on_map();
+    u8 flashLevel = Overworld_GetFlashLevel();
     u8 value = 0;
     if (!a1)
         value = 1;
-    sub_8081534(120, 80, gUnknown_0839ACDC[index], gUnknown_0839ACDC[a1], value, 1);
+    sub_8081534(120, 80, gUnknown_0839ACDC[flashLevel], gUnknown_0839ACDC[a1], value, 1);
     sub_8081510();
     ScriptContext2_Enable();
 }
@@ -220,7 +220,8 @@ static void sub_80816A8(u8 taskId)
         REG_WINOUT = 30;
         sub_8081398(&gUnknown_03004DE0[0][0], data[2], data[3], 1);
         CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480);
-        sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        //sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        sub_80895F8(gUnknown_0839ACEC);
         data[0] = 1;
         break;
     case 1:
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 82a7a13e3..38c076c51 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -8,7 +8,7 @@
 #include "fieldmap.h"
 #include "main.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_movement.h"
 #include "songs.h"
@@ -273,7 +273,7 @@ void Task_HandlePorthole(u8 taskId)
     case IDLE_CHECK: // idle and move.
         if (gMain.newKeys & A_BUTTON)
             data[1] = 1;
-        if (!sub_80A212C(0xFF, location->mapNum, location->mapGroup))
+        if (!ScriptMovement_IsObjectMovementFinished(0xFF, location->mapNum, location->mapGroup))
             return;
         if (CountSSTidalStep(1) == TRUE)
         {
@@ -294,18 +294,18 @@ void Task_HandlePorthole(u8 taskId)
         // run this once.
         if (*var == 2) // which direction?
         {
-            exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F);
+            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F);
             data[0] = IDLE_CHECK; // run case 1.
         }
         else
         {
-            exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D2961);
+            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_083D2961);
             data[0] = IDLE_CHECK; // run case 1.
         }
         break;
     case EXIT_PORTHOLE: // exit porthole.
-        FlagReset(0x4001);
-        FlagReset(0x4000);
+        FlagClear(0x4001);
+        FlagClear(0x4000);
         copy_saved_warp2_bank_and_enter_x_to_warp1(0);
         sp13E_warp_to_last_warp();
         DestroyTask(taskId);
diff --git a/src/field_specials.c b/src/field_specials.c
index 454bd8d96..c23ea2ddc 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -12,7 +12,7 @@
 #include "field_player_avatar.h"
 #include "main.h"
 #include "map_constants.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "string_util.h"
@@ -61,44 +61,44 @@ static void RecordCyclingRoadResults(u32, u8);
 
 static struct ElevatorMenu gUnknown_03000760[20];
 
-void sub_810D6A4(void) {
-    SetMainCallback2(sub_8145D88);
+void ScrSpecial_ShowDiploma(void)
+{
+    SetMainCallback2(CB2_ShowDiploma);
     ScriptContext2_Enable();
 }
 
-void sub_810D6B8(void) {
+void ScrSpecial_ViewWallClock(void)
+{
     gMain.savedCallback = c2_exit_to_overworld_2_switch;
     SetMainCallback2(CB2_ViewWallClock);
     ScriptContext2_Enable();
 }
 
-void ResetCyclingRoadChallengeData(void) {
+void ResetCyclingRoadChallengeData(void)
+{
     gUnknown_02039250 = 0;
     gUnknown_02039251 = 0;
     gUnknown_02039254 = 0;
 }
 
-void BeginCyclingRoadChallenge(void) {
+void ScrSpecial_BeginCyclingRoadChallenge(void)
+{
     gUnknown_02039250 = 1;
     gUnknown_02039251 = 0;
     gUnknown_02039254 = gMain.vblankCounter1;
 }
 
-u16 GetPlayerAvatarBike(void) {
+u16 GetPlayerAvatarBike(void)
+{
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
-    {
         return 1;
-    }
-
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
-    {
         return 2;
-    }
-
     return 0;
 }
 
-void DetermineCyclingRoadResults(u32 arg0, u8 arg1) {
+static void DetermineCyclingRoadResults(u32 arg0, u8 arg1)
+{
     u8 result;
 
     if (arg1 <= 99)
@@ -225,7 +225,7 @@ void SetSSTidalFlag(void)
 
 void ResetSSTidalFlag(void)
 {
-    FlagReset(SYS_CRUISE_MODE);
+    FlagClear(SYS_CRUISE_MODE);
 }
 
 bool32 CountSSTidalStep(u16 delta)
@@ -1453,7 +1453,7 @@ void ResetTrickHouseEndRoomFlag(void)
     u16 *specVar = &gSpecialVar_0x8004;
     u16 flag = 0x259;
     *specVar = flag;
-    FlagReset(flag);
+    FlagClear(flag);
 }
 
 bool8 CheckLeadMonCool(void)
@@ -1868,7 +1868,7 @@ void GivLeadMonEffortRibbon(void)
     SetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_EFFORT_RIBBON, &ribbonSet);
 }
 
-bool8 GetLeadMonEVCount(void)
+bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
 {
     if (GetMonEVCount(&gPlayerParty[GetLeadMonIndex()]) >= 510)
     {
@@ -1919,7 +1919,7 @@ bool8 IsStarterInParty(void)
     u8 i;
     u16 starter = GetStarterPokemon(VarGet(VAR_FIRST_POKE));
     u8 partyCount = CalculatePlayerPartyCount();
-    for (i=0; i<partyCount; i++)
+    for (i = 0; i < partyCount; i++)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == starter)
         {
@@ -2005,7 +2005,7 @@ bool8 sub_810F828(void)
 
 void SetRoute119Weather(void)
 {
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE)
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()) != TRUE)
     {
         SetSav1Weather(0x14);
     }
@@ -2013,7 +2013,7 @@ void SetRoute119Weather(void)
 
 void SetRoute123Weather(void)
 {
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE)
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()) != TRUE)
     {
         SetSav1Weather(0x15);
     }
@@ -2140,10 +2140,10 @@ void sub_810FAA0(void)
         sub_810FF48();
         sub_810FD80();
         gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
-        FlagReset(0x315);
-        FlagReset(0x316);
-        FlagReset(0x317);
-        FlagReset(0x318);
+        FlagClear(0x315);
+        FlagClear(0x316);
+        FlagClear(0x317);
+        FlagClear(0x318);
         VarSet(VAR_0x4095, 1);
     }
 }
diff --git a/src/field_tasks.c b/src/field_tasks.c
index caf2ce6b9..2be54f923 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -10,7 +10,7 @@
 #include "item.h"
 #include "items.h"
 #include "event_data.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "clock.h"
 #include "script.h"
 #include "field_special_scene.h"
@@ -48,21 +48,25 @@ void Task_RunPerStepCallback(u8 taskId)
     gUnknown_08376364[idx](taskId);
 }
 
-static void RunTimeBasedEvents(s16 *taskData)
+#define tState           data[0]
+#define tAmbientCryState data[1]
+#define tAmbientCryDelay data[2]
+
+static void RunTimeBasedEvents(s16 *data)
 {
-    switch (*taskData)
+    switch (tState)
     {
         case 0:
             if (gMain.vblankCounter1 & 0x1000)
             {
                 DoTimeBasedEvents();
-                (*taskData)++;
+                tState++;
             }
             break;
         case 1:
             if (!(gMain.vblankCounter1 & 0x1000))
             {
-                (*taskData)--;
+                tState--;
             }
             break;
     }
@@ -70,14 +74,19 @@ static void RunTimeBasedEvents(s16 *taskData)
 
 void Task_RunTimeBasedEvents(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
+
     if (!ScriptContext2_IsEnabled())
     {
-        RunTimeBasedEvents(taskData);
-        sub_80540D0(taskData + 1, taskData + 2);
+        RunTimeBasedEvents(data);
+        UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay);
     }
 }
 
+#undef tState
+#undef tAmbientCryState
+#undef tAmbientCryDelay
+
 void Task_MuddySlope(u8);
 
 void SetUpFieldTasks(void)
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 0e0ec246c..3ad190a4b 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "fieldmap.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "secret_base.h"
 #include "tv.h"
@@ -31,7 +31,7 @@ static const struct ConnectionFlags sDummyConnectionFlags = {0};
 
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection)
 {
-    return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum);
+    return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
 void not_trainer_hill_battle_pyramid(void)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index b394d1e4c..00643a979 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -8,7 +8,7 @@
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
@@ -28,7 +28,7 @@ extern struct MapPosition gUnknown_0203923C;
 
 extern u8 gLastFieldPokeMenuOpened;
 
-extern u8 UseCutScript;
+extern u8 S_UseCut[];
 
 bool8 SetUpFieldMove_Cut(void)
 {
@@ -38,7 +38,7 @@ bool8 SetUpFieldMove_Cut(void)
 
     if(npc_before_player_of_type(0x52) == TRUE) // is in front of tree?
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_80A2634;
         return TRUE;
     }
@@ -57,7 +57,7 @@ bool8 SetUpFieldMove_Cut(void)
                     if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
                     || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE)
                     {
-                        gFieldCallback = sub_808AB90;
+                        gFieldCallback = FieldCallback_Teleport;
                         gUnknown_03005CE4 = sub_80A25E8;
                         return TRUE;
                     }
@@ -70,8 +70,8 @@ bool8 SetUpFieldMove_Cut(void)
 
 void sub_80A25E8(void)
 {
-    FieldEffectStart(1);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_CUT_ON_GRASS);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_UseCutOnGrass(void)
@@ -86,8 +86,8 @@ bool8 FldEff_UseCutOnGrass(void)
 
 void sub_80A2634(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(&UseCutScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)
@@ -102,8 +102,8 @@ bool8 FldEff_UseCutOnTree(void)
 
 void sub_80A2684(void)
 {
-    FieldEffectActiveListRemove(1);
-    FieldEffectStart(0x3A);
+    FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_GRASS);
+    FieldEffectStart(FLDEFF_CUT_GRASS);
 }
 
 bool8 FldEff_CutGrass(void)
@@ -272,19 +272,16 @@ void sub_80A2AB8(void)
 {
     u8 i;
 
-    for(i = 1; i < 8; i++)
-    {
+    for (i = 1; i < 8; i++)
         DestroySprite(&gSprites[gCutGrassSpriteArray[i]]);
-    }
-
-    FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], 0x3A);
+    FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS);
     sub_8064E2C();
     ScriptContext2_Disable();
 }
 
 void sub_80A2B00(void)
 {
-    PlaySE(0x80);
-    FieldEffectActiveListRemove(2);
+    PlaySE(SE_W015);
+    FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 6c2633567..1ee8a8f05 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "palette.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
@@ -51,7 +51,7 @@ bool8 SetUpFieldMove_Flash(void)
 {
     if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH))
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810CBFC;
         return TRUE;
     }
@@ -62,7 +62,7 @@ bool8 SetUpFieldMove_Flash(void)
 void sub_810CBFC(void)
 {
     u8 taskId = oei_task_add();
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
     gTasks[taskId].data[8] = (uintptr_t)sub_810CC34 >> 16;
     gTasks[taskId].data[9] = (uintptr_t)sub_810CC34;
 }
@@ -123,8 +123,8 @@ void sub_810CC80(void)
 bool8 sub_810CD5C(void)
 {
     u8 i;
-    u8 v0 = get_map_light_from_warp0();
-    u8 v1 = sav1_map_get_light_level();
+    u8 v0 = get_map_type_from_warp0();
+    u8 v1 = Overworld_GetMapTypeOfSaveblockLocation();
 
     for (i = 0; gUnknown_083F7FC4[i].unk0; i++)
     {
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 81f4f63c6..d9603d094 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -18,14 +18,14 @@ extern u16 gScriptResult;
 extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
 
-extern u8 UseStrengthScript[];
+extern u8 S_UseStrength[];
 
 bool8 SetUpFieldMove_Strength(void)
 {
     if (ShouldDoBrailleStrengthEffect())
     {
         gScriptResult = gLastFieldPokeMenuOpened;
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA38;
     }
     else
@@ -33,7 +33,7 @@ bool8 SetUpFieldMove_Strength(void)
         if (npc_before_player_of_type(87) != TRUE)
             return 0;
         gScriptResult = gLastFieldPokeMenuOpened;
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA18;
     }
 
@@ -42,14 +42,14 @@ bool8 SetUpFieldMove_Strength(void)
 
 static void sub_811AA18(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(UseStrengthScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseStrength);
 }
 
 static void sub_811AA38(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    FieldEffectStart(40);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_STRENGTH);
 }
 
 bool8 FldEff_UseStrength(void)
@@ -58,7 +58,7 @@ bool8 FldEff_UseStrength(void)
 
     gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
     gTasks[taskId].data[9] = (u32)sub_811AA9C;
-    GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1);
+    GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
     return FALSE;
 }
 
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 4c3e6bf4a..b9dbf619d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -23,15 +23,15 @@ extern u8 SweetScentNothingHereScript[];
 
 bool8 SetUpFieldMove_SweetScent(void)
 {
-    gFieldCallback = sub_808AB90;
+    gFieldCallback = FieldCallback_Teleport;
     gUnknown_03005CE4 = sub_812BFD4;
     return TRUE;
 }
 
 static void sub_812BFD4(void)
 {
-    FieldEffectStart(51);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_SWEET_SCENT);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_SweetScent()
@@ -51,7 +51,7 @@ static void sub_812C01C(void)
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F);
     taskId = CreateTask(sub_812C084, 0);
     gTasks[taskId].data[0] = 0;
-    FieldEffectActiveListRemove(51);
+    FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
 }
 
 static void sub_812C084(u8 taskId)
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 74e68df06..af48fb414 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -3,7 +3,7 @@
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "task.h"
 
@@ -13,9 +13,9 @@ extern void (*gUnknown_03005CE4)(void);
 
 bool8 SetUpFieldMove_Teleport(void)
 {
-    if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE)
+    if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = hm_teleport_run_dp02scr;
         return TRUE;
     }
@@ -25,9 +25,9 @@ bool8 SetUpFieldMove_Teleport(void)
 
 void hm_teleport_run_dp02scr(void)
 {
-    new_game();
-    FieldEffectStart(63);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    Overworld_ResetStateAfterTeleport();
+    FieldEffectStart(FLDEFF_USE_TELEPORT);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_UseTeleport(void)
@@ -41,6 +41,6 @@ bool8 FldEff_UseTeleport(void)
 
 void sub_814A404(void)
 {
-    FieldEffectActiveListRemove(63);
+    FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT);
     sub_8087BA8();
 }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 78909e289..10c999ef3 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "save.h"
 #include "species.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "m4a.h"
 #include "data2.h"
 #include "decompress.h"
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 4646d171c..aeeb7fe17 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -2,7 +2,7 @@
 #include "hall_of_fame.h"
 #include "main.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_menu.h"
 #include "task.h"
@@ -30,8 +30,8 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
     ScriptContext2_Enable();
     sub_8053E90();
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
-    TryCreatePCMenu();
-    sub_80B5838();
+    ScrSpecial_CreatePCMenu();
+    ScriptMenu_DisplayPCStartupPrompt();
     CreateTask(Task_WaitForPaletteFade, 10);
 }
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 4436bdfbe..891eb135f 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -23,7 +23,7 @@
 #include "party_menu.h"
 #include "player_pc.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -3115,7 +3115,7 @@ static void sub_80A6760(u8 taskId)
 static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
 {
     sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31);
-    RemoveMoneyLabelObject(0, 0);
+    CloseMoneyWindow(0, 0);
     MenuZeroFillWindowRect(0, 4, 13, 13);
     MenuZeroFillWindowRect(0, 14, 29, 19);
     gTasks[taskId].func = sub_80A6760;
@@ -3123,20 +3123,20 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
 
 static void BuyMenuDisplayMessage(u16 itemId, u16 quantity)
 {
-    sub_80B7A94(ItemId_GetPrice(itemId) / 2 * quantity, 6, 6, 11);
+    PrintMoneyAmount(ItemId_GetPrice(itemId) / 2 * quantity, 6, 6, 11);
     ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(itemId) / 2 * quantity, STR_CONV_MODE_LEFT_ALIGN, 6);
 }
 
 static void sub_80A683C(void)
 {
-    sub_80B7C14(gSaveBlock1.money, 0, 0);
+    OpenMoneyWindow(gSaveBlock1.money, 0, 0);
     sub_80A4008(gBGTilemapBuffers[1], 1, 1, 12, 2);
 }
 
 static void sub_80A6870(u16 itemId, u8 quantity)
 {
-    sub_80B79B8(&gSaveBlock1.money, ItemId_GetPrice(itemId) / 2 * quantity);
-    sub_80B7BEC(gSaveBlock1.money, 0, 0);
+    AddMoney(&gSaveBlock1.money, ItemId_GetPrice(itemId) / 2 * quantity);
+    UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
 }
 
 static void sub_80A68A4(void)
diff --git a/src/item_use.c b/src/item_use.c
index 1750c1584..8bc83bdc6 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -26,7 +26,7 @@
 #include "pokeblock.h"
 #include "pokemon_item_effect.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom_8094928.h"
 #include "script.h"
 #include "songs.h"
@@ -36,10 +36,10 @@
 #include "task.h"
 #include "vars.h"
 
-extern void (* gUnknown_03005D00)(u8);
-extern void (* gFieldCallback)(void);
-extern void (* gUnknown_0300485C)(void);
-extern void (* gUnknown_03004AE4)(u8, u16, TaskFunc);
+extern void (*gUnknown_03005D00)(u8);
+extern void (*gFieldCallback)(void);
+extern void (*gUnknown_0300485C)(void);
+extern void (*gUnknown_03004AE4)(u8, u16, TaskFunc);
 
 extern u8 gUnknown_02038561;
 extern u8 gLastFieldPokeMenuOpened;
@@ -185,7 +185,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
     }
     else
     {
-        if (IsBikingAllowedByMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE)
+        if (Overworld_IsBikeAllowedOnCurrentMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE)
         {
             gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Bike;
             SetUpItemUseOnFieldCallback(taskId);
@@ -342,7 +342,7 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
     sub_80C9720(taskId);
 
     // hidden item detected?
-    if(gTasks[taskId].data[2] == TRUE)
+    if (gTasks[taskId].data[2] == TRUE)
         return TRUE;
     else
         return FALSE;
@@ -354,11 +354,11 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y)
     struct BgEvent *bgEvent = events->bgEvents;
     int i;
 
-    for(i = 0; i < bgEventCount; i++)
+    for (i = 0; i < bgEventCount; i++)
     {
-        if(bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
+        if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
         {
-            if(!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 600))
+            if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 600))
                 return TRUE;
             else
                 return FALSE;
@@ -376,7 +376,7 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y)
 
     mapHeader = mapconnection_get_mapheader(connection);
 
-    switch(connection->direction)
+    switch (connection->direction)
     {
     // same weird temp variable behavior seen in HiddenItemAtPos
     case 2:
@@ -592,7 +592,7 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
     s16 *data = gTasks[taskId].data;
     s16 var1, var2, var3, var4;
 
-    if(data[2] == FALSE)
+    if (data[2] == FALSE)
     {
         data[0] = x;
         data[1] = y;
@@ -602,34 +602,34 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
     {
         // data[0] and data[1] contain the player's coordinates.
         // x and y contain the item's coordinates.
-        if(data[0] < 0)
+        if (data[0] < 0)
             var1 = data[0] * -1; // item is to the left
         else
             var1 = data[0]; // item is to the right
 
-        if(data[1] < 0)
+        if (data[1] < 0)
             var2 = data[1] * -1; // item is to the north
         else
             var2 = data[1]; // item is to the south
 
-        if(x < 0)
+        if (x < 0)
             var3 = x * -1;
         else
             var3 = x;
 
-        if(y < 0)
+        if (y < 0)
             var4 = y * -1;
         else
             var4 = y;
 
-        if(var1 + var2 > var3 + var4)
+        if (var1 + var2 > var3 + var4)
         {
             data[0] = x;
             data[1] = y;
         }
         else
         {
-            if(var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y)))
+            if (var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y)))
             {
                 data[0] = x;
                 data[1] = y;
@@ -642,40 +642,40 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
 {
     s16 abX, abY;
 
-    if(itemX == 0 && itemY == 0)
+    if (itemX == 0 && itemY == 0)
         return DIR_NONE; // player is standing on the item.
 
     // get absolute X distance.
-    if(itemX < 0)
+    if (itemX < 0)
         abX = itemX * -1;
     else
         abX = itemX;
 
     // get absolute Y distance.
-    if(itemY < 0)
+    if (itemY < 0)
         abY = itemY * -1;
     else
         abY = itemY;
 
-    if(abX > abY)
+    if (abX > abY)
     {
-        if(itemX < 0)
+        if (itemX < 0)
             return DIR_EAST;
         else
             return DIR_NORTH;
     }
     else
     {
-        if(abX < abY)
+        if (abX < abY)
         {
-            if(itemY < 0)
+            if (itemY < 0)
                 return DIR_SOUTH;
             else
                 return DIR_WEST;
         }
-        if(abX == abY)
+        if (abX == abY)
         {
-            if(itemY < 0)
+            if (itemY < 0)
                 return DIR_SOUTH;
             else
                 return DIR_WEST;
@@ -694,7 +694,7 @@ void SetPlayerDirectionTowardsItem(u8 direction)
 
 void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId)
 {
-    if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
         DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0);
 }
 
@@ -702,7 +702,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
     || data[2] == FALSE)
     {
         SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]);
@@ -710,18 +710,18 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
         data[5] = (data[5] + 1) & 3;
         data[3]++;
 
-        if(data[3] == 4)
+        if (data[3] == 4)
             DisplayItemMessageOnField(taskId, gOtherText_ItemfinderItemUnderfoot, ExitItemfinder, 0);
     }
 }
 
 void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
 {
-    if(sub_80F9344() == TRUE)
+    if (sub_80F9344() == TRUE)
     {
         DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]);
     }
-    else if(gTasks[taskId].data[2] != TRUE)
+    else if (gTasks[taskId].data[2] != TRUE)
     {
         sub_810BA7C(0);
         ItemMenu_ConfirmNormalFade(taskId);
@@ -739,7 +739,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
     ConvertIntToDecimalStringN(gStringVar1, GetCoins(), 0, 4);
     StringExpandPlaceholders(gStringVar4, gOtherText_Coins3);
 
-    if(!gTasks[taskId].data[2])
+    if (!gTasks[taskId].data[2])
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
@@ -752,20 +752,20 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
 
 void sub_80C9BB8(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
         CleanUpItemMenuMessage(var);
 }
 
 void sub_80C9BD8(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
         CleanUpOverworldMessage(var);
 }
 
 // unused
 void ItemUseOutOfBattle_SSTicket(u8 taskId)
 {
-    if(gTasks[taskId].data[2] == 0)
+    if (gTasks[taskId].data[2] == 0)
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
         DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BB8, 1);
@@ -778,7 +778,7 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId)
 
 void sub_80C9C7C(u8 taskId)
 {
-    if(IsPlayerFacingPlantedBerryTree() == TRUE)
+    if (IsPlayerFacingPlantedBerryTree() == TRUE)
     {
         gUnknown_03005D00 = sub_80C9D00;
         gFieldCallback = ExecuteItemUseFromBlackPalette;
@@ -803,7 +803,7 @@ void sub_80C9D00(u8 taskId)
 
 void ItemUseOutOfBattle_WailmerPail(u8 taskId)
 {
-    if(TryToWaterBerryTree() == TRUE)
+    if (TryToWaterBerryTree() == TRUE)
     {
         gUnknown_03005D00 = sub_80C9D74;
         SetUpItemUseOnFieldCallback(taskId);
@@ -839,9 +839,9 @@ void ItemUseOutOfBattle_SacredAsh(u8 taskId)
 
     gLastFieldPokeMenuOpened = 0;
 
-    for(i = 0; i < 6; i++)
+    for (i = 0; i < 6; i++)
     {
-        if(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
         {
             gLastFieldPokeMenuOpened = i;
             break;
@@ -874,7 +874,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(gScriptItemId >= ITEM_HM01)
+    if (gScriptItemId >= ITEM_HM01)
         DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM
     else
         DisplayItemMessageOnField(taskId, gOtherText_BootedTM, sub_80C9EE4, 1); // TM
@@ -882,13 +882,13 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 
 void sub_80C9EE4(u8 taskId)
 {
-    PlaySE(2);
+    PlaySE(SE_PC_LOGON);
     gTasks[taskId].func = sub_80C9F10;
 }
 
 void sub_80C9F10(u8 taskId)
 {
-    if(gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
     {
         StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gScriptItemId)]);
         StringExpandPlaceholders(gStringVar4, gOtherText_ContainsMove);
@@ -919,7 +919,7 @@ void sub_80C9FDC(void)
 
 void ItemUseOutOfBattle_Repel(u8 var)
 {
-    if(VarGet(VAR_REPEL_STEP_COUNT) == FALSE)
+    if (VarGet(VAR_REPEL_STEP_COUNT) == FALSE)
     {
         VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gScriptItemId));
         sub_80C9FDC();
@@ -941,26 +941,26 @@ void sub_80CA098(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(0x75);
+        PlaySE(SE_BIDORO);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
     }
 }
 
 void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId)
 {
-    if(gScriptItemId == 43)
+    if (gScriptItemId == ITEM_WHITE_FLUTE)
     {
         FlagSet(SYS_ENC_UP_ITEM);
-        FlagReset(SYS_ENC_DOWN_ITEM);
+        FlagClear(SYS_ENC_DOWN_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedFlute);
         gTasks[taskId].func = sub_80CA098;
         gTasks[taskId].data[15] = 0;
     }
-    else if(gScriptItemId == 42)
+    else if (gScriptItemId == ITEM_BLACK_FLUTE)
     {
         FlagSet(SYS_ENC_DOWN_ITEM);
-        FlagReset(SYS_ENC_UP_ITEM);
+        FlagClear(SYS_ENC_UP_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedRepel);
         gTasks[taskId].func = sub_80CA098;
@@ -983,9 +983,9 @@ void sub_80CA18C(u8 taskId)
     DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44, 0);
 }
 
-bool8 sub_80CA1C8(void)
+bool8 CanUseEscapeRopeOnCurrMap(void)
 {
-    if(gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
         return TRUE;
     else
         return FALSE;
@@ -993,7 +993,7 @@ bool8 sub_80CA1C8(void)
 
 void ItemUseOutOfBattle_EscapeRope(u8 taskId)
 {
-    if(sub_80CA1C8() == TRUE) // is map type an area you can use escape rope?
+    if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
         gUnknown_03005D00 = sub_80CA18C;
         SetUpItemUseOnFieldCallback(taskId);
@@ -1012,7 +1012,7 @@ void ItemUseOutOfBattle_EvolutionStone(u8 var)
 
 void ItemUseInBattle_PokeBall(u8 var)
 {
-    if(PlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
+    if (PlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
     {
         RemoveBagItem(gScriptItemId, 1);
         sub_80A7094(var);
@@ -1026,7 +1026,7 @@ void ItemUseInBattle_PokeBall(u8 var)
 
 void sub_80CA294(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
         sub_80A7094(var);
 }
 
@@ -1034,7 +1034,7 @@ void sub_80CA2BC(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(1);
+        PlaySE(SE_KAIFUKU);
         RemoveBagItem(gScriptItemId, 1);
         DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1);
     }
@@ -1046,7 +1046,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
+    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
     {
         DisplayItemMessageOnField(taskId, gOtherText_WontHaveAnyEffect, CleanUpItemMenuMessage, 1);
     }
@@ -1059,7 +1059,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 
 void sub_80CA394(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         sub_8094E4C();
         gpu_pal_allocator_reset__manage_upper_four();
@@ -1095,7 +1095,7 @@ void unref_sub_80CA448(u8 var)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
+    if (ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
     {
         RemoveBagItem(gScriptItemId, 1);
         GetMonNickname(&gPlayerParty[0], gStringVar1);
@@ -1125,7 +1125,7 @@ void ItemUseInBattle_Escape(u8 taskId)
 
 void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 {
-    switch(GetItemEffectType(gScriptItemId) - 1)
+    switch (GetItemEffectType(gScriptItemId) - 1)
     {
     case 1:
     case 2:
@@ -1168,7 +1168,7 @@ void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 
 void ItemUseInBattle_EnigmaBerry(u8 taskId)
 {
-    switch(GetItemEffectType(gScriptItemId))
+    switch (GetItemEffectType(gScriptItemId))
     {
     case 0:
         ItemUseInBattle_StatIncrease(taskId);
diff --git a/src/learn_move.c b/src/learn_move.c
index 51de68171..33252c66b 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -6,7 +6,7 @@
 #include "menu_cursor.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
diff --git a/src/load_save.c b/src/load_save.c
index 730aea2b8..8424b1121 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -3,7 +3,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 
 extern u8 gPlayerPartyCount;
 
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 99195ec00..2e1d140b4 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -45,7 +45,7 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
     mplayInfo->ident = ID_NUMBER;
 }
 
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch)
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
 {
     s32 i;
     u32 bit;
diff --git a/src/mail.c b/src/mail.c
index 658d37976..c5dd119e3 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -8,7 +8,7 @@
 #include "name_string_util.h"
 #include "palette.h"
 #include "pokemon_icon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
@@ -92,7 +92,7 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 
     ewram0.varFF = GAME_LANGUAGE;
     ewram0.var100 = 1;
-    ewram0.var104 = (MainCallback)sub_80EB3FC;
+    ewram0.var104 = (MainCallback)EasyChat_GetWordText;
     ewram0.var108 = (MainCallback)ConvertEasyChatWordsToString;
 
     mailDesign = arg0->itemId - ITEM_ORANGE_MAIL;
diff --git a/src/main.c b/src/main.c
index afaa0e77a..d7c11b6c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@
 #include "play_time.h"
 #include "rng.h"
 #include "rom3.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "siirtc.h"
 #include "sound.h"
diff --git a/src/main_menu.c b/src/main_menu.c
index 3b616065b..e0af86f3d 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -10,7 +10,7 @@
 #include "option_menu.h"
 #include "palette.h"
 #include "pokeball.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "save_menu_util.h"
 #include "songs.h"
@@ -56,32 +56,14 @@ extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
 extern u8 unk_2000000[];
 
-//Task data
-enum {
-    TD_MENULAYOUT,
-    TD_SELECTEDMENUITEM,
-};
-
 //Menu layouts
-enum {
+enum
+{
     HAS_NO_SAVED_GAME,  //NEW GAME, OPTION
     HAS_SAVED_GAME,     //CONTINUE, NEW GAME, OPTION
     HAS_MYSTERY_GIFT,   //CONTINUE, NEW GAME, MYSTERY EVENTS, OPTION
 };
 
-//Task data
-enum {
-    TD_TRAINER_SPRITE_ID = 2,       //Trainer sprite being displayed during gender menu
-    TD_BGHOFS = 4,                  //Used to set REG_BG1HOFS and slide the platform around
-    TD_SUBTASK_DONE,                //Set to true if the spawned task has finished
-    TD_GENDER_SELECTION,
-    TD_COUNTER,
-    TD_BIRCH_SPRITE_ID,
-    TD_AZURILL_SPRITE_ID,
-    TD_BRENDAN_SPRITE_ID,
-    TD_MAY_SPRITE_ID
-};
-
 static void CB2_MainMenu(void);
 static void VBlankCB_MainMenu(void);
 static void CB2_InitMainMenuFromOptions(void);
@@ -180,6 +162,9 @@ static void CB2_InitMainMenuFromOptions(void)
     InitMainMenu(TRUE);
 }
 
+#define tMenuLayout    data[0]
+#define tMenuSelection data[1]
+
 u32 InitMainMenu(u8 a1)
 {
     u16 savedIme;
@@ -239,7 +224,7 @@ u32 InitMainMenu(u8 a1)
                 | DISPCNT_WIN0_ON;
 
     taskId = CreateTask(Task_MainMenuCheckSave, 0);
-    gTasks[taskId].data[TD_SELECTEDMENUITEM] = 0;
+    gTasks[taskId].tMenuSelection = 0;
 
     return 0;
 }
@@ -261,9 +246,9 @@ void Task_MainMenuCheckSave(u8 taskId)
     {
     case 1:
         if (IsMysteryGiftEnabled() == TRUE)
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
+            gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT;
         else
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+            gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
 
         gTasks[taskId].func = Task_MainMenuCheckRtc;
         break;
@@ -272,7 +257,7 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gSaveFileDeletedMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
         break;
     case 255:
@@ -280,17 +265,17 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gSaveFileCorruptMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
 
         if (IsMysteryGiftEnabled() == TRUE)
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
+            gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT;
         else
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+            gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
         break;
     case 0:
     default:
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuCheckRtc;
         break;
     case 4:
@@ -298,7 +283,7 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gBoardNotInstalledMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
         return;
     }
@@ -383,7 +368,7 @@ void Task_MainMenuDraw(u8 taskId)
             LoadPalette(&palette, 241, 2);
         }
 
-        switch (gTasks[taskId].data[TD_MENULAYOUT])
+        switch (gTasks[taskId].tMenuLayout)
         {
         case HAS_NO_SAVED_GAME:
         default:
@@ -420,7 +405,7 @@ void Task_MainMenuDraw(u8 taskId)
 
 void Task_MainMenuHighlight(u8 taskId)
 {
-    HighlightCurrentMenuItem(gTasks[taskId].data[TD_MENULAYOUT], gTasks[taskId].data[TD_SELECTEDMENUITEM]);
+    HighlightCurrentMenuItem(gTasks[taskId].tMenuLayout, gTasks[taskId].tMenuSelection);
     gTasks[taskId].func = Task_MainMenuProcessKeyInput;
 }
 
@@ -444,7 +429,7 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
     {
         s32 menuItemCount;
 
-        switch (gTasks[taskId].data[TD_MENULAYOUT])
+        switch (gTasks[taskId].tMenuLayout)
         {
         case HAS_NO_SAVED_GAME:
         default:
@@ -460,17 +445,17 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
 
         if (gMain.newKeys & DPAD_UP)
         {
-            if (gTasks[taskId].data[TD_SELECTEDMENUITEM] > 0)
+            if (gTasks[taskId].tMenuSelection > 0)
             {
-                gTasks[taskId].data[TD_SELECTEDMENUITEM]--;
+                gTasks[taskId].tMenuSelection--;
                 return TRUE;
             }
         }
         if (gMain.newKeys & DPAD_DOWN)
         {
-            if (gTasks[taskId].data[TD_SELECTEDMENUITEM] < menuItemCount - 1)
+            if (gTasks[taskId].tMenuSelection < menuItemCount - 1)
             {
-                gTasks[taskId].data[TD_SELECTEDMENUITEM]++;
+                gTasks[taskId].tMenuSelection++;
                 return TRUE;
             }
         }
@@ -499,11 +484,11 @@ void Task_MainMenuPressedA(u8 taskId)
     if (gPaletteFade.active)
         return;
 
-    switch (gTasks[taskId].data[TD_MENULAYOUT])
+    switch (gTasks[taskId].tMenuLayout)
     {
     case HAS_NO_SAVED_GAME:
     default:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -515,7 +500,7 @@ void Task_MainMenuPressedA(u8 taskId)
         }
         break;
     case HAS_SAVED_GAME:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -530,7 +515,7 @@ void Task_MainMenuPressedA(u8 taskId)
         }
         break;
     case HAS_MYSTERY_GIFT:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -584,6 +569,9 @@ void Task_MainMenuPressedB(u8 taskId)
     }
 }
 
+#undef tMenuLayout
+#undef tMenuSelection
+
 void HighlightCurrentMenuItem(u8 layout, u8 menuItem)
 {
     REG_WIN0H = WIN_RANGE(9, 231);
@@ -710,6 +698,16 @@ void PrintBadgeCount(void)
     MenuPrint_PixelCoords(buffer, 205, 40, 1);
 }
 
+#define tTrainerSpriteId data[2]
+#define tBGhofs          data[4]
+#define tSubtaskIsDone   data[5]
+#define tGenderSelection data[6]
+#define tFrameCounter    data[7]
+#define tBirchSpriteId   data[8]
+#define tAzurillSpriteId data[9]
+#define tBrendanSpriteId data[10]
+#define tMaySpriteId     data[11]
+
 static void Task_NewGameSpeech1(u8 taskId)
 {
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
@@ -732,25 +730,25 @@ static void Task_NewGameSpeech1(u8 taskId)
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
     REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP;
-    gTasks[taskId].data[TD_BGHOFS] = 0;
+    gTasks[taskId].tBGhofs = 0;
     gTasks[taskId].func = Task_NewGameSpeech2;
-    gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = 0xFF;
+    gTasks[taskId].tTrainerSpriteId = 0xFF;
     gTasks[taskId].data[3] = 0xFF;
-    gTasks[taskId].data[TD_COUNTER] = 216;  //Wait 3.6 seconds (216 frames) before starting speech
+    gTasks[taskId].tFrameCounter = 216;  //Wait 3.6 seconds (216 frames) before starting speech
 
     PlayBGM(BGM_DOORO_X4);
 }
 
 static void Task_NewGameSpeech2(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_COUNTER] != 0)
+    if (gTasks[taskId].tFrameCounter != 0)
     {
-        gTasks[taskId].data[TD_COUNTER]--;
+        gTasks[taskId].tFrameCounter--;
     }
     else
     {
         //Initialize Birch sprite
-        u8 spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        u8 spriteId = gTasks[taskId].tBirchSpriteId;
 
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 60;
@@ -758,19 +756,19 @@ static void Task_NewGameSpeech2(u8 taskId)
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeIn(taskId, 10);
         StartBackgroundFadeIn(taskId, 20);
-        gTasks[taskId].data[TD_COUNTER] = 80;
+        gTasks[taskId].tFrameCounter = 80;
         gTasks[taskId].func = Task_NewGameSpeech3;
     }
 }
 
 static void Task_NewGameSpeech3(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE] != FALSE)
+    if (gTasks[taskId].tSubtaskIsDone)
     {
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_NORMAL;
-        if (gTasks[taskId].data[TD_COUNTER])
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
@@ -801,7 +799,7 @@ static void Task_NewGameSpeech5(u8 taskId)
 
 static void Task_NewGameSpeech6(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tAzurillSpriteId;
 
     gSprites[spriteId].pos1.x = 104;
     gSprites[spriteId].pos1.y = 72;
@@ -809,7 +807,7 @@ static void Task_NewGameSpeech6(u8 taskId)
     gSprites[spriteId].data0 = 0;
     CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF);
     gTasks[taskId].func = Task_NewGameSpeech7;
-    gTasks[taskId].data[TD_COUNTER] = 0;
+    gTasks[taskId].tFrameCounter = 0;
 }
 
 static void Task_NewGameSpeech7(u8 taskId)
@@ -817,18 +815,18 @@ static void Task_NewGameSpeech7(u8 taskId)
     if (IsCryFinished())
     {
         //Go on to next sentence after frame 95
-        if (gTasks[taskId].data[TD_COUNTER] > 95)
+        if (gTasks[taskId].tFrameCounter > 95)
         {
             MenuSetText(gSystemText_NewPara);
             gTasks[taskId].func = Task_NewGameSpeech8;
         }
     }
 
-    if (gTasks[taskId].data[TD_COUNTER] < 16384)
+    if (gTasks[taskId].tFrameCounter < 16384)
     {
-        gTasks[taskId].data[TD_COUNTER]++;
+        gTasks[taskId].tFrameCounter++;
         //Play Azurill cry at frame 32
-        if (gTasks[taskId].data[TD_COUNTER] == 32)
+        if (gTasks[taskId].tFrameCounter == 32)
             PlayCry1(SPECIES_AZURILL, 0);
     }
 }
@@ -859,11 +857,11 @@ static void Task_NewGameSpeech10(u8 taskId)
 {
     if (BirchSpeechUpdateWindowText())
     {
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
-        gSprites[gTasks[taskId].data[TD_AZURILL_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tAzurillSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 2);
         StartBackgroundFadeOut(taskId, 1);
-        gTasks[taskId].data[TD_COUNTER] = 64;
+        gTasks[taskId].tFrameCounter = 64;
         gTasks[taskId].func = Task_NewGameSpeech11;
     }
 }
@@ -871,41 +869,41 @@ static void Task_NewGameSpeech10(u8 taskId)
 //Slide platform away to the right
 static void Task_NewGameSpeech11(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_BGHOFS] != -60)
+    if (gTasks[taskId].tBGhofs != -60)
     {
-        gTasks[taskId].data[TD_BGHOFS] -= 2;
-        REG_BG1HOFS = gTasks[taskId].data[TD_BGHOFS];
+        gTasks[taskId].tBGhofs -= 2;
+        REG_BG1HOFS = gTasks[taskId].tBGhofs;
     }
     else
     {
-        gTasks[taskId].data[TD_BGHOFS] = -60;
+        gTasks[taskId].tBGhofs = -60;
         gTasks[taskId].func = Task_NewGameSpeech12;
     }
 }
 
 static void Task_NewGameSpeech12(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         //Hide Birch and Azurill
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].invisible = TRUE;
-        gSprites[gTasks[taskId].data[TD_AZURILL_SPRITE_ID]].invisible = TRUE;
+        gSprites[gTasks[taskId].tBirchSpriteId].invisible = TRUE;
+        gSprites[gTasks[taskId].tAzurillSpriteId].invisible = TRUE;
 
-        if (gTasks[taskId].data[TD_COUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
             //Initialize Brendan sprite
-            u8 spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+            u8 spriteId = gTasks[taskId].tBrendanSpriteId;
 
             gSprites[spriteId].pos1.x = 180;
             gSprites[spriteId].pos1.y = 60;
             gSprites[spriteId].invisible = FALSE;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
-            gTasks[taskId].data[TD_GENDER_SELECTION] = 0;
+            gTasks[taskId].tTrainerSpriteId = spriteId;
+            gTasks[taskId].tGenderSelection = 0;
             StartSpriteFadeIn(taskId, 2);
             StartBackgroundFadeIn(taskId, 1);
             gTasks[taskId].func = Task_NewGameSpeech13;
@@ -915,9 +913,9 @@ static void Task_NewGameSpeech12(u8 taskId)
 
 static void Task_NewGameSpeech13(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_NORMAL;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         gTasks[taskId].func = Task_NewGameSpeech14;
     }
 }
@@ -964,11 +962,11 @@ static void Task_NewGameSpeech16(u8 taskId)
 
     cursorPos = GetMenuCursorPos();
 
-    if (cursorPos != gTasks[taskId].data[TD_GENDER_SELECTION])
+    if (cursorPos != gTasks[taskId].tGenderSelection)
     {
         //Menu selection changed. Slide Brendan or May out and slide the other in
-        gTasks[taskId].data[TD_GENDER_SELECTION] = cursorPos;
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gTasks[taskId].tGenderSelection = cursorPos;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 0);
         gTasks[taskId].func = Task_NewGameSpeech17;
     }
@@ -977,9 +975,9 @@ static void Task_NewGameSpeech16(u8 taskId)
 //Slide old trainer sprite off right of screen
 static void Task_NewGameSpeech17(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
-    if (gTasks[taskId].data[TD_SUBTASK_DONE] == FALSE)
+    if (gTasks[taskId].tSubtaskIsDone == FALSE)
     {
         gSprites[spriteId].pos1.x += 4;     //Move sprite right
     }
@@ -988,14 +986,14 @@ static void Task_NewGameSpeech17(u8 taskId)
         gSprites[spriteId].invisible = TRUE;
 
         //Set up new trainer sprite
-        if (gTasks[taskId].data[TD_GENDER_SELECTION])
-            spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        if (gTasks[taskId].tGenderSelection)
+            spriteId = gTasks[taskId].tMaySpriteId;
         else
-            spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+            spriteId = gTasks[taskId].tBrendanSpriteId;
         gSprites[spriteId].pos1.x = 240;
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
-        gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+        gTasks[taskId].tTrainerSpriteId = spriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeIn(taskId, 0);
         gTasks[taskId].func = Task_NewGameSpeech18;
@@ -1005,7 +1003,7 @@ static void Task_NewGameSpeech17(u8 taskId)
 //Slide new trainer sprite from right of screen
 static void Task_NewGameSpeech18(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
     if (gSprites[spriteId].pos1.x > 180)
     {
@@ -1014,7 +1012,7 @@ static void Task_NewGameSpeech18(u8 taskId)
     else
     {
         gSprites[spriteId].pos1.x = 180;
-        if (gTasks[taskId].data[TD_SUBTASK_DONE])
+        if (gTasks[taskId].tSubtaskIsDone)
         {
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
             gTasks[taskId].func = Task_NewGameSpeech16; //Go back to gender menu
@@ -1106,7 +1104,7 @@ static void Task_NewGameSpeech25(u8 taskId)
     case 0:     //YES
         PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 2);
         StartBackgroundFadeOut(taskId, 1);
         gTasks[taskId].func = Task_NewGameSpeech26;     //Continue
@@ -1122,10 +1120,10 @@ static void Task_NewGameSpeech25(u8 taskId)
 
 static void Task_NewGameSpeech26(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_BGHOFS])
+    if (gTasks[taskId].tBGhofs)
     {
-        gTasks[taskId].data[TD_BGHOFS] += 2;
-        REG_BG1HOFS = gTasks[taskId].data[TD_BGHOFS];
+        gTasks[taskId].tBGhofs += 2;
+        REG_BG1HOFS = gTasks[taskId].tBGhofs;
     }
     else
     {
@@ -1135,23 +1133,23 @@ static void Task_NewGameSpeech26(u8 taskId)
 
 static void Task_NewGameSpeech27(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
         //Hide Brendan and May sprites
-        spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+        spriteId = gTasks[taskId].tBrendanSpriteId;
         gSprites[spriteId].invisible = TRUE;
-        spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        spriteId = gTasks[taskId].tMaySpriteId;
         gSprites[spriteId].invisible = TRUE;
 
         //Fade in Birch and Azurill
-        spriteId = (u8)gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = (u8)gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 64;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-        spriteId = (u8)gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = (u8)gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].pos1.x = 104;
         gSprites[spriteId].pos1.y = 72;
         gSprites[spriteId].invisible = FALSE;
@@ -1170,27 +1168,27 @@ static void Task_NewGameSpeech27(u8 taskId)
 
 static void Task_NewGameSpeech28(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
-        spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
-        spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
         if (BirchSpeechUpdateWindowText())
         {
             //Fade out Birch and Azurill
-            spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+            spriteId = gTasks[taskId].tBirchSpriteId;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+            spriteId = gTasks[taskId].tAzurillSpriteId;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
 
             StartSpriteFadeOut(taskId, 2);
             StartBackgroundFadeOut(taskId, 1);
-            gTasks[taskId].data[TD_COUNTER] = 64;
+            gTasks[taskId].tFrameCounter = 64;
             gTasks[taskId].func = Task_NewGameSpeech29;
         }
     }
@@ -1198,19 +1196,19 @@ static void Task_NewGameSpeech28(u8 taskId)
 
 static void Task_NewGameSpeech29(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
         //Hide Birch and Azurill
-        spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].invisible = TRUE;
-        spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].invisible = TRUE;
 
-        if (gTasks[taskId].data[TD_COUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
@@ -1218,14 +1216,14 @@ static void Task_NewGameSpeech29(u8 taskId)
 
             //Fade in trainer and background
             if (gSaveBlock2.playerGender)
-                spriteId = (u8)gTasks[taskId].data[TD_MAY_SPRITE_ID];
+                spriteId = (u8)gTasks[taskId].tMaySpriteId;
             else
-                spriteId = (u8)gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+                spriteId = (u8)gTasks[taskId].tBrendanSpriteId;
             gSprites[spriteId].pos1.x = 120;
             gSprites[spriteId].pos1.y = 60;
             gSprites[spriteId].invisible = FALSE;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+            gTasks[taskId].tTrainerSpriteId = spriteId;
 
             StartSpriteFadeIn(taskId, 2);
             StartBackgroundFadeIn(taskId, 1);
@@ -1238,18 +1236,18 @@ static void Task_NewGameSpeech29(u8 taskId)
 
 static void Task_NewGameSpeech30(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
-        spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+        spriteId = gTasks[taskId].tTrainerSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
         if (BirchSpeechUpdateWindowText())
         {
             u8 spriteId;
 
-            spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+            spriteId = gTasks[taskId].tTrainerSpriteId;
             gSprites[spriteId].oam.affineMode = 1;
             gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E79AC;
             InitSpriteAffineAnim(&gSprites[spriteId]);
@@ -1264,7 +1262,7 @@ static void Task_NewGameSpeech30(u8 taskId)
 
 static void Task_NewGameSpeech31(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
     if (gSprites[spriteId].affineAnimEnded)
         gTasks[taskId].func = Task_NewGameSpeech32;
@@ -1274,7 +1272,7 @@ static void Task_NewGameSpeech32(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+        u8 spriteId = gTasks[taskId].tTrainerSpriteId;
         gSprites[spriteId].callback = nullsub_34;
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON;
         BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0x10, 0xFFFF);
@@ -1328,7 +1326,7 @@ void CB_ContinueNewGameSpeechPart2()
 
     taskId = CreateTask(Task_NewGameSpeech23, 0);
 
-    gTasks[taskId].data[TD_BGHOFS] = -60;
+    gTasks[taskId].tBGhofs = -60;
 
     remove_some_task();
     ResetSpriteData();
@@ -1340,20 +1338,20 @@ void CB_ContinueNewGameSpeechPart2()
 
     if (gSaveBlock2.playerGender != MALE)
     {
-        gTasks[taskId].data[TD_GENDER_SELECTION] = FEMALE;
-        spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        gTasks[taskId].tGenderSelection = FEMALE;
+        spriteId = gTasks[taskId].tMaySpriteId;
     }
     else
     {
-        gTasks[taskId].data[TD_GENDER_SELECTION] = MALE;
-        spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+        gTasks[taskId].tGenderSelection = MALE;
+        spriteId = gTasks[taskId].tBrendanSpriteId;
     }
 
     gSprites[spriteId].pos1.x = 180;
     gSprites[spriteId].pos1.y = 60;
     gSprites[spriteId].invisible = FALSE;
 
-    gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+    gTasks[taskId].tTrainerSpriteId = spriteId;
 
     REG_BG1HOFS = -60;
 
@@ -1412,56 +1410,67 @@ void AddBirchSpeechObjects(u8 taskId)
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].oam.priority = 0;
     gSprites[spriteId].invisible = 1;
-    gTasks[taskId].data[TD_BIRCH_SPRITE_ID] = spriteId;
+    gTasks[taskId].tBirchSpriteId = spriteId;
 
     spriteId = CreateAzurillSprite(0x68, 0x48);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].oam.priority = 0;
     gSprites[spriteId].invisible = 1;
-    gTasks[taskId].data[TD_AZURILL_SPRITE_ID] = spriteId;
+    gTasks[taskId].tAzurillSpriteId = spriteId;
 
     //Create Brendan sprite
     spriteId = CreateTrainerSprite(0, 120, 60, 0, unk_2000000);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-    gTasks[taskId].data[TD_BRENDAN_SPRITE_ID] = spriteId;
+    gTasks[taskId].tBrendanSpriteId = spriteId;
 
     //Create May sprite
     spriteId = CreateTrainerSprite(1, 120, 60, 0, unk_2000000 + 0x800);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-    gTasks[taskId].data[TD_MAY_SPRITE_ID] = spriteId;
+    gTasks[taskId].tMaySpriteId = spriteId;
 }
 
-enum {
-    TD_PARENT_TASK_ID,
-    TD_EVA,             //EVA coefficient of REG_BLDALPHA
-    TD_EVB,             //EVB coefficient of REG_BLDALPHA
-    TD_INTERVAL,
-    TD_FRAMECOUNTER
-};
+#undef tTrainerSpriteId
+#undef tBGhofs
+//#undef tSubtaskIsDone
+#undef tGenderSelection
+#undef tFrameCounter
+#undef tBirchSpriteId
+#undef tAzurillSpriteId
+#undef tBrendanSpriteId
+#undef tMaySpriteId
+
+
+// Sprite Fade task
+
+#define tMainTaskId     data[0]
+#define tBlendEVA       data[1]
+#define tBlendEVB       data[2]
+#define tUpdateInterval data[3]
+#define tFrameCounter   data[4]
 
 static void Task_SpriteFadeOut(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_EVA] == 0)
+    if (gTasks[taskId].tBlendEVA == 0)
     {
-        gTasks[gTasks[taskId].data[TD_PARENT_TASK_ID]].data[TD_SUBTASK_DONE] = TRUE;
+        gTasks[gTasks[taskId].tMainTaskId].tSubtaskIsDone = TRUE;
         DestroyTask(taskId);
     }
     else
     {
-        if (gTasks[taskId].data[TD_FRAMECOUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-            gTasks[taskId].data[TD_EVA]--;
-            gTasks[taskId].data[TD_EVB]++;
-            REG_BLDALPHA = gTasks[taskId].data[TD_EVA] + (gTasks[taskId].data[TD_EVB] * 256);
+            gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+            gTasks[taskId].tBlendEVA--;
+            gTasks[taskId].tBlendEVB++;
+            REG_BLDALPHA = gTasks[taskId].tBlendEVA + (gTasks[taskId].tBlendEVB * 256);
         }
     }
 }
@@ -1474,33 +1483,33 @@ static void StartSpriteFadeOut(u8 taskId, u8 interval)
     REG_BLDCNT = 592;
     REG_BLDALPHA = 16;
     REG_BLDY = 0;
-    gTasks[taskId].data[TD_SUBTASK_DONE] = FALSE;
+    gTasks[taskId].tSubtaskIsDone = FALSE;
     newTaskId = CreateTask(Task_SpriteFadeOut, 0);
 
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_EVA] = 16;
-    gTasks[newTaskId].data[TD_EVB] = 0;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tBlendEVA = 16;
+    gTasks[newTaskId].tBlendEVB = 0;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
 static void Task_SpriteFadeIn(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_EVA] == 16)
+    if (gTasks[taskId].tBlendEVA == 16)
     {
-        gTasks[gTasks[taskId].data[TD_PARENT_TASK_ID]].data[TD_SUBTASK_DONE] = TRUE;
+        gTasks[gTasks[taskId].tMainTaskId].tSubtaskIsDone = TRUE;
         DestroyTask(taskId);
     }
-    else if (gTasks[taskId].data[TD_FRAMECOUNTER])
+    else if (gTasks[taskId].tFrameCounter)
     {
-        gTasks[taskId].data[TD_FRAMECOUNTER]--;
+        gTasks[taskId].tFrameCounter--;
     }
     else
     {
-        gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-        gTasks[taskId].data[TD_EVA]++;
-        gTasks[taskId].data[TD_EVB]--;
-        REG_BLDALPHA = gTasks[taskId].data[TD_EVA] + (gTasks[taskId].data[TD_EVB] * 256);
+        gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+        gTasks[taskId].tBlendEVA++;
+        gTasks[taskId].tBlendEVB--;
+        REG_BLDALPHA = gTasks[taskId].tBlendEVA + (gTasks[taskId].tBlendEVB * 256);
     }
 }
 
@@ -1512,36 +1521,49 @@ static void StartSpriteFadeIn(u8 taskId, u8 interval)
     REG_BLDCNT = 592;
     REG_BLDALPHA = 4096;
     REG_BLDY = 0;
-    gTasks[taskId].data[TD_SUBTASK_DONE] = FALSE;
+    gTasks[taskId].tSubtaskIsDone = FALSE;
     newTaskId = CreateTask(Task_SpriteFadeIn, 0);
 
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_EVA] = 0;
-    gTasks[newTaskId].data[TD_EVB] = 16;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tBlendEVA = 0;
+    gTasks[newTaskId].tBlendEVB = 16;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
-enum {
-    TD_FADELEVEL = 1,
-    TD_DELAY,
-};
+#undef tMainTaskId
+#undef tBlendEVA
+#undef tBlendEVB
+#undef tUpdateInterval
+#undef tFrameCounter
+
+
+// Background fade task
+
+#define tMainTaskId     data[0]
+#define tFadeLevel      data[1]
+#define tDelay          data[2]
+#define tUpdateInterval data[3]
+#define tFrameCounter   data[4]
 
 static void HandleFloorShadowFadeOut(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_DELAY])
-        gTasks[taskId].data[TD_DELAY]--;
+    if (gTasks[taskId].tDelay)
+        gTasks[taskId].tDelay--;
     else
     {
-        if (gTasks[taskId].data[TD_FADELEVEL] == 8)
+        if (gTasks[taskId].tFadeLevel == 8)
             DestroyTask(taskId);
-        else if (gTasks[taskId].data[TD_FRAMECOUNTER])
-            gTasks[taskId].data[TD_FRAMECOUNTER]--;
         else
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-            gTasks[taskId].data[TD_FADELEVEL]++;
-            LoadPalette(&gUnknown_081E795C[gTasks[taskId].data[TD_FADELEVEL]], 1, 0x10);
+            if (gTasks[taskId].tFrameCounter)
+                gTasks[taskId].tFrameCounter--;
+            else
+            {
+                gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+                gTasks[taskId].tFadeLevel++;
+                LoadPalette(&gUnknown_081E795C[gTasks[taskId].tFadeLevel], 1, 0x10);
+            }
         }
     }
 }
@@ -1550,30 +1572,30 @@ static void HandleFloorShadowFadeOut(u8 taskId)
 static void StartBackgroundFadeOut(u8 taskId, u8 interval)
 {
     u8 newTaskId = CreateTask(HandleFloorShadowFadeOut, 0);
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_FADELEVEL] = 0;
-    gTasks[newTaskId].data[TD_DELAY] = 8;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tFadeLevel = 0;
+    gTasks[newTaskId].tDelay = 8;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
 static void HandleFloorShadowFadeIn(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_DELAY])
-        gTasks[taskId].data[TD_DELAY]--;
+    if (gTasks[taskId].tDelay)
+        gTasks[taskId].tDelay--;
     else
     {
-        if (gTasks[taskId].data[TD_FADELEVEL] == 0)
+        if (gTasks[taskId].tFadeLevel == 0)
             DestroyTask(taskId);
         else
         {
-            if (gTasks[taskId].data[TD_FRAMECOUNTER])
-                gTasks[taskId].data[TD_FRAMECOUNTER]--;
+            if (gTasks[taskId].tFrameCounter)
+                gTasks[taskId].tFrameCounter--;
             else
             {
-                gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-                gTasks[taskId].data[TD_FADELEVEL]--;
-                LoadPalette(&gUnknown_081E795C[gTasks[taskId].data[TD_FADELEVEL]], 1, 0x10);
+                gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+                gTasks[taskId].tFadeLevel--;
+                LoadPalette(&gUnknown_081E795C[gTasks[taskId].tFadeLevel], 1, 0x10);
             }
         }
     }
@@ -1583,12 +1605,18 @@ static void HandleFloorShadowFadeIn(u8 taskId)
 static void StartBackgroundFadeIn(u8 taskId, u8 interval)
 {
     u8 newTaskId = CreateTask(HandleFloorShadowFadeIn, 0);
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_FADELEVEL] = 8;
-    gTasks[newTaskId].data[TD_DELAY] = 8;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
-}
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tFadeLevel = 8;
+    gTasks[newTaskId].tDelay = 8;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
+}
+
+#undef tMainTaskId
+#undef tFadeLevel
+#undef tDelay
+#undef tUpdateInterval
+#undef tFrameCounter
 
 static void CreateGenderMenu(u8 left, u8 top)
 {
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index bd40bcacc..2856320b8 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -75,7 +75,7 @@ bool8 sub_8064DB4(void)
     }
 }
 
-void sub_8064DD8(void)
+void LockSelectedMapObject(void)
 {
     u8 taskId;
     FreezeMapObjectsExceptOne(gSelectedMapObject);
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 3665cabd8..c7d81f502 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -8,7 +8,7 @@
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "start_menu.h"
 #include "string_util.h"
diff --git a/src/mauville_man.c b/src/mauville_man.c
new file mode 100644
index 000000000..33bc39648
--- /dev/null
+++ b/src/mauville_man.c
@@ -0,0 +1,1311 @@
+#include "global.h"
+#include "bard_music.h"
+#include "mauville_man.h"
+#include "easy_chat.h"
+#include "event_data.h"
+#include "field_message_box.h"
+#include "m4a.h"
+#include "menu.h"
+#include "overworld.h"
+#include "rng.h"
+#include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "trader.h"
+
+#define MACRO1(a) (((a) % 4) + (((a) / 8) & 1))
+
+extern struct MusicPlayerInfo gMPlay_SE2;
+
+extern u16 gScriptResult;
+extern u16 gSpecialVar_0x8004;
+
+extern const u8 gTextStoryteller_Story1Title[];
+extern const u8 gTextStoryteller_Story1Action[];
+extern const u8 gTextStoryteller_Story1Text[];
+extern const u8 gTextStoryteller_Story2Title[];
+extern const u8 gTextStoryteller_Story2Action[];
+extern const u8 gTextStoryteller_Story2Text[];
+extern const u8 gTextStoryteller_Story3Title[];
+extern const u8 gTextStoryteller_Story3Action[];
+extern const u8 gTextStoryteller_Story3Text[];
+extern const u8 gTextStoryteller_Story4Title[];
+extern const u8 gTextStoryteller_Story4Action[];
+extern const u8 gTextStoryteller_Story4Text[];
+extern const u8 gTextStoryteller_Story5Title[];
+extern const u8 gTextStoryteller_Story5Action[];
+extern const u8 gTextStoryteller_Story5Text[];
+extern const u8 gTextStoryteller_Story6Title[];
+extern const u8 gTextStoryteller_Story6Action[];
+extern const u8 gTextStoryteller_Story6Text[];
+extern const u8 gTextStoryteller_Story7Title[];
+extern const u8 gTextStoryteller_Story7Action[];
+extern const u8 gTextStoryteller_Story7Text[];
+extern const u8 gTextStoryteller_Story8Title[];
+extern const u8 gTextStoryteller_Story8Action[];
+extern const u8 gTextStoryteller_Story8Text[];
+extern const u8 gTextStoryteller_Story9Title[];
+extern const u8 gTextStoryteller_Story9Action[];
+extern const u8 gTextStoryteller_Story9Text[];
+extern const u8 gTextStoryteller_Story10Title[];
+extern const u8 gTextStoryteller_Story10Action[];
+extern const u8 gTextStoryteller_Story10Text[];
+extern const u8 gTextStoryteller_Story11Title[];
+extern const u8 gTextStoryteller_Story11Action[];
+extern const u8 gTextStoryteller_Story11Text[];
+extern const u8 gTextStoryteller_Story12Title[];
+extern const u8 gTextStoryteller_Story12Action[];
+extern const u8 gTextStoryteller_Story12Text[];
+extern const u8 gTextStoryteller_Story13Title[];
+extern const u8 gTextStoryteller_Story13Action[];
+extern const u8 gTextStoryteller_Story13Text[];
+extern const u8 gTextStoryteller_Story14Title[];
+extern const u8 gTextStoryteller_Story14Action[];
+extern const u8 gTextStoryteller_Story14Text[];
+extern const u8 gTextStoryteller_Story15Title[];
+extern const u8 gTextStoryteller_Story15Action[];
+extern const u8 gTextStoryteller_Story15Text[];
+extern const u8 gTextStoryteller_Story16Title[];
+extern const u8 gTextStoryteller_Story16Action[];
+extern const u8 gTextStoryteller_Story16Text[];
+extern const u8 gTextStoryteller_Story17Title[];
+extern const u8 gTextStoryteller_Story17Action[];
+extern const u8 gTextStoryteller_Story17Text[];
+extern const u8 gTextStoryteller_Story18Title[];
+extern const u8 gTextStoryteller_Story18Action[];
+extern const u8 gTextStoryteller_Story18Text[];
+extern const u8 gTextStoryteller_Story19Title[];
+extern const u8 gTextStoryteller_Story19Action[];
+extern const u8 gTextStoryteller_Story19Text[];
+extern const u8 gTextStoryteller_Story20Title[];
+extern const u8 gTextStoryteller_Story20Action[];
+extern const u8 gTextStoryteller_Story20Text[];
+extern const u8 gTextStoryteller_Story21Title[];
+extern const u8 gTextStoryteller_Story21Action[];
+extern const u8 gTextStoryteller_Story21Text[];
+extern const u8 gTextStoryteller_Story22Title[];
+extern const u8 gTextStoryteller_Story22Action[];
+extern const u8 gTextStoryteller_Story22Text[];
+extern const u8 gTextStoryteller_Story23Title[];
+extern const u8 gTextStoryteller_Story23Action[];
+extern const u8 gTextStoryteller_Story23Text[];
+extern const u8 gTextStoryteller_Story24Title[];
+extern const u8 gTextStoryteller_Story24Action[];
+extern const u8 gTextStoryteller_Story24Text[];
+extern const u8 gTextStoryteller_Story25Title[];
+extern const u8 gTextStoryteller_Story25Action[];
+extern const u8 gTextStoryteller_Story25Text[];
+extern const u8 gTextStoryteller_Story26Title[];
+extern const u8 gTextStoryteller_Story26Action[];
+extern const u8 gTextStoryteller_Story26Text[];
+extern const u8 gTextStoryteller_Story27Title[];
+extern const u8 gTextStoryteller_Story27Action[];
+extern const u8 gTextStoryteller_Story27Text[];
+extern const u8 gTextStoryteller_Story28Title[];
+extern const u8 gTextStoryteller_Story28Action[];
+extern const u8 gTextStoryteller_Story28Text[];
+extern const u8 gTextStoryteller_Story29Title[];
+extern const u8 gTextStoryteller_Story29Action[];
+extern const u8 gTextStoryteller_Story29Text[];
+extern const u8 gTextStoryteller_Story30Title[];
+extern const u8 gTextStoryteller_Story30Action[];
+extern const u8 gTextStoryteller_Story30Text[];
+extern const u8 gTextStoryteller_Story31Title[];
+extern const u8 gTextStoryteller_Story31Action[];
+extern const u8 gTextStoryteller_Story31Text[];
+extern const u8 gTextStoryteller_Story32Title[];
+extern const u8 gTextStoryteller_Story32Action[];
+extern const u8 gTextStoryteller_Story32Text[];
+extern const u8 gTextStoryteller_Story33Title[];
+extern const u8 gTextStoryteller_Story33Action[];
+extern const u8 gTextStoryteller_Story33Text[];
+extern const u8 gTextStoryteller_Story34Title[];
+extern const u8 gTextStoryteller_Story34Action[];
+extern const u8 gTextStoryteller_Story34Text[];
+extern const u8 gTextStoryteller_Story35Title[];
+extern const u8 gTextStoryteller_Story35Action[];
+extern const u8 gTextStoryteller_Story35Text[];
+extern const u8 gTextStoryteller_Story36Title[];
+extern const u8 gTextStoryteller_Story36Action[];
+extern const u8 gTextStoryteller_Story36Text[];
+
+extern struct BardSong gUnknown_03005DA0;
+
+EWRAM_DATA static u16 gUnknown_020388BC = 0;  // set but not used?
+
+static const u16 sDefaultBardSongLyrics[] =
+{
+#ifdef ENGLISH
+    EC_WORD_SISTER,
+    EC_WORD_EATS,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_AND,
+    EC_WORD_DROOLING,
+#else
+    EC_WORD_SISTER,
+    EC_WORD_MUST_BE,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_DROOLING,
+    EC_WORD_THICK,
+#endif
+};
+
+static const u8 *const sGiddyAdjectives[] =
+{
+    OtherText_SoPretty,
+    OtherText_SoDarling,
+    OtherText_SoRelaxed,
+    OtherText_SoSunny,
+    OtherText_SoDesirable,
+    OtherText_SoExciting,
+    OtherText_SoAmusing,
+    OtherText_SoMagical,
+};
+
+static const u8 *const sGiddyQuestions[] =
+{
+    OtherText_WantVacationNicePlace,
+    OtherText_BoughtCrayonsIsNice,
+    OtherText_IfWeCouldFloat,
+    OtherText_SandWashesAwayMakeSad,
+    OtherText_WhatsBottomSeaLike,
+    OtherText_SeeSettingSun,
+    OtherText_LyingInGreenGrass,
+    OtherText_SecretBasesWonderful,
+};
+
+static void sub_80F7DC0(void);
+static void Task_BardSong(u8);
+static void StartBardSong(u8);
+static void StorytellerSetup(void);
+static void sub_80F8428(void);
+
+static void SetupBard(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->id = MAUVILLE_MAN_BARD;
+    bard->hasChangedSong = FALSE;
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = sDefaultBardSongLyrics[i];
+}
+
+static void SetupHipster(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->id = MAUVILLE_MAN_HIPSTER;
+    hipster->alreadySpoken = FALSE;
+}
+
+static void SetupStoryteller(void)
+{
+    StorytellerSetup();
+}
+
+static void SetupGiddy(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    giddy->id = MAUVILLE_MAN_GIDDY;
+    giddy->taleCounter = 0;
+}
+
+static void SetupTrader(void)
+{
+    TraderSetup();
+}
+
+void SetupMauvilleOldMan(void)
+{
+    u16 trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0];
+
+    // Determine man based on the last digit of the player's trainer ID.
+    switch ((trainerId % 10) / 2)
+    {
+    case MAUVILLE_MAN_BARD:
+        SetupBard();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        SetupHipster();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        SetupTrader();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        SetupStoryteller();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        SetupGiddy();
+        break;
+    }
+    sub_80F83D0();
+}
+
+static u8 GetCurrentMauvilleOldMan(void)
+{
+    struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common;
+
+    return common->id;
+}
+
+void ScrSpecial_GetCurrentMauvilleMan(void)
+{
+    gScriptResult = GetCurrentMauvilleOldMan();
+}
+
+void ScrSpecial_HasBardSongBeenChanged(void)
+{
+    u16 *scriptResult = &gScriptResult; // why??
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    *scriptResult = bard->hasChangedSong;
+}
+
+void ScrSpecial_SaveBardSongLyrics(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    StringCopy(bard->playerName, gSaveBlock2.playerName);
+
+    for (i = 0; i < 4; i++)
+        bard->playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
+
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = bard->temporaryLyrics[i];
+
+    bard->hasChangedSong = TRUE;
+}
+
+// Copies lyrics into gStringVar4
+void PrepareSongText(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
+    u16 *lyrics;
+    u16 lineNum;
+    u8 *wordEnd;
+    u8 *str;
+
+    lyrics = bard->temporaryLyrics;
+    if (specialVar == 0)
+        lyrics = bard->songLyrics;
+    wordEnd = gStringVar4;
+    str = wordEnd;
+    // Put three words on each line
+    for (lineNum = 0; lineNum < 2; lineNum++)
+    {
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_SPACE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_NEWLINE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        if (lineNum == 0)
+        {
+            *(wordEnd++) = EXT_CTRL_CODE_BEGIN;
+            *(wordEnd++) = 15;
+        }
+    }
+}
+
+void ScrSpecial_PlayBardSong(void)
+{
+    StartBardSong(gSpecialVar_0x8004);
+    MenuDisplayMessageBox();
+    ScriptContext1_Stop();
+}
+
+void ScrSpecial_GetHipsterSpokenFlag(void)
+{
+    u16 *scriptResult = &gScriptResult; // again??
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    *scriptResult = hipster->alreadySpoken;
+}
+
+void ScrSpecial_SetHipsterSpokenFlag(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = TRUE;
+}
+
+void ScrSpecial_HipsterTeachWord(void)
+{
+    u16 var = sub_80EB8EC();
+
+    if (var == 0xFFFF)
+    {
+        gScriptResult = FALSE;
+    }
+    else
+    {
+        EasyChat_GetWordText(gStringVar1, var);
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GiddyShouldTellAnotherTale(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 10)
+    {
+        gScriptResult = FALSE;
+        giddy->taleCounter = 0;
+    }
+    else
+    {
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GenerateGiddyLine(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 0)
+        sub_80F7DC0();
+
+    if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
+    {
+        u8 *stringPtr;
+        u32 adjective = Random();
+
+        adjective %= 8;
+        stringPtr = EasyChat_GetWordText(gStringVar4, giddy->randomWords[giddy->taleCounter]);
+        stringPtr = StringCopy(stringPtr, gOtherText_Is);
+        stringPtr = StringCopy(stringPtr, sGiddyAdjectives[adjective]);
+        StringCopy(stringPtr, gOtherText_DontYouAgree);
+    }
+    else
+    {
+        StringCopy(gStringVar4, sGiddyQuestions[giddy->questionList[giddy->questionNum++]]);
+    }
+
+    if (!(Random() % 10))
+        giddy->taleCounter = 10;
+    else
+        giddy->taleCounter++;
+
+    gScriptResult = TRUE;
+}
+
+#ifdef NONMATCHING
+static void sub_80F7DC0(void)
+{
+    u16 arr[][2] =
+    {
+        { 0x0, 0},
+        { 0xC, 0},
+        { 0xD, 0},
+        {0x12, 0},
+        {0x13, 0},
+        {0x15, 0},
+    };
+    u16 i;
+    u16 r10;
+    u16 r7;
+
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        //gSaveBlock1.mauvilleMan.giddy.questionList[i] = i;
+        giddy->questionList[i] = i;
+    }
+
+    // Scramble questions
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        /*
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = gSaveBlock1.mauvilleMan.giddy.questionList[i];
+        gSaveBlock1.mauvilleMan.giddy.questionList[i] = gSaveBlock1.mauvilleMan.giddy.questionList[r1];
+        gSaveBlock1.mauvilleMan.giddy.questionList[r1] = r7;
+        */
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = giddy->questionList[i];
+        giddy->questionList[i] = giddy->questionList[r1];
+        giddy->questionList[r1] = r7;
+    }
+
+    r10 = 0;
+    for (i = 0; i < 6; i++)
+    {
+        arr[i][1] = sub_80EAE88(arr[i][0]);
+        r10 += arr[i][1];
+    }
+
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+        giddy->questionNum = 0;
+    }
+    //gSaveBlock1.mauvilleMan.giddy.questionNum = 0;
+
+    r7 = 0;
+    for (i = 0; i < 10; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        u16 var = Random() % 10;
+        if (var < 3 && r7 < 8)
+        {
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = 0xFFFF;
+            giddy->randomWords[i] = 0xFFFF;
+            r7++;
+        }
+        //_080F7E90
+        else
+        {
+            s16 r2 = Random() % r10;
+
+            u16 r1 = 0;
+
+            while (i < 6)  // comparing the wrong variable
+            {
+                r2 = arr[r1][1] - r2;
+                if (r2 <= 0)
+                    break;
+                r1++;
+            }
+
+            if (r1 == 6)
+                r1 = 0;
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = sub_80EB784(arr[r1][0]);
+            giddy->randomWords[i] = sub_80EB784(arr[r1][0]);
+        }
+    }
+}
+#else
+
+static const u16 gUnknown_083E53C8[][2] =
+{
+    { 0x0, 0},
+    { 0xC, 0},
+    { 0xD, 0},
+    {0x12, 0},
+    {0x13, 0},
+    {0x15, 0},
+};
+
+__attribute__((naked))
+static void sub_80F7DC0(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x18\n\
+    ldr r1, _080F7E84 @ =gUnknown_083E53C8\n\
+    mov r0, sp\n\
+    movs r2, 0x18\n\
+    bl memcpy\n\
+    movs r5, 0\n\
+    movs r0, 0x2\n\
+    add r0, sp\n\
+    mov r8, r0\n\
+    ldr r1, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r1, 0x18\n\
+    adds r3, r1, 0\n\
+_080F7DE4:\n\
+    adds r0, r3, r5\n\
+    strb r5, [r0]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DE4\n\
+    movs r5, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r2, 0x4\n\
+    mov r9, r2\n\
+    adds r6, r1, 0\n\
+_080F7DFC:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    adds r4, r5, 0x1\n\
+    adds r1, r4, 0\n\
+    bl __modsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    adds r2, r6, r5\n\
+    ldrb r7, [r2]\n\
+    adds r1, r6, r1\n\
+    ldrb r0, [r1]\n\
+    strb r0, [r2]\n\
+    strb r7, [r1]\n\
+    lsls r4, 16\n\
+    lsrs r5, r4, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DFC\n\
+    movs r3, 0\n\
+    mov r10, r3\n\
+    movs r5, 0\n\
+_080F7E2A:\n\
+    lsls r4, r5, 2\n\
+    mov r1, sp\n\
+    adds r0, r1, r4\n\
+    ldrb r0, [r0]\n\
+    bl sub_80EAE88\n\
+    add r4, r8\n\
+    strh r0, [r4]\n\
+    add r0, r10\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r10, r0\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x5\n\
+    bls _080F7E2A\n\
+    movs r0, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    strb r0, [r2, 0x2]\n\
+    movs r7, 0\n\
+    movs r5, 0\n\
+_080F7E56:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r1, 0x2\n\
+    bhi _080F7E90\n\
+    cmp r7, 0x7\n\
+    bhi _080F7E90\n\
+    lsls r0, r5, 1\n\
+    add r0, r9\n\
+    ldr r1, _080F7E8C @ =0x0000ffff\n\
+    strh r1, [r0]\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    adds r4, r5, 0x1\n\
+    b _080F7EE2\n\
+    .align 2, 0\n\
+_080F7E84: .4byte gUnknown_083E53C8\n\
+_080F7E88: .4byte gSaveBlock1 + 0x2D94\n\
+_080F7E8C: .4byte 0x0000ffff\n\
+_080F7E90:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r1, r10\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    movs r1, 0\n\
+    adds r4, r5, 0x1\n\
+    lsls r6, r5, 1\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    mov r3, r8\n\
+    ldrh r0, [r3]\n\
+    b _080F7EC2\n\
+_080F7EB2:\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    lsls r0, r1, 2\n\
+    adds r0, r3, r0\n\
+    ldrh r0, [r0]\n\
+_080F7EC2:\n\
+    subs r0, r2, r0\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    cmp r0, 0\n\
+    bgt _080F7EB2\n\
+_080F7ECC:\n\
+    cmp r1, 0x6\n\
+    bne _080F7ED2\n\
+    movs r1, 0\n\
+_080F7ED2:\n\
+    lsls r0, r1, 2\n\
+    add r0, sp\n\
+    ldrh r0, [r0]\n\
+    bl sub_80EB784\n\
+    mov r2, r9\n\
+    adds r1, r2, r6\n\
+    strh r0, [r1]\n\
+_080F7EE2:\n\
+    lsls r0, r4, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x9\n\
+    bls _080F7E56\n\
+    add sp, 0x18\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .syntax divided\n");
+}
+#endif
+
+static void sub_80F7EFC(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->hasChangedSong = FALSE;
+}
+
+static void sub_80F7F0C(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = FALSE;
+}
+
+static void sub_80F7F18(void)
+{
+    sub_8109A20();
+}
+
+static void sub_80F7F24(void)
+{
+    sub_80F8428();
+}
+
+void sub_80F7F30(void)
+{
+    switch (GetCurrentMauvilleOldMan())
+    {
+    case MAUVILLE_MAN_BARD:
+        sub_80F7EFC();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        sub_80F7F0C();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        sub_80F7F24();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        sub_80F7F18();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        break;
+    }
+    sub_80F83D0();
+}
+
+#define tState data[0]
+#define tCharIndex data[3]
+#define tCurrWord data[4]
+#define tUseTemporaryLyrics data[5]
+
+static void StartBardSong(bool8 useTemporaryLyrics)
+{
+    u8 taskId = CreateTask(Task_BardSong, 0x50);
+
+    gTasks[taskId].tUseTemporaryLyrics = useTemporaryLyrics;
+}
+
+static void BardSing(struct Task *task, struct BardSong *song)
+{
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u16 *lyrics;
+            s32 i;
+
+            // Copy lyrics
+            if (gSpecialVar_0x8004 == 0)
+                lyrics = bard->songLyrics;
+            else
+                lyrics = bard->temporaryLyrics;
+            for (i = 0; i < 6; i++)
+                song->lyrics[i] = lyrics[i];
+
+            // Clear phonemes
+            for (i = 0; i < 6; i++)
+            {
+                song->phonemes[i].sound = 0xFFFF;
+                song->phonemes[i].length = 0;
+                song->phonemes[i].pitch = 0;
+                song->phonemes[i].volume = 0;
+            }
+            song->currWord = 0;
+            song->currPhoneme = 0;
+            song->var04 = 0;
+        }
+        break;
+    case 1:  // Wait for BGM to end
+        break;
+    case 2:  // Initialize word
+        {
+            u16 word = song->lyrics[song->currWord];
+            const struct BardSound *sounds = GetWordSounds(EC_GROUP(word), EC_INDEX(word));
+
+            song->var04 = 0;
+            GetWordPhonemes(song, sounds, MACRO1(word));
+        }
+        break;
+    case 3:
+    case 4:
+        {
+            struct BardPhoneme *phoneme = &song->phonemes[song->currPhoneme];
+
+            switch (song->state)
+            {
+            case 0:
+                if (song->phonemeTimer == 0)  // Timer has expired. Move to next phoneme
+                {
+                    if (song->currPhoneme == 6 || phoneme->sound == 0xFF)
+                    {
+                        song->state = 0xFE;
+                        break;
+                    }
+                    song->phonemeTimer = phoneme->length;
+                    if (phoneme->sound <= 50)
+                    {
+                        u16 num = phoneme->sound / 3;
+
+                        m4aSongNumStart(249 + num * 3);
+                    }
+                    song->state = 1;
+                }
+                else
+                {
+                    if (song->voiceInflection > 10)
+                        song->volume -= 2;
+                    if (song->voiceInflection & 1)
+                        song->pitch += 64;
+                    else
+                        song->pitch -= 64;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    song->voiceInflection++;
+                }
+                song->phonemeTimer--;
+                break;
+            case 1:
+                song->currPhoneme++;
+                song->state = 0;
+                if (phoneme->sound <= 50)
+                {
+                    song->volume = 0x100 + phoneme->volume * 16;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    song->pitch = 0x200 + phoneme->pitch;
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                }
+                break;
+            case 0xFE:
+                m4aMPlayStop(&gMPlay_SE2);
+                song->state = 0xFF;
+                break;
+            }
+        }
+        break;
+    case 5:
+        break;
+    }
+}
+
+static void Task_BardSong(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];  // r5
+
+    BardSing(task, &gUnknown_03005DA0);
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        PrepareSongText();
+        InitWindowFromConfig(gMenuWindowPtr, &gWindowConfig_81E6CE4);
+        sub_8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15);
+        task->data[1] = 0;
+        task->data[2] = 0;
+        task->tCharIndex = 0;
+        task->tCurrWord = 0;
+        FadeOutBGMTemporarily(4);
+        task->tState = 1;
+        break;
+    case 1:  // Wait for BGM to end
+        if (IsBGMPausedOrStopped())
+            task->tState = 2;
+        break;
+    case 2:  // Initialize word
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u8 *str = gStringVar4 + task->tCharIndex;
+            u16 wordLen = 0;
+            // Can't get it to match without hacking
+            u32 temp;
+            register s16 zero asm("r1");
+
+            while (*str != CHAR_SPACE
+                && *str != CHAR_NEWLINE
+                && *str != EXT_CTRL_CODE_BEGIN
+                && *str != EOS)
+            {
+                str++;
+                wordLen++;
+            }
+            if (!task->tUseTemporaryLyrics)
+                gUnknown_020388BC = MACRO1(bard->songLyrics[task->tCurrWord]);
+            else
+                gUnknown_020388BC = MACRO1(bard->temporaryLyrics[task->tCurrWord]);
+            temp = gUnknown_03005DA0.var04 / wordLen;
+            zero = 0;
+            gUnknown_03005DA0.var04 = temp;
+            if (gUnknown_03005DA0.var04 <= 0)
+                gUnknown_03005DA0.var04 = 1;
+            task->tCurrWord++;
+            if (task->data[2] == 0)
+                task->tState = 3;
+            else
+                task->tState = 5;
+            task->data[1] = zero;
+        }
+        break;
+    case 5:
+        if (task->data[2] == 0)
+            task->tState = 3;
+        else
+            task->data[2]--;
+        break;
+    case 3:
+        if (gStringVar4[task->tCharIndex] == EOS)
+        {
+            FadeInNewBGM(BGM_POKECEN, 6);
+            m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SPACE)
+        {
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_NEWLINE)
+        {
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == EXT_CTRL_CODE_BEGIN)
+        {
+            task->tCharIndex += 2;  // skip over control codes
+            task->tState = 2;
+            task->data[2] = 8;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR)
+        {
+            gStringVar4[task->tCharIndex] = CHAR_SPACE;  // restore it back to a space
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->data[2] = 0;
+        }
+        else
+        {
+            switch (task->data[1])
+            {
+            case 0:
+                sub_8003418(gMenuWindowPtr);
+                task->data[1]++;
+                break;
+            case 1:
+                task->data[1]++;
+                break;
+            case 2:
+                task->tCharIndex++;
+                task->data[1] = 0;
+                task->data[2] = gUnknown_03005DA0.var04;
+                task->tState = 4;
+                break;
+            }
+        }
+        break;
+    case 4:
+        task->data[2]--;
+        if (task->data[2] == 0)
+            task->tState = 3;
+        break;
+    }
+}
+
+void sub_80F83D0(void)
+{
+    VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan());
+}
+
+struct Story
+{
+    u8 stat;
+    u8 minVal;
+    const u8 *title;
+    const u8 *action;
+    const u8 *fullText;
+};
+
+static const struct Story sStorytellerStories[] =
+{
+    {0x32, 1, gTextStoryteller_Story1Title,  gTextStoryteller_Story1Action,  gTextStoryteller_Story1Text},
+    {0x02, 1, gTextStoryteller_Story2Title,  gTextStoryteller_Story2Action,  gTextStoryteller_Story2Text},
+    {0x03, 1, gTextStoryteller_Story3Title,  gTextStoryteller_Story3Action,  gTextStoryteller_Story3Text},
+    {0x04, 1, gTextStoryteller_Story4Title,  gTextStoryteller_Story4Action,  gTextStoryteller_Story4Text},
+    {0x06, 1, gTextStoryteller_Story5Title,  gTextStoryteller_Story5Action,  gTextStoryteller_Story5Text},
+    {0x09, 1, gTextStoryteller_Story6Title,  gTextStoryteller_Story6Action,  gTextStoryteller_Story6Text},
+    {0x0B, 1, gTextStoryteller_Story7Title,  gTextStoryteller_Story7Action,  gTextStoryteller_Story7Text},
+    {0x0C, 1, gTextStoryteller_Story8Title,  gTextStoryteller_Story8Action,  gTextStoryteller_Story8Text},
+    {0x0D, 1, gTextStoryteller_Story9Title,  gTextStoryteller_Story9Action,  gTextStoryteller_Story9Text},
+    {0x0E, 1, gTextStoryteller_Story10Title, gTextStoryteller_Story10Action, gTextStoryteller_Story10Text},
+    {0x0F, 1, gTextStoryteller_Story11Title, gTextStoryteller_Story11Action, gTextStoryteller_Story11Text},
+    {0x10, 1, gTextStoryteller_Story12Title, gTextStoryteller_Story12Action, gTextStoryteller_Story12Text},
+    {0x11, 1, gTextStoryteller_Story13Title, gTextStoryteller_Story13Action, gTextStoryteller_Story13Text},
+    {0x12, 1, gTextStoryteller_Story14Title, gTextStoryteller_Story14Action, gTextStoryteller_Story14Text},
+    {0x13, 1, gTextStoryteller_Story15Title, gTextStoryteller_Story15Action, gTextStoryteller_Story15Text},
+    {0x14, 1, gTextStoryteller_Story16Title, gTextStoryteller_Story16Action, gTextStoryteller_Story16Text},
+    {0x1A, 1, gTextStoryteller_Story17Title, gTextStoryteller_Story17Action, gTextStoryteller_Story17Text},
+    {0x1B, 1, gTextStoryteller_Story18Title, gTextStoryteller_Story18Action, gTextStoryteller_Story18Text},
+    {0x1C, 1, gTextStoryteller_Story19Title, gTextStoryteller_Story19Action, gTextStoryteller_Story19Text},
+    {0x1D, 2, gTextStoryteller_Story20Title, gTextStoryteller_Story20Action, gTextStoryteller_Story20Text},
+    {0x1E, 1, gTextStoryteller_Story21Title, gTextStoryteller_Story21Action, gTextStoryteller_Story21Text},
+    {0x21, 1, gTextStoryteller_Story22Title, gTextStoryteller_Story22Action, gTextStoryteller_Story22Text},
+    {0x24, 1, gTextStoryteller_Story23Title, gTextStoryteller_Story23Action, gTextStoryteller_Story23Text},
+    {0x25, 1, gTextStoryteller_Story24Title, gTextStoryteller_Story24Action, gTextStoryteller_Story24Text},
+    {0x26, 1, gTextStoryteller_Story25Title, gTextStoryteller_Story25Action, gTextStoryteller_Story25Text},
+    {0x27, 1, gTextStoryteller_Story26Title, gTextStoryteller_Story26Action, gTextStoryteller_Story26Text},
+    {0x28, 1, gTextStoryteller_Story27Title, gTextStoryteller_Story27Action, gTextStoryteller_Story27Text},
+    {0x29, 1, gTextStoryteller_Story28Title, gTextStoryteller_Story28Action, gTextStoryteller_Story28Text},
+    {0x2A, 1, gTextStoryteller_Story29Title, gTextStoryteller_Story29Action, gTextStoryteller_Story29Text},
+    {0x2B, 1, gTextStoryteller_Story30Title, gTextStoryteller_Story30Action, gTextStoryteller_Story30Text},
+    {0x2C, 1, gTextStoryteller_Story31Title, gTextStoryteller_Story31Action, gTextStoryteller_Story31Text},
+    {0x2D, 1, gTextStoryteller_Story32Title, gTextStoryteller_Story32Action, gTextStoryteller_Story32Text},
+    {0x2E, 1, gTextStoryteller_Story33Title, gTextStoryteller_Story33Action, gTextStoryteller_Story33Text},
+    {0x2F, 1, gTextStoryteller_Story34Title, gTextStoryteller_Story34Action, gTextStoryteller_Story34Text},
+    {0x30, 1, gTextStoryteller_Story35Title, gTextStoryteller_Story35Action, gTextStoryteller_Story35Text},
+    {0x31, 1, gTextStoryteller_Story36Title, gTextStoryteller_Story36Action, gTextStoryteller_Story36Text},
+};
+
+static void StorytellerSetup(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    s32 i;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+    for (i = 0; i < 4; i++)
+    {
+        storyteller->gameStatIDs[i] = 0;
+        storyteller->trainerNames[0][i] = EOS;  // Maybe they meant storyteller->trainerNames[i][0] instead?
+    }
+}
+
+static void sub_80F8428(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+}
+
+static u32 StorytellerGetGameStat(u8 stat)
+{
+    if (stat == NUM_GAME_STATS)
+        stat = 0;
+    return GetGameStat(stat);
+}
+
+static const struct Story *GetStoryByStat(u32 stat)
+{
+    s32 i;
+
+    for (i = 0; i < 36; i++)
+    {
+        if (sStorytellerStories[i].stat == stat)
+            return &sStorytellerStories[i];
+    }
+    return &sStorytellerStories[35];
+}
+
+static const u8 *GetStoryTitleByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->title;
+}
+
+static const u8 *GetStoryTextByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->fullText;
+}
+
+static const u8 *GetStoryActionByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->action;
+}
+
+static u8 GetFreeStorySlot(void)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        if (storyteller->gameStatIDs[i] == 0)
+            break;
+    }
+    return i;
+}
+
+static u32 StorytellerGetRecordedTrainerStat(u32 trainer)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
+}
+
+static void StorytellerSetRecordedTrainerStat(u32 trainer, u32 val)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    ptr[0] = val;
+    ptr[1] = val >> 8;
+    ptr[2] = val >> 16;
+    ptr[3] = val >> 24;
+}
+
+static bool32 HasTrainerStatIncreased(u32 trainer)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (StorytellerGetGameStat(storyteller->gameStatIDs[trainer]) > StorytellerGetRecordedTrainerStat(trainer))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void GetStoryByStattellerPlayerName(u32 player, void *dst)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+
+    memset(dst, EOS, 8);
+    memcpy(dst, name, 7);
+}
+
+static void StorytellerSetPlayerName(u32 player, const u8 *src)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+    u8 len = StringLength(src);
+
+    memset(name, EOS, 7);
+    StringCopyN(name, src, len);
+}
+
+static void StorytellerRecordNewStat(u32 player, u32 stat)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->gameStatIDs[player] = stat;
+    StorytellerSetPlayerName(player, gSaveBlock2.playerName);
+    StorytellerSetRecordedTrainerStat(player, StorytellerGetGameStat(stat));
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetGameStat(stat), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+}
+
+static void ScrambleStatList(u8 *arr, s32 count)
+{
+    s32 i;
+
+    for (i = 0; i < count; i++)
+        arr[i] = i;
+    for (i = 0; i < count; i++)
+    {
+        u32 a = Random() % count;
+        u32 b = Random() % count;
+        u8 temp = arr[a];
+        arr[a] = arr[b];
+        arr[b] = temp;
+    }
+}
+
+// What purpose does this struct even serve? Only the length field is used.
+static const struct {u32 length; struct MauvilleManStoryteller *unused1; u32 unused2;} sStorytellerStuff =
+{
+    36,
+    &gSaveBlock1.mauvilleMan.storyteller,  // unused
+    12,                                    // unused
+};
+
+static bool8 StorytellerInitializeRandomStat(void)
+{
+    u8 arr[sStorytellerStuff.length];
+    s32 i;
+    s32 j;
+
+    ScrambleStatList(arr, 36);
+    for (i = 0; i < 36; i++)
+    {
+        u8 stat = sStorytellerStories[arr[i]].stat;
+        u8 minVal = sStorytellerStories[arr[i]].minVal;
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        for (j = 0; j < 4; j++)
+        {
+            if (gSaveBlock1.mauvilleMan.storyteller.gameStatIDs[j] == stat)
+                break;
+        }
+        if (j == 4 && StorytellerGetGameStat(stat) >= minVal)
+        {
+            storyteller->alreadyRecorded = TRUE;
+            StorytellerRecordNewStat(GetFreeStorySlot(), stat);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void StorytellerDisplayStory(u32 player)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 stat = storyteller->gameStatIDs[player];
+
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetRecordedTrainerStat(player), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+    GetStoryByStattellerPlayerName(player, gStringVar3);
+    ShowFieldMessage(GetStoryTextByStat(stat));
+}
+
+static void PrintStoryList(void)
+{
+    s32 i;
+
+    MenuDrawTextWindow(0, 0, 25, 4 + GetFreeStorySlot() * 2);
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+        u8 stat = storyteller->gameStatIDs[i];
+
+        if (stat == 0)
+            break;
+        MenuPrint(GetStoryTitleByStat(stat), 1, 2 + i * 2);
+    }
+    MenuPrint(gPCText_Cancel, 1, 2 + i * 2);
+}
+
+static u8 gUnknown_03000748;
+
+static void Task_StoryListMenu(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    s32 selection;
+
+    switch (task->data[0])
+    {
+    case 0:
+        PrintStoryList();
+        InitMenu(0, 1, 2, GetFreeStorySlot() + 1, 0, 24);
+        task->data[0]++;
+        break;
+    case 1:
+        selection = ProcessMenuInput();
+        if (selection == -2)
+            break;
+        if (selection == -1 || selection == GetFreeStorySlot())
+        {
+            gScriptResult = 0;
+        }
+        else
+        {
+            gScriptResult = 1;
+            gUnknown_03000748 = selection;
+        }
+        HandleDestroyMenuCursors();
+        MenuZeroFillWindowRect(0, 0, 25, 12);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+        break;
+    }
+}
+
+// Sets gScriptResult to TRUE if player selected a story
+void ScrSpecial_StorytellerStoryListMenu(void)
+{
+    CreateTask(Task_StoryListMenu, 0x50);
+}
+
+void ScrSpecial_StorytellerDisplayStory(void)
+{
+    StorytellerDisplayStory(gUnknown_03000748);
+}
+
+u8 ScrSpecial_StorytellerGetFreeStorySlot(void)
+{
+    return GetFreeStorySlot();
+}
+
+// Returns TRUE if stat has increased
+bool8 ScrSpecial_StorytellerUpdateStat(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 r4 = storyteller->gameStatIDs[gUnknown_03000748];
+
+    if (HasTrainerStatIncreased(gUnknown_03000748) == TRUE)
+    {
+        StorytellerRecordNewStat(gUnknown_03000748, r4);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (storyteller->alreadyRecorded == FALSE)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+bool8 ScrSpecial_StorytellerInitializeRandomStat(void)
+{
+    return StorytellerInitializeRandomStat();
+}
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
deleted file mode 100644
index 789a251e6..000000000
--- a/src/mauville_old_man.c
+++ /dev/null
@@ -1,249 +0,0 @@
-#include "global.h"
-#include "mauville_old_man.h"
-#include "easy_chat.h"
-#include "menu.h"
-#include "rng.h"
-#include "script.h"
-#include "string_util.h"
-#include "strings.h"
-#include "trader.h"
-
-extern u16 gScriptResult;
-extern u16 gSpecialVar_0x8004;
-
-extern u32 gUnknown_083E5388[];
-extern u32 gUnknown_083E53A8[];
-
-extern u16 gUnknown_083E537C[];
-
-IWRAM_DATA u8 gUnknown_03000748;
-
-void sub_80F7A34(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 0;
-    oldMan->oldMan1.unk_2DBD = 0;
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = gUnknown_083E537C[i];
-}
-
-void sub_80F7A6C(void)
-{
-    struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1;
-
-    bard->unk_2D94 = 1;
-    bard->unk_2D95 = 0;
-}
-
-void sub_80F7A7C(void)
-{
-    sub_80F83F8();
-}
-
-void sub_80F7A88(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 4;
-    oldMan->oldMan1.unk_2D95 = 0;
-}
-
-void sub_80F7A98(void)
-{
-    sub_81099CC();
-}
-
-void SetMauvilleOldMan(void)
-{
-    u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2;
-
-    switch(var)
-    {
-    case 0:
-        sub_80F7A34();
-        break;
-    case 1:
-        sub_80F7A6C();
-        break;
-    case 2:
-        sub_80F7A98();
-        break;
-    case 3:
-        sub_80F7A7C();
-        break;
-    case 4:
-        sub_80F7A88();
-        break;
-    }
-    sub_80F83D0();
-}
-
-u8 GetCurrentMauvilleOldMan(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    return oldMan->oldMan1.unk_2D94;
-}
-
-void sub_80F7B14(void)
-{
-    gScriptResult = GetCurrentMauvilleOldMan();
-}
-
-void sub_80F7B2C(void)
-{
-    u16 *scriptPtr = &gScriptResult; // why??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2DBD;
-}
-
-void sub_80F7B40(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-    //struct UnkMauvilleOldManStruct *oldManStruct = &gSaveBlock1.oldManStruct;
-
-    StringCopy(oldMan->oldMan1.playerName, gSaveBlock2.playerName);
-
-    for(i = 0; i < 4; i++)
-        oldMan->oldMan1.playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = oldMan->oldMan1.mauvilleOldMan_ecArray2[i];
-
-    oldMan->oldMan1.unk_2DBD = 1;
-}
-
-void sub_80F7BA0(void)
-{
-    struct UnkMauvilleOldManStruct *oldMan = &gSaveBlock1.oldMan.oldMan1;
-    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
-    u16 *r5;
-    u16 i;
-    u8 *ptr;
-    u8 *r4;
-
-    r5 = oldMan->mauvilleOldMan_ecArray2;
-    if (specialVar == 0)
-        r5 = oldMan->mauvilleOldMan_ecArray;
-    ptr = gStringVar4;
-    r4 = ptr;
-    for (i = 0; i < 2; i++)
-    {
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0xFE;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        //_080F7C2A
-        if (i == 0)
-        {
-            *(ptr++) = EXT_CTRL_CODE_BEGIN;
-            *(ptr++) = 0xF;
-        }
-    }
-}
-
-void sub_80F7C54(void)
-{
-    sub_80F7F80(gSpecialVar_0x8004);
-    MenuDisplayMessageBox();
-    ScriptContext1_Stop();
-}
-
-void sub_80F7C70(void)
-{
-    u16 *scriptPtr = &gScriptResult; // again??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2D95;
-}
-
-void sub_80F7C84(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D95 = 1;
-}
-
-void sub_80F7C90(void)
-{
-    u16 var = sub_80EB8EC();
-
-    if(var == 0xFFFF)
-    {
-        gScriptResult = FALSE;
-    }
-    else
-    {
-        sub_80EB3FC(gStringVar1, var);
-        gScriptResult = TRUE;
-    }
-}
-
-void sub_80F7CC8(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    if(oldMan->oldMan1.unk_2D95 == 10)
-    {
-        gScriptResult = FALSE;
-        oldMan->oldMan1.unk_2D95 = 0;
-    }
-    else
-        gScriptResult = TRUE;
-}
-
-void sub_80F7CF4(void)
-{
-    struct UnkMauvilleOldManStruct2 *oldMan = &gSaveBlock1.oldMan.oldMan2;
-
-    if(oldMan->unk1 == 0)
-        sub_80F7DC0();
-
-    if(oldMan->mauvilleOldMan_ecArray[oldMan->unk1] != 0xFFFF) // is not the last element of the array?
-    {
-        u8 *stringPtr;
-        u32 random = Random();
-
-        random %= 8;
-        stringPtr = sub_80EB3FC(gStringVar4, oldMan->mauvilleOldMan_ecArray[oldMan->unk1]);
-        stringPtr = StringCopy(stringPtr, gOtherText_Is);
-        stringPtr = StringCopy(stringPtr, (u8 *)gUnknown_083E5388[random]);
-        StringCopy(stringPtr, gOtherText_DontYouAgree);
-    }
-    else
-    {
-        StringCopy(gStringVar4, (u8 *)gUnknown_083E53A8[oldMan->mauvilleOldMan_ecArray2[oldMan->unk2++]]);
-    }
-    if(!(Random() % 10))
-        oldMan->unk1 = 10;
-    else
-        oldMan->unk1++;
-
-    gScriptResult = TRUE;
-}
diff --git a/src/menu.c b/src/menu.c
index 1096fa0bd..a9c4aaa43 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -154,9 +154,9 @@ void MenuPrint(const u8 *str, u8 left, u8 top)
     sub_8003460(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void MenuZeroFillWindowRect(u8 a1, u8 a2, u8 a3, u8 a4)
+void MenuZeroFillWindowRect(u8 left, u8 top, u8 right, u8 bottom)
 {
-    ZeroFillWindowRect(gMenuWindowPtr, a1, a2, a3, a4);
+    ZeroFillWindowRect(gMenuWindowPtr, left, top, right, bottom);
 }
 
 void MenuFillWindowRectWithBlankTile(u8 left, u8 top, u8 right, u8 bottom)
@@ -205,7 +205,7 @@ void MenuPrintMessage(const u8 *str, u8 left, u8 top)
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void sub_8072044(const u8 *str)
+void MenuPrintMessageDefaultCoords(const u8 *str)
 {
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15);
 }
@@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m
         MenuPrint(menuItems[i].text, left, top + 2 * i);
 }
 
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order)
 {
     u8 i;
 
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 9915d67ac..14e823355 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -7,7 +7,7 @@
 #include "map_constants.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
@@ -140,7 +140,7 @@ static void PrintMessage(const u8 *str, u16 tile)
     {
         sub_80A3FA0(&gBGTilemapBuffers[1][0], 2, 15, 26, 4, tile);
     }
-    sub_8072044(str);
+    MenuPrintMessageDefaultCoords(str);
 }
 
 static void sub_80F9090(u8 taskId)
diff --git a/src/money.c b/src/money.c
index 67b7eb03f..5d0f0ae8d 100644
--- a/src/money.c
+++ b/src/money.c
@@ -25,7 +25,7 @@ bool8 IsEnoughMoney(u32 budget, u32 cost)
     return FALSE;
 }
 
-void sub_80B79B8(u32 *arg0, u32 arg1)
+void AddMoney(u32 *arg0, u32 arg1)
 {
     if (*arg0 > *arg0 + arg1)
     {
@@ -40,7 +40,7 @@ void sub_80B79B8(u32 *arg0, u32 arg1)
     }
 }
 
-void sub_80B79E0(u32 *arg0, u32 arg1)
+void RemoveMoney(u32 *arg0, u32 arg1)
 {
     if (*arg0 < arg1)
     {
@@ -52,39 +52,25 @@ void sub_80B79E0(u32 *arg0, u32 arg1)
     }
 }
 
-void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
+void GetMoneyAmountText(u8 *buffer, u32 amount, u8 arg2)
 {
     u8 width;
     u8 i;
 
-    if (arg1 > 999999)
-    {
+    if (amount > 999999)
         width = 7;
-    }
-    else if (arg1 > 99999)
-    {
+    else if (amount > 99999)
         width = 6;
-    }
-    else if (arg1 > 10000)
-    {
+    else if (amount > 10000)
         width = 5;
-    }
-    else if (arg1 > 999)
-    {
+    else if (amount > 999)
         width = 4;
-    }
-    else if (arg1 > 99)
-    {
+    else if (amount > 99)
         width = 3;
-    }
-    else if (arg1 > 9)
-    {
+    else if (amount > 9)
         width = 2;
-    }
     else
-    {
         width = 1;
-    }
 
     buffer[0] = EXT_CTRL_CODE_BEGIN;
     buffer[1] = 0x14;
@@ -100,7 +86,7 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
     buffer[0] = CHAR_CURRENCY;
     buffer += 1;
 
-    buffer = ConvertIntToDecimalString(buffer, arg1);
+    buffer = ConvertIntToDecimalString(buffer, amount);
 
     buffer[0] = EXT_CTRL_CODE_BEGIN;
     buffer[1] = 0x14;
@@ -108,16 +94,18 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
     buffer[3] = EOS;
 }
 
-void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y)
+void PrintMoneyAmount(u32 amount, u8 size, u8 x, u8 y)
 {
     u8 buffer[16];
     u8 stringWidth;
 
-    sub_80B79F8(buffer, arg0, size);
+    GetMoneyAmountText(buffer, amount, size);
     stringWidth = sub_8072CA4(buffer);
 
     if (stringWidth >= (size + 1) * 8)
+    {
         MenuPrint(buffer, x, y);
+    }
     else
     {
         int xPlusOne = x + 1;
@@ -241,15 +229,15 @@ _080B7BE8: .4byte 0x0600f840\n\
     .syntax divided\n");
 }
 
-void sub_80B7BEC(u32 arg0, u8 x, u8 y)
+void UpdateMoneyWindow(u32 amount, u8 x, u8 y)
 {
-    sub_80B7A94(arg0, 6, x + 6, y + 1);
+    PrintMoneyAmount(amount, 6, x + 6, y + 1);
 }
 
-void sub_80B7C14(u32 arg0, u8 x, u8 y)
+void OpenMoneyWindow(u32 amount, u8 x, u8 y)
 {
     MenuDrawTextWindow(x, y, x + 13, y + 3);
-    sub_80B7BEC(arg0, x, y);
+    UpdateMoneyWindow(amount, x, y);
 
     LoadCompressedObjectPic(&gUnknown_083CF584);
     LoadCompressedObjectPalette(&gUnknown_083CF58C);
@@ -257,7 +245,7 @@ void sub_80B7C14(u32 arg0, u8 x, u8 y)
     gUnknown_02038734 = CreateSprite(&gSpriteTemplate_83CF56C, x * 8 + 19, y * 8 + 11, 0);
 }
 
-void RemoveMoneyLabelObject(u8 x, u8 y)
+void CloseMoneyWindow(u8 x, u8 y)
 {
     DestroySpriteAndFreeResources(&gSprites[gUnknown_02038734]);
     FreeSpritePaletteByTag(SPRITE_TAG_MONEY);
@@ -271,5 +259,5 @@ bool8 sub_80B7CE8(void)
 
 void sub_80B7D0C(void)
 {
-    sub_80B79E0(&gSaveBlock1.money, gSpecialVar_0x8005);
+    RemoveMoney(&gSaveBlock1.money, gSpecialVar_0x8005);
 }
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 46b76fd88..0e48dc177 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -94,7 +94,7 @@ static void CB2_MysteryEventMenu(void)
     case 1:
         if (gPaletteFade.active)
             break;
-        sub_8072044(gSystemText_LinkStandby);
+        MenuPrintMessageDefaultCoords(gSystemText_LinkStandby);
         gMain.state++;
         break;
     case 2:
@@ -109,7 +109,7 @@ static void CB2_MysteryEventMenu(void)
         if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
         {
             PlaySE(SE_PIN);
-            sub_8072044(gSystemText_LoadEventPressA);
+            MenuPrintMessageDefaultCoords(gSystemText_LoadEventPressA);
             gMain.state++;
         }
         if (gMain.newKeys & B_BUTTON)
@@ -128,7 +128,7 @@ static void CB2_MysteryEventMenu(void)
         if (GetLinkPlayerCount_2() != 2)
         {
             GetEventLoadMessage(gStringVar4, 1);
-            sub_8072044(gStringVar4);
+            MenuPrintMessageDefaultCoords(gStringVar4);
             gMain.state = 13;
             break;
         }
@@ -158,13 +158,13 @@ static void CB2_MysteryEventMenu(void)
                 sub_800832C();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 gMain.state = 13;
                 break;
             }
             else if (CheckLanguageMatch())
             {
-                sub_8072044(gSystemText_DontCutLink);
+                MenuPrintMessageDefaultCoords(gSystemText_DontCutLink);
                 gMain.state++;
                 break;
             }
@@ -173,7 +173,7 @@ static void CB2_MysteryEventMenu(void)
                 CloseLink();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 gMain.state = 13;
                 break;
             }
@@ -222,7 +222,7 @@ static void CB2_MysteryEventMenu(void)
                 sub_800832C();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 ptr = (u8 *)&gMain;
                 offset1 = offsetof(struct Main, state);
                 asm("" ::: "r1");
@@ -234,7 +234,7 @@ static void CB2_MysteryEventMenu(void)
                 register u8 *ptr2 asm("r1");
                 register int offset3 asm("r0");
                 register int dummy asm("r2");
-                sub_8072044(gSystemText_DontCutLink);
+                MenuPrintMessageDefaultCoords(gSystemText_DontCutLink);
                 ptr2 = (u8 *)&gMain;
                 offset3 = offsetof(struct Main, state);
                 if (dummy)
@@ -249,7 +249,7 @@ static void CB2_MysteryEventMenu(void)
                 MenuZeroFillWindowRect(6, 5, 23, 8);
             label:
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 ptr = (u8 *)&gMain;
                 offset2 = offsetof(struct Main, state);
                 ptr += offset2;
@@ -294,7 +294,7 @@ static void CB2_MysteryEventMenu(void)
         gMain.state++;
         break;
     case 12:
-        sub_8072044(gStringVar4);
+        MenuPrintMessageDefaultCoords(gStringVar4);
         gMain.state++;
         break;
     case 13:
@@ -329,7 +329,7 @@ static void CB2_MysteryEventMenu(void)
             CloseLink();
             MenuZeroFillWindowRect(6, 5, 23, 8);
             GetEventLoadMessage(gStringVar4, 1);
-            sub_8072044(gStringVar4);
+            MenuPrintMessageDefaultCoords(gStringVar4);
             gMain.state = 13;
         }
     }
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 6c107f022..3f8417e6d 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1618,7 +1618,7 @@ static void DisplaySentToPCMessage(void)
     StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC);
     BasicInitMenuWindow(&gWindowConfig_81E6E88);
     MenuDisplayMessageBox();
-    sub_8072044(gStringVar4);
+    MenuPrintMessageDefaultCoords(gStringVar4);
 }
 
 static void sub_80B753C(void)
diff --git a/src/new_game.c b/src/new_game.c
index 226ac9bb7..3f9e9f5a1 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -11,7 +11,7 @@
 #include "item_menu.h"
 #include "lottery_corner.h"
 #include "mail_data.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "play_time.h"
 #include "player_pc.h"
 #include "pokeblock.h"
@@ -20,7 +20,7 @@
 #include "pokemon_storage_system.h"
 #include "rng.h"
 #include "roamer.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "secret_base.h"
@@ -157,7 +157,7 @@ void NewGameInitData(void)
     ClearPokeblocks();
     ClearDecorationInventories();
     InitEasyChatPhrases();
-    SetMauvilleOldMan();
+    SetupMauvilleOldMan();
     InitDewfordTrend();
     ResetFanClub();
     ResetLotteryCorner();
diff --git a/src/rom4.c b/src/overworld.c
index f9006efba..9b41a262d 100644
--- a/src/rom4.c
+++ b/src/overworld.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "cable_club.h"
@@ -25,6 +25,7 @@
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
+#include "map_constants.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
@@ -40,6 +41,7 @@
 #include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
@@ -60,28 +62,10 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
-EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
-EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
-EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
-EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
-EWRAM_DATA u16 gUnknown_02029814 = 0;
-EWRAM_DATA bool8 gUnknown_02029816 = FALSE;
-EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
-
-static u8 gUnknown_03000580[4];
-static u16 (*gUnknown_03000584)(u32);
-static u8 gUnknown_03000588;
-
-u16 word_3004858;
-void (*gFieldCallback)(void);
-u8 gUnknown_03004860;
-u8 gFieldLinkPlayerCount;
-
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
-extern u8 EventScript_LeagueWhiteOut[];
+extern u8 S_WhiteOut[];
 extern u8 gUnknown_0819FC9F[];
 extern u8 SingleBattleColosseum_EventScript_1A436F[];
 extern u8 SingleBattleColosseum_EventScript_1A4379[];
@@ -102,21 +86,115 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern u8 (*gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern u8 (*gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern void (*gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *);
-
 extern struct MapData * const gMapAttributes[];
 extern struct MapHeader * const * const gMapGroups[];
-extern const struct WarpData gDummyWarpData;
-extern s32 gUnknown_0839ACE8;
-extern u32 gUnknown_08216694[];
+extern s32 gMaxFlashLevel;
+
+EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
+EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
+EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
+EWRAM_DATA static u16 sAmbientCrySpecies = 0;
+EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
+EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+
+static u8 gUnknown_03000580[4];
+static u16 (*gUnknown_03000584)(u32);
+static u8 gUnknown_03000588;
+
+u16 word_3004858;
+void (*gFieldCallback)(void);
+u8 gUnknown_03004860;
+u8 gFieldLinkPlayerCount;
+
+static const struct WarpData sDummyWarpData =
+{
+    .mapGroup = -1,
+    .mapNum = -1,
+    .warpId = -1,
+    .x = -1,
+    .y = -1,
+};
+
+static const u8 sUnusedData[] =
+{
+    0xB0, 0x04, 0x00, 0x00,
+    0x10, 0x0E, 0x00, 0x00,
+    0xB0, 0x04, 0x00, 0x00,
+    0x60, 0x09, 0x00, 0x00,
+    0x32, 0x00, 0x00, 0x00,
+    0x50, 0x00, 0x00, 0x00,
+    0xD4, 0xFF, 0xFF, 0xFF,
+    0x2C, 0x00, 0x00, 0x00,
+};
+
+const struct UCoords32 gUnknown_0821664C[] =
+{
+    { 0,  0},
+    { 0,  1},
+    { 0, -1},
+    {-1,  0},
+    { 1,  0},
+    {-1,  1},
+    { 1,  1},
+    {-1, -1},
+    { 1, -1},
+};
+
+const struct UnknownTaskStruct gUnknown_08216694 =
+{
+    (void *)REG_ADDR_WIN0H,
+    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+    1,
+    0,
+};
+
+static u8 sub_8055C68(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C88(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C8C(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055C68,
+    sub_8055C88,
+    sub_8055C8C,
+};
+
+static u8 sub_8055CAC(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055CB0(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055D18(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055CAC,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CAC,
+    sub_8055CAC,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+};
 
-void DoWhiteOut(void)
+static void sub_8055D30(struct LinkPlayerMapObject *, struct MapObject *);
+static void sub_8055D38(struct LinkPlayerMapObject *, struct MapObject *);
+
+static void (*const gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *) =
+{
+    sub_8055D30,
+    sub_8055D38,
+};
+
+
+static void DoWhiteOut(void)
 {
-    ScriptContext2_RunNewScript(EventScript_LeagueWhiteOut);
+    ScriptContext2_RunNewScript(S_WhiteOut);
     gSaveBlock1.money /= 2;
-    HealPlayerParty();
+    ScrSpecial_HealPlayerParty();
     sub_8053050();
     sub_8053570();
     warp_in();
@@ -125,48 +203,48 @@ void DoWhiteOut(void)
 void flag_var_implications_of_teleport_(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
-void new_game(void)
+void Overworld_ResetStateAfterTeleport(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
     ScriptContext2_RunNewScript(gUnknown_0819FC9F);
 }
 
 void sub_8053014(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
 void sub_8053050(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
 void sub_805308C(void)
 {
-    FlagReset(SYS_SAFARI_MODE);
-    sub_8054164();
+    FlagClear(SYS_SAFARI_MODE);
+    ChooseAmbientCrySpecies();
     ResetCyclingRoadChallengeData();
     UpdateLocationHistoryForRoamer();
     RoamerMoveToOtherLocationSet();
@@ -213,15 +291,16 @@ void sub_8053154(void)
               gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate));
 }
 
-void sub_8053198(void)
+static void LoadSaveblockMapObjScripts(void)
 {
     struct MapObjectTemplate *mapObjectTemplates = gSaveBlock1.mapObjectTemplates;
     s32 i;
+
     for (i = 0; i < 64; i++)
         mapObjectTemplates[i].script = gMapHeader.events->mapObjects[i].script;
 }
 
-void update_saveblock1_field_object_coords(u8 localId, s16 x, s16 y)
+void Overworld_SaveMapObjCoords(u8 localId, s16 x, s16 y)
 {
     s32 i;
     for (i = 0; i < 64; i++)
@@ -231,28 +310,26 @@ void update_saveblock1_field_object_coords(u8 localId, s16 x, s16 y)
         {
             mapObjectTemplate->x = x;
             mapObjectTemplate->y = y;
-            break;
+            return;
         }
     }
 }
 
-void update_saveblock1_field_object_movement_behavior(u8 localId, u8 movementType)
+void Overworld_SaveMapObjMovementType(u8 localId, u8 movementType)
 {
-    s32 i = 0;
-    struct MapObjectTemplate *mapObjectTemplate = gSaveBlock1.mapObjectTemplates;
-    do
+    s32 i;
+    for (i = 0; i < 64; i++)
     {
+        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
         if (mapObjectTemplate->localId == localId)
         {
             mapObjectTemplate->movementType = movementType;
-            break;
+            return;
         }
-        mapObjectTemplate++;
-        i++;
-    } while (i < 64);
+    }
 }
 
-void mapdata_load_assets_to_gpu_and_full_redraw(void)
+static void mapdata_load_assets_to_gpu_and_full_redraw(void)
 {
     move_tilemap_camera_to_upper_left_corner();
     copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData);
@@ -261,7 +338,7 @@ void mapdata_load_assets_to_gpu_and_full_redraw(void)
     cur_mapheader_run_tileset_funcs_after_some_cpuset();
 }
 
-struct MapData *get_mapdata_header(void)
+static struct MapData *get_mapdata_header(void)
 {
     u16 mapDataId = gSaveBlock1.mapDataId;
     if (mapDataId)
@@ -269,15 +346,15 @@ struct MapData *get_mapdata_header(void)
     return NULL;
 }
 
-void warp_shift(void)
+static void warp_shift(void)
 {
     gUnknown_020297F0 = gSaveBlock1.location;
     gSaveBlock1.location = gUnknown_020297F8;
-    gUnknown_02029800 = gDummyWarpData;
-    gUnknown_02029808 = gDummyWarpData;
+    gUnknown_02029800 = sDummyWarpData;
+    gUnknown_02029808 = sDummyWarpData;
 }
 
-void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+static void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
 {
     warp->mapGroup = mapGroup;
     warp->mapNum = mapNum;
@@ -286,7 +363,7 @@ void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8
     warp->y = y;
 }
 
-bool32 warp_data_is_not_neg_1(struct WarpData *warp)
+static bool32 warp_data_is_not_neg_1(struct WarpData *warp)
 {
     if (warp->mapGroup != -1)
         return FALSE;
@@ -301,31 +378,27 @@ bool32 warp_data_is_not_neg_1(struct WarpData *warp)
     return TRUE;
 }
 
-struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum)
+struct MapHeader *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum)
 {
     return gMapGroups[mapGroup][mapNum];
 }
 
-struct MapHeader * const warp1_get_mapheader(void)
+struct MapHeader *const warp1_get_mapheader(void)
 {
-    return get_mapheader_by_bank_and_number(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
+    return Overworld_GetMapHeaderByGroupAndId(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
 }
 
-void set_current_map_header_from_sav1_save_old_name(void)
+static void set_current_map_header_from_sav1_save_old_name(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    gSaveBlock1.mapDataId = dest->mapDataId;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
+    gMapHeader.mapData = get_mapdata_header();
 }
 
-void sub_805338C(void)
+static void LoadSaveblockMapHeader(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gMapHeader.mapData = get_mapdata_header();
 }
 
 void sub_80533CC(void)
@@ -382,6 +455,7 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused)
 void sub_8053538(u8 a1)
 {
     const struct HealLocation *warp = GetHealLocation(a1);
+
     if (warp)
         warp1_set(warp->group, warp->map, -1, warp->x, warp->y);
 }
@@ -400,9 +474,9 @@ void sub_8053588(u8 a1)
 
 void sub_80535C4(s16 a1, s16 a2)
 {
-    u8 v4 = sav1_map_get_light_level();
-    u8 v5 = get_map_light_level_by_bank_and_number(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
-    if (is_light_level_1_2_3_5_or_6(v4) && is_light_level_1_2_3_5_or_6(v5) != TRUE)
+    u8 v4 = Overworld_GetMapTypeOfSaveblockLocation();
+    u8 v5 = GetMapTypeByGroupAndId(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
+    if (is_map_type_1_2_3_5_or_6(v4) && is_map_type_1_2_3_5_or_6(v5) != TRUE)
         sub_805363C(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1, a1 - 7, a2 - 6);
 }
 
@@ -484,7 +558,7 @@ struct MapConnection *sub_8053818(u8 dir)
 bool8 sub_8053850(u8 dir, u16 x, u16 y)
 {
     struct MapConnection *connection = sub_8053818(dir);
-    if (connection)
+    if (connection != NULL)
     {
         warp1_set(connection->mapGroup, connection->mapNum, -1, x, y);
     }
@@ -523,8 +597,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     sub_8082BD0(mapGroup, mapNum);
     DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
-    sub_8053C98();
+    ChooseAmbientCrySpecies();
+    SetDefaultFlashLevel();
     sav1_reset_battle_music_maybe();
     mapheader_run_script_with_tag_x3();
     not_trainer_hill_battle_pyramid();
@@ -550,8 +624,8 @@ void sub_8053994(u32 a1)
 
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
-    v2 = is_light_level_1_2_3_5_or_6(gMapHeader.mapType);
-    v3 = is_light_level_8_or_9(gMapHeader.mapType);
+    v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType);
+    v3 = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
@@ -559,10 +633,10 @@ void sub_8053994(u32 a1)
     if (a1 != 1)
         DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
+    ChooseAmbientCrySpecies();
     if (v2)
-        FlagReset(SYS_USE_FLASH);
-    sub_8053C98();
+        FlagClear(SYS_USE_FLASH);
+    SetDefaultFlashLevel();
     sav1_reset_battle_music_maybe();
     mapheader_run_script_with_tag_x3();
     UpdateLocationHistoryForRoamer();
@@ -600,11 +674,11 @@ void walkrun_find_lowest_active_bit_in_bitfield(void)
 struct UnkPlayerStruct *sub_8053AA8(void)
 {
     struct UnkPlayerStruct playerStruct;
-    u8 light = sav1_map_get_light_level();
+    u8 mapType = Overworld_GetMapTypeOfSaveblockLocation();
     u16 v2 = cur_mapdata_block_role_at_screen_center_acc_to_sav1();
-    u8 v4 = sub_8053B00(&gUnknown_02029810, v2, light);
+    u8 v4 = sub_8053B00(&gUnknown_02029810, v2, mapType);
     playerStruct.player_field_0 = v4;
-    playerStruct.player_field_1 = sub_8053B60(&gUnknown_02029810, v4, v2, light);
+    playerStruct.player_field_1 = sub_8053B60(&gUnknown_02029810, v4, v2, mapType);
     gUnknown_02029810 = playerStruct;
     return &gUnknown_02029810;
 }
@@ -617,7 +691,7 @@ u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
         return 16;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(a2) == 1)
         return 8;
-    if (IsBikingAllowedByMap() != TRUE)
+    if (Overworld_IsBikeAllowedOnCurrentMap() != TRUE)
         return 1;
     if (playerStruct->player_field_0 == 2)
         return 2;
@@ -655,10 +729,12 @@ u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void)
     return MapGridGetMetatileBehaviorAt(gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7);
 }
 
-bool32 IsBikingAllowedByMap(void)
+bool32 Overworld_IsBikeAllowedOnCurrentMap(void)
 {
     // is player in cycling road entrance?
-    if (gSaveBlock1.location.mapGroup == 29 && (gSaveBlock1.location.mapNum == 11 || gSaveBlock1.location.mapNum == 12))
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+     && (gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+      || gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
         return TRUE;
 
     // is player indoor, in a secret base, or underwater?
@@ -669,37 +745,37 @@ bool32 IsBikingAllowedByMap(void)
     if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         return FALSE;
 
-    // is player in SeafloorCavern_Room9?
-    if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 36)
+    // Thou shalt not bike on the sacred resting grounds of Kyogre/Groudon.
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_SEAFLOOR_CAVERN_ROOM9
+     && gSaveBlock1.location.mapNum == MAP_ID_SEAFLOOR_CAVERN_ROOM9)
         return FALSE;
-
-    // is player in CaveOfOrigin_B4F?
-    if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 42)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_CAVE_OF_ORIGIN_B4F
+     && gSaveBlock1.location.mapNum == MAP_ID_CAVE_OF_ORIGIN_B4F)
         return FALSE;
 
     return TRUE;
 }
 
-void sub_8053C98(void)
+void SetDefaultFlashLevel(void)
 {
     if (!gMapHeader.cave)
-        gSaveBlock1.flashUsed = 0;
+        gSaveBlock1.flashLevel = 0;
     else if (FlagGet(SYS_USE_FLASH))
-        gSaveBlock1.flashUsed = 1;
+        gSaveBlock1.flashLevel = 1;
     else
-        gSaveBlock1.flashUsed = gUnknown_0839ACE8;
+        gSaveBlock1.flashLevel = gMaxFlashLevel;
 }
 
-void sub_8053CE4(s32 a1)
+void Overworld_SetFlashLevel(s32 flashLevel)
 {
-    if (a1 < 0 || a1 > gUnknown_0839ACE8)
-        a1 = 0;
-    gSaveBlock1.flashUsed = a1;
+    if (flashLevel < 0 || flashLevel > gMaxFlashLevel)
+        flashLevel = 0;
+    gSaveBlock1.flashLevel = flashLevel;
 }
 
-u8 sav1_get_flash_used_on_map(void)
+u8 Overworld_GetFlashLevel(void)
 {
-    return gSaveBlock1.flashUsed;
+    return gSaveBlock1.flashLevel;
 }
 
 void sub_8053D14(u16 mapDataId)
@@ -708,60 +784,62 @@ void sub_8053D14(u16 mapDataId)
     gMapHeader.mapData = get_mapdata_header();
 }
 
-bool16 sub_8053D30(struct WarpData *warp)
+static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
 {
     if (!FlagGet(SYS_WEATHER_CTRL))
         return FALSE;
-    if (warp->mapGroup != 0)
-        return FALSE;
-    switch (warp->mapNum)
+    if (warp->mapGroup == 0)
     {
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-        return TRUE;
-    case 39:
-    case 40:
-    case 41:
-    case 42:
-    case 43:
-        return TRUE;
+        switch (warp->mapNum)
+        {
+        case MAP_ID_LILYCOVE_CITY:
+        case MAP_ID_MOSSDEEP_CITY:
+        case MAP_ID_SOOTOPOLIS_CITY:
+        case MAP_ID_EVER_GRANDE_CITY:
+            return TRUE;
+        case MAP_ID_ROUTE124:
+        case MAP_ID_ROUTE125:
+        case MAP_ID_ROUTE126:
+        case MAP_ID_ROUTE127:
+        case MAP_ID_ROUTE128:
+            return TRUE;
+        }
     }
     return FALSE;
 }
 
-bool16 sub_8053D6C(struct WarpData *warp)
+static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
 {
-    if (VarGet(0x40B3))
+    if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED))
         return FALSE;
-    if (warp->mapGroup != 32)
+    if (warp->mapGroup != MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F)
         return FALSE;
-    if (warp->mapNum == 0 || warp->mapNum == 1)
+    if (warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F
+     || warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F)
         return TRUE;
     return FALSE;
 }
 
-u16 sub_8053D9C(struct WarpData *warp)
+static u16 GetLocationMusic(struct WarpData *warp)
 {
-    if (sub_8053D30(warp) == TRUE)
+    if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return LEGENDARY_MUSIC;
-    else if (sub_8053D6C(warp) == TRUE)
+    else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
         return BGM_TOZAN;
     else
-        return get_mapheader_by_bank_and_number(warp->mapGroup, warp->mapNum)->music;
+        return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
 }
 
 u16 sav1_map_get_music(void)
 {
     u16 music;
 
-    if (gSaveBlock1.location.mapGroup == 0
-     && gSaveBlock1.location.mapNum == 26
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE111
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE111
      && GetSav1Weather() == 8)
         return BGM_ASHROAD;
 
-    music = sub_8053D9C(&gSaveBlock1.location);
+    music = GetLocationMusic(&gSaveBlock1.location);
     if (music != 0x7FFF)
     {
         return music;
@@ -777,14 +855,15 @@ u16 sav1_map_get_music(void)
 
 u16 warp1_target_get_music(void)
 {
-    u16 music = sub_8053D9C(&gUnknown_020297F8);
+    u16 music = GetLocationMusic(&gUnknown_020297F8);
     if (music != 0x7FFF)
     {
         return music;
     }
     else
     {
-        if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 2)
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP_MAUVILLE_CITY
+         && gSaveBlock1.location.mapNum == MAP_ID_MAUVILLE_CITY)
             return BGM_DOORO_X1;
         else
             return BGM_GRANROAD;
@@ -804,7 +883,7 @@ void sub_8053E90(void)
     {
         if (gSaveBlock1.battleMusic)
             music = gSaveBlock1.battleMusic;
-        else if (sav1_map_get_light_level() == 5)
+        else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
             music = BGM_DEEPDEEP;
         else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
             music = BGM_NAMINORI;
@@ -854,17 +933,17 @@ void sub_8053F84(void)
         FadeOutAndPlayNewMapMusic(sav1_map_get_music(), 8);
 }
 
-void sub_8053FB0(u16 music)
+void Overworld_ChangeMusicTo(u16 newMusic)
 {
     u16 currentMusic = GetCurrentMapMusic();
-    if (currentMusic != music && currentMusic != LEGENDARY_MUSIC)
-        FadeOutAndPlayNewMapMusic(music, 8);
+    if (currentMusic != newMusic && currentMusic != LEGENDARY_MUSIC)
+        FadeOutAndPlayNewMapMusic(newMusic, 8);
 }
 
-u8 is_warp1_light_level_8_or_9(void)
+u8 GetMapMusicFadeoutSpeed(void)
 {
     struct MapHeader *mapHeader = warp1_get_mapheader();
-    if (is_light_level_8_or_9(mapHeader->mapType) == TRUE)
+    if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE)
         return 2;
     else
         return 4;
@@ -875,7 +954,7 @@ void sub_8053FF8(void)
     u16 music = warp1_target_get_music();
     if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
     {
-        u8 speed = is_warp1_light_level_8_or_9();
+        u8 speed = GetMapMusicFadeoutSpeed();
         FadeOutMapMusic(speed);
     }
 }
@@ -890,43 +969,43 @@ void sub_8054044(void)
     FadeOutMapMusic(4);
 }
 
-void sub_8054050(void)
+static void PlayAmbientCry(void)
 {
     s16 x, y;
-    PlayerGetDestCoords((u16 *)&x, (u16 *)&y);
-    if (gUnknown_02029816 != TRUE
+    PlayerGetDestCoords(&x, &y);
+    if (sIsAmbientCryWaterMon != TRUE
      || MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y)))
     {
         s8 pan = (Random() % 88) + 212;
         s8 volume = (Random() % 30) + 50;
-        PlayCry2(gUnknown_02029814, pan, volume, 1);
+        PlayCry2(sAmbientCrySpecies, pan, volume, 1);
     }
 }
 
-void sub_80540D0(s16 *a1, u16 *a2)
+void UpdateAmbientCry(s16 *state, u16 *delayCounter)
 {
-    switch (*a1)
+    switch (*state)
     {
     case 0:
-        if (!gUnknown_02029814)
-            *a1 = 4;
+        if (sAmbientCrySpecies == SPECIES_NONE)
+            *state = 4;
         else
-            *a1 = 1;
+            *state = 1;
         break;
     case 1:
-        *a2 = (Random() % 2400) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 2400) + 1200;
+        *state = 3;
         break;
     case 2:
-        *a2 = (Random() % 1200) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 1200) + 1200;
+        *state = 3;
         break;
     case 3:
-        (*a2)--;
-        if (*a2 == 0)
+        (*delayCounter)--;
+        if (*delayCounter == 0)
         {
-            sub_8054050();
-            *a1 = 2;
+            PlayAmbientCry();
+            *state = 2;
         }
         break;
     case 4:
@@ -934,58 +1013,70 @@ void sub_80540D0(s16 *a1, u16 *a2)
     }
 }
 
-void sub_8054164(void)
+void ChooseAmbientCrySpecies(void)
 {
-    if ((gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 45) && !IsMirageIslandPresent())
+    if ((gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE130
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE130)
+     && !IsMirageIslandPresent())
     {
-        gUnknown_02029816 = TRUE;
-        gUnknown_02029814 = GetMirageIslandMon();
+        // Only play water pokemon cries on this route
+        // when Mirage Island is not present
+        sIsAmbientCryWaterMon = TRUE;
+        sAmbientCrySpecies = GetLocalWaterMon();
     }
     else
     {
-        gUnknown_02029814 = GetLocalWildMon(&gUnknown_02029816);
+        sAmbientCrySpecies = GetLocalWildMon(&sIsAmbientCryWaterMon);
     }
 }
 
-u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum)
+u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum)
 {
-    return get_mapheader_by_bank_and_number(mapGroup, mapNum)->mapType;
+    return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->mapType;
 }
 
-u8 get_map_light_level_from_warp(struct WarpData *warp)
+u8 GetMapTypeByWarpData(struct WarpData *warp)
 {
-    return get_map_light_level_by_bank_and_number(warp->mapGroup, warp->mapNum);
+    return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum);
 }
 
-u8 sav1_map_get_light_level(void)
+u8 Overworld_GetMapTypeOfSaveblockLocation(void)
 {
-    return get_map_light_level_from_warp(&gSaveBlock1.location);
+    return GetMapTypeByWarpData(&gSaveBlock1.location);
 }
 
-u8 get_map_light_from_warp0(void)
+u8 get_map_type_from_warp0(void)
 {
-    return get_map_light_level_from_warp(&gUnknown_020297F0);
+    return GetMapTypeByWarpData(&gUnknown_020297F0);
 }
 
-bool8 is_light_level_1_2_3_5_or_6(u8 a1)
+bool8 is_map_type_1_2_3_5_or_6(u8 mapType)
 {
-    if (a1 == 3 || a1 == 1 || a1 == 5 || a1 == 2 || a1 == 6)
+    if (mapType == MAP_TYPE_ROUTE
+     || mapType == MAP_TYPE_TOWN
+     || mapType == MAP_TYPE_UNDERWATER
+     || mapType == MAP_TYPE_CITY
+     || mapType == MAP_TYPE_6)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 is_light_level_1_2_3_or_6(u8 a1)
+bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
 {
-    if (a1 == 3 || a1 == 1 || a1 == 6 || a1 == 2)
+    if (mapType == MAP_TYPE_ROUTE
+     || mapType == MAP_TYPE_TOWN
+     || mapType == MAP_TYPE_6
+     || mapType == MAP_TYPE_CITY)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 is_light_level_8_or_9(u8 a1)
+bool8 Overworld_MapTypeIsIndoors(u8 mapType)
 {
-    if (a1 == 8 || a1 == 9)
+    if (mapType == MAP_TYPE_INDOOR
+     || mapType == MAP_TYPE_SECRET_BASE)
         return TRUE;
     else
         return FALSE;
@@ -993,17 +1084,17 @@ bool8 is_light_level_8_or_9(u8 a1)
 
 u8 unref_sub_8054260(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_name(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_battletype(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType;
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType;
 }
 
 void ResetSafariZoneFlag_(void)
@@ -1046,7 +1137,7 @@ void c1_overworld(void)
         c1_overworld_normal(gMain.newKeys, gMain.heldKeys);
 }
 
-void c2_overworld_basic(void)
+void OverworldBasic(void)
 {
     ScriptContext2_RunScript();
     RunTasks();
@@ -1058,9 +1149,9 @@ void c2_overworld_basic(void)
     sub_8072EDC();
 }
 
-void sub_8054398(void)
+void CB2_OverworldBasic(void)
 {
-    c2_overworld_basic();
+    OverworldBasic();
 }
 
 void c2_overworld(void)
@@ -1068,7 +1159,7 @@ void c2_overworld(void)
     int fading = (gPaletteFade.active != 0);
     if (fading)
         SetVBlankCallback(NULL);
-    c2_overworld_basic();
+    OverworldBasic();
     if (fading)
         SetFieldVBlankCallback();
 }
@@ -1265,8 +1356,8 @@ void CB2_ContinueSavedGame(void)
     FieldClearVBlankHBlankCallbacks();
     StopMapMusic();
     ResetSafariZoneFlag_();
-    sub_805338C();
-    sub_8053198();
+    LoadSaveblockMapHeader();
+    LoadSaveblockMapObjScripts();
     UnfreezeMapObjects();
     DoTimeBasedEvents();
     sub_805308C();
@@ -1317,11 +1408,11 @@ void VBlankCB_Field(void)
 
 void sub_8054814(void)
 {
-    u8 val = sav1_get_flash_used_on_map();
+    u8 val = Overworld_GetFlashLevel();
     if (val)
     {
         sub_80815E0(val);
-        sub_80895F8(gUnknown_08216694[0], gUnknown_08216694[1], gUnknown_08216694[2]);
+        sub_80895F8(gUnknown_08216694);
     }
 }
 
@@ -2434,27 +2525,27 @@ void sub_8055BFC(u8 linkPlayerId, u8 a2)
     }
 }
 
-u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 1;
 }
 
-u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 0;
 }
 
-u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     s16 x, y;
 
@@ -2474,18 +2565,18 @@ u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *m
     }
 }
 
-u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     mapObj->mapobj_unk_19 = npc_something3(a3, mapObj->mapobj_unk_19);
     return 0;
 }
 
-void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     linkPlayerMapObj->mode = 0;
 }
 
-void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     mapObj->mapobj_unk_21--;
     linkPlayerMapObj->mode = 1;
diff --git a/src/party_menu.c b/src/party_menu.c
index 1fcd2cdda..39477e293 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -33,15 +33,6 @@
 #include "species.h"
 #include "party_menu.h"
 
-#define DATA_COUNT (6)
-
-struct Unk2001000
-{
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-};
-
 struct Unk201C000
 {
     /*0x00*/ struct Pokemon *pokemon;
@@ -68,8 +59,6 @@ struct UnknownStruct5
     u16 *unk4;
 };
 
-extern u8 ewram[];
-#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
 #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000))
 #define ewram1F000 (*(struct Unk201F000 *)(ewram + 0x1F000))
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 6d52c560a..83e6dd221 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -18,7 +18,7 @@
 #include "songs.h"
 #include "name_string_util.h"
 #include "mail.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "player_pc.h"
 
 extern void DisplayItemMessageOnField(u8, const u8*, TaskFunc, u16);
@@ -106,7 +106,7 @@ static const u8 *const gPCText_OptionDescList[] =
     gMenuText_GoBackToPrev
 };
 
-static const struct MenuAction2 gPCText_PlayerPCOptionsText[] =
+static const struct MenuAction2 sPlayerPCMenuActions[] =
 {
     { SecretBaseText_ItemStorage, PlayerPC_ItemStorage },
     { gPCText_Mailbox, PlayerPC_Mailbox },
@@ -226,7 +226,7 @@ void PlayerPC(void)
 static void InitPlayerPCMenu(u8 taskId)
 {
     MenuDrawTextWindow(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1);
-    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, (struct MenuAction *)gPCText_PlayerPCOptionsText, gPcItemMenuOptionOrder);
+    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder);
     InitMenu(0, 1, 1, gPcItemMenuOptionsNum, 0, 9);
     TASK.FUNC = PlayerPCProcessMenuInput;
 }
@@ -247,13 +247,13 @@ static void PlayerPCProcessMenuInput(u8 taskId)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
+        sPlayerPCMenuActions[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
     }
     else if (gMain.newKeys & B_BUTTON)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
+        sPlayerPCMenuActions[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
     }
 }
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 029bb066f..d69c41639 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -3,7 +3,7 @@
 //
 
 #include "global.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "script.h"
 #include "strings.h"
@@ -816,7 +816,7 @@ static void sub_810C368(u8 taskId)
     sub_80F98A4(1);
     BasicInitMenuWindow(&gWindowConfig_81E6E50);
     MenuDrawTextWindow(7, v0 + 4, 13, 11);
-    PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, (const struct MenuAction *)gUnknown_083F7EF4, gUnknown_03000758);
+    PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758);
     InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
     gScriptItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1;
     gTasks[taskId].func = sub_810C40C;
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index db4db55a7..ccbb391af 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -6,7 +6,7 @@
 #include "text.h"
 #include "text_window.h"
 #include "menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "decompress.h"
 #include "data2.h"
 #include "sprite.h"
diff --git a/src/pokedex.c b/src/pokedex.c
index c132635cb..603b5ae48 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -16,7 +16,7 @@
 #include "pokedex_cry_screen.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 5cfd2c794..1d597cb17 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
@@ -17,9 +17,9 @@
 #define LOHALF(n) ((n) & 0xFFFF)
 
 extern u8 unk_2000000[];
-extern u16 word_2024E82;
+extern u16 gMoveToLearn;
 
-static EWRAM_DATA u8 byte_2024E88 = 0;
+static EWRAM_DATA u8 sLearningMoveTableID = 0;
 
 u8 gPlayerPartyCount;
 struct Pokemon gPlayerParty[6];
@@ -69,6 +69,7 @@ void ZeroEnemyPartyMons(void)
 void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
 {
     u32 arg;
+
     ZeroMonData(mon);
     CreateBoxMon(&mon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
     SetMonData(mon, MON_DATA_LEVEL, &level);
@@ -583,29 +584,33 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
     }
 }
 
-u16 sub_803B7C8(struct Pokemon *mon, u8 a2)
+u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
 {
     u32 retVal = 0;
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
     u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
 
-    if (a2)
+    // since you can learn more than one move per level
+    // the game needs to know whether you decided to
+    // learn it or keep the old set to avoid asking
+    // you to learn the same move over and over again
+    if (firstMove)
     {
-        byte_2024E88 = retVal;
+        sLearningMoveTableID = 0;
 
-        while ((gLevelUpLearnsets[species][byte_2024E88] & 0xFE00) != (level << 9))
+        while ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) != (level << 9))
         {
-            byte_2024E88++;
-            if (gLevelUpLearnsets[species][byte_2024E88] == (u16)-1)
+            sLearningMoveTableID++;
+            if (gLevelUpLearnsets[species][sLearningMoveTableID] == 0xFFFF)
                 return 0;
         }
     }
 
-    if ((gLevelUpLearnsets[species][byte_2024E88] & 0xFE00) == (level << 9))
+    if ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) == (level << 9))
     {
-        word_2024E82 = (gLevelUpLearnsets[species][byte_2024E88] & 0x1FF);
-        byte_2024E88++;
-        retVal = GiveMoveToMon(mon, word_2024E82);
+        gMoveToLearn = (gLevelUpLearnsets[species][sLearningMoveTableID] & 0x1FF);
+        sLearningMoveTableID++;
+        retVal = GiveMoveToMon(mon, gMoveToLearn);
     }
 
     return retVal;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d7cc39546..e51d3187b 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -11,7 +11,7 @@
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
 #include "rtc.h"
@@ -1197,7 +1197,7 @@ const struct CompressedSpritePalette *sub_80409C8(u16 species, u32 otId , u32 pe
         return &gMonPaletteTable[species];
 }
 
-bool8 IsHMMove2(u16 move)
+bool32 IsHMMove2(u16 move)
 {
     int i = 0;
     while (gHMMoves[i] != 0xFFFF)
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
new file mode 100644
index 000000000..bc5150a16
--- /dev/null
+++ b/src/pokemon_menu.c
@@ -0,0 +1,1200 @@
+#include "global.h"
+#include "pokemon.h"
+#include "pokemon_menu.h"
+#include "party_menu.h"
+#include "palette.h"
+#include "menu.h"
+#include "mail_data.h"
+#include "songs.h"
+#include "sound.h"
+#include "main.h"
+#include "overworld.h"
+#include "menu_helpers.h"
+#include "pokemon_summary_screen.h"
+#include "moves.h"
+#include "data2.h"
+#include "strings.h"
+#include "item_use.h"
+#include "item.h"
+#include "event_data.h"
+#include "mail.h"
+#include "field_player_avatar.h"
+#include "fldeff_softboiled.h"
+#include "braille_puzzles.h"
+#include "field_fadetransition.h"
+#include "field_weather.h"
+#include "field_effect.h"
+#include "field_control_avatar.h"
+#include "metatile_behavior.h"
+#include "fieldmap.h"
+#include "item_menu.h"
+#include "player_pc.h"
+
+/*
+Pokemon menu:
+    The menu that appears when you
+    click on a pokemon in
+    overworld 'pokemon' menu
+*/
+
+struct PokeMenuFieldMoveFunc
+{
+    bool8 (*func)(void);
+    u8 field_1;
+};
+
+extern u8 gUnknown_020384F0;
+extern u8 gUnknown_0202E8F4;
+extern u8 gUnknown_0202E8F5;
+extern u8 gUnknown_0202E8F6;
+extern u8 gUnknown_02038561;
+extern u16 gUnknown_0202E8F8;
+extern u8 ewram[];
+extern void (*gUnknown_03004AE4)(u8 taskID, u16 itemID, TaskFunc func);
+extern TaskFunc gUnknown_03005CF0;
+
+void sub_80E62A0(u8 arg0, struct MailStruct* arg1, void* arg2, u8 arg3);
+void sub_808A520(void);
+void sub_80A61D0(void);
+void CB2_InitFlyRegionMap(void);
+u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem);
+bool8 SetUpFieldMove_Cut(void);
+bool8 SetUpFieldMove_Flash(void);
+bool8 SetUpFieldMove_RockSmash(void);
+bool8 SetUpFieldMove_Strength(void);
+bool8 SetUpFieldMove_Teleport(void);
+bool8 SetUpFieldMove_Dig(void);
+bool8 SetUpFieldMove_SecretPower(void);
+bool8 SetUpFieldMove_SoftBoiled(void);
+bool8 SetUpFieldMove_SoftBoiled(void);
+bool8 SetUpFieldMove_SweetScent(void);
+
+#define sFieldMovesTerminator 0xFF // note: should be changed to 0xFFFF, because currently it makes it impossible to add a field move with 0xFF index
+
+// this file's functions
+static void sub_808A8A8(void);
+static void sub_808B3EC(void);
+static void sub_8089D94(u8 taskID);
+static void sub_8089E4C(u8 taskID);
+static void sub_808A5BC(u8 taskID);
+static void sub_808A8D4(u8 taskID);
+static void sub_808A73C(u8 taskID);
+static void sub_808A848(u8 taskID);
+static void sub_808AAF0(u8 taskID);
+static void sub_808ABF4(u8 taskID);
+static void sub_808AB34(u8 taskID);
+static void sub_808ABA8(u8 taskID);
+static void sub_808B224(u8 taskID);
+static void sub_808B2EC(u8 taskID);
+static void sub_808B2B4(u8 taskID);
+static void sub_808B25C(u8 taskID);
+static void sub_808B1EC(u8 taskID);
+static void sub_808B338(u8 taskID);
+static void sub_808B4A4(u8 taskID);
+static void sub_808B4EC(u8 taskID);
+static void sub_808B5E4(u8 taskID);
+static void PokemonMenu_Summary(u8 taskID);
+static void PokemonMenu_Switch(u8 taskID);
+static void PokemonMenu_Item(u8 taskID);
+static void PokemonMenu_Cancel(u8 taskID);
+static void PokemonMenu_GiveItem(u8 taskID);
+static void PokemonMenu_TakeItem(u8 taskID);
+static void PokemonMenu_TakeMail(u8 taskID);
+static void PokemonMenu_Mail(u8 taskID);
+static void PokemonMenu_ReadMail(u8 taskID);
+static void PokemonMenu_CancelSubmenu(u8 taskID);
+static void PokemonMenu_FieldMove(u8 taskID);
+static bool8 SetUpFieldMove_Waterfall(void);
+static bool8 SetUpFieldMove_Surf(void);
+static bool8 SetUpFieldMove_Fly(void);
+static bool8 SetUpFieldMove_Dive(void);
+
+// ewram data
+
+EWRAM_DATA static u8 sPokeMenuCursorPos = 0;
+EWRAM_DATA static u8 sPokeMenuOptionsNo = 0;
+EWRAM_DATA static u8 sPokeMenuOptionsOrder[8] = {0}; // 4 possible field moves and 4 default options
+
+// iwram common
+u8 gLastFieldPokeMenuOpened;
+void (*gUnknown_03005CE4)(void);
+
+// const data
+
+static const struct MenuAction2 sPokemonMenuActions[] =
+{
+    {OtherText_Summary,             PokemonMenu_Summary},
+    {OtherText_Switch2,             PokemonMenu_Switch},
+    {OtherText_Item,                PokemonMenu_Item},
+    {gOtherText_CancelNoTerminator, PokemonMenu_Cancel},
+    {OtherText_Give2,               PokemonMenu_GiveItem},
+    {OtherText_Take2,               PokemonMenu_TakeItem},
+    {OtherText_Take,                PokemonMenu_TakeMail},
+    {OtherText_Mail,                PokemonMenu_Mail},
+    {OtherText_Read2,               PokemonMenu_ReadMail},
+    {gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu},
+    {gMoveNames[MOVE_CUT],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLASH],        PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_ROCK_SMASH],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_STRENGTH],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SURF],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLY],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIVE],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_WATERFALL],    PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_TELEPORT],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIG],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SECRET_POWER], PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_MILK_DRINK],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SOFT_BOILED],  PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SWEET_SCENT],  PokemonMenu_FieldMove},
+};
+
+static const u16 sPokeMenuFieldMoves[] =
+{
+    MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH,
+    MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL,
+    MOVE_TELEPORT, MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK,
+    MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, sFieldMovesTerminator,
+};
+
+static const u8 sUnknown_39F572[] = {4, 5, 9, 0};
+static const struct PartyPopupMenu sUnknown_0839F578 = {3, 6, sUnknown_39F572};
+
+static const u8 sUnknown_39F580[] = {8, 6, 9, 0};
+static const struct PartyPopupMenu sUnknown_0839F584 = {3, 9, sUnknown_39F580};
+
+static const struct PokeMenuFieldMoveFunc sFieldMoveFuncs[] =
+{
+    {SetUpFieldMove_Cut,            0x6},
+    {SetUpFieldMove_Flash,          0x9},
+    {SetUpFieldMove_RockSmash,      0x9},
+    {SetUpFieldMove_Strength,       0x9},
+    {SetUpFieldMove_Surf,           0x7},
+    {SetUpFieldMove_Fly,            0x9},
+    {SetUpFieldMove_Dive,           0x9},
+    {SetUpFieldMove_Waterfall,      0x9},
+    {SetUpFieldMove_Teleport,       0x9},
+    {SetUpFieldMove_Dig,            0x9},
+    {SetUpFieldMove_SecretPower,    0x9},
+    {SetUpFieldMove_SoftBoiled,     0x10},
+    {SetUpFieldMove_SoftBoiled,     0x10},
+    {SetUpFieldMove_SweetScent,     0x9},
+};
+
+void sub_8089A70(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    OpenPartyMenu(0, 0);
+}
+
+static void sub_8089A8C(void)
+{
+    sPokeMenuOptionsNo = 0;
+    // if checking pokemon is an egg, we can't give it an item and it doesn't know any move
+    if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
+    {
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SUMMARY);
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SWITCH);
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_CANCEL);
+    }
+    else
+    {
+        u16 moveID, tableID;
+        for (moveID = 0; moveID < 4; moveID++) // 4, max number of possible field moves
+        {
+            for (tableID = 0; sPokeMenuFieldMoves[tableID] != sFieldMovesTerminator; tableID++)
+            {
+                if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_MOVE1 + moveID) == sPokeMenuFieldMoves[tableID])
+                {
+                    u8 fieldID = tableID + POKEMENU_FIRST_FIELD_MOVE_ID;
+                    AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, fieldID);
+                    break;
+                }
+            }
+        }
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SUMMARY);
+
+        // can't switch a pokemon if it's the only one in the party
+        if (GetMonData(&gPlayerParty[1], MON_DATA_SPECIES) != 0)
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SWITCH);
+
+        if (ItemIsMail(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM)))
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_MAIL);
+        else
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_ITEM);
+
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_CANCEL);
+    }
+}
+
+static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order, u8 arg6)
+{
+    sub_806D538(5, arg6);
+    MenuDrawTextWindow(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1);
+    PrintMenuItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order);
+}
+
+void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order)
+{
+    sub_8089BDC(arg0, arg1, arg2, noOfOptions, menuActions, order, 1);
+}
+
+static void sub_8089C7C(u8 arg0)
+{
+    u32 r4 = (u8)(18 - (sPokeMenuOptionsNo << 1));
+
+    sub_8089BDC(19, r4, 10, sPokeMenuOptionsNo, sPokemonMenuActions, sPokeMenuOptionsOrder, 3);
+    r4 |= 1;
+    InitMenu(0, 20, r4, sPokeMenuOptionsNo, arg0, 9);
+}
+
+void sub_8089CD4(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BD80(taskID))
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+            sub_8089A8C();
+            sPokeMenuCursorPos = 0;
+            sub_8089C7C(0);
+            gTasks[taskID].func = sub_8089D94;
+            sub_808B5B4(taskID);
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            gTasks[taskID].func = sub_8089E4C;
+            break;
+        }
+    }
+}
+
+static void sub_8089D94(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+        {
+            PlaySE(SE_SELECT);
+            sPokeMenuCursorPos = MoveMenuCursor(-1);
+            sub_808B5B4(taskID);
+        }
+        else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+        {
+            PlaySE(SE_SELECT);
+            sPokeMenuCursorPos = MoveMenuCursor(1);
+            sub_808B5B4(taskID);
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sPokemonMenuActions[sPokeMenuOptionsOrder[sPokeMenuCursorPos]].func(taskID);
+            sub_808B5B4(taskID);
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PokemonMenu_Cancel(taskID);
+            sub_808B5B4(taskID);
+        }
+    }
+}
+
+static void sub_8089E4C(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        gLastFieldPokeMenuOpened = 0;
+        SetMainCallback2(sub_805469C);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_8089E84(void)
+{
+    GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+    sub_8089A8C();
+    sPokeMenuCursorPos = 0;
+    sub_8089C7C(0);
+}
+
+static void sub_8089EBC(void)
+{
+    do
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            gLastFieldPokeMenuOpened = gUnknown_020384F0;
+            sub_8089E84();
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+    } while (sub_80F9344() != TRUE);
+}
+
+static void sub_8089F14(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    sub_806AF4C(0, 0xFF, sub_8089D94, 5);
+    SetMainCallback2(sub_8089EBC);
+}
+
+static void sub_8089F44(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 spriteID = gSprites[gTasks[taskID].data[3] >> 8].data0;
+        DestroyTask(taskID);
+        ewram1B000_alt.unk262 = 1;
+        ShowPokemonSummaryScreen(gPlayerParty, spriteID, gPlayerPartyCount - 1, sub_8089F14, 0);
+    }
+}
+
+static void PokemonMenu_Summary(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_8089F44;
+}
+
+void sub_808A004(u8 taskID)
+{
+    SetTaskFuncWithFollowupFunc(taskID, sub_806CA60, sub_8089CD4);
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+}
+
+static void PokemonMenu_Switch(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    ewram01000.unkC = sub_806CD5C;
+    ewram01000.array[53553] = 1;
+    sub_808A004(taskID);
+}
+
+static void sub_808A060(u8 taskID)
+{
+    if (gMain.newKeys == DPAD_UP && sPokeMenuCursorPos != 0)
+    {
+        sPokeMenuCursorPos = MoveMenuCursor(-1);
+        PlaySE(SE_SELECT);
+    }
+    if (gMain.newKeys == DPAD_DOWN && sPokeMenuCursorPos != 2)
+    {
+        sPokeMenuCursorPos = MoveMenuCursor(1);
+        PlaySE(SE_SELECT);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F578, (void *)sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_806E7D0(0, &sUnknown_0839F578);
+        PokemonMenu_CancelSubmenu(taskID);
+    }
+}
+
+static void sub_808A100(u8 taskID)
+{
+    sub_806E750(0, &sUnknown_0839F578, (void*)(sPokemonMenuActions), 0);
+    sub_806D538(0xD, 2);
+    gTasks[taskID].func = sub_808A060;
+}
+
+static void PokemonMenu_Item(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    gTasks[taskID].func = sub_808A100;
+}
+
+static void sub_808A180(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3);
+    }
+}
+
+static void sub_808A1E0(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1)
+    {
+        SetHeldItemIconVisibility(taskID, sub_806CA38(taskID));
+        sub_806D538(0, 0);
+        gTasks[taskID].func = sub_8089CD4;
+    }
+}
+
+static void sub_808A228(u8 taskID)
+{
+    if (ItemIsMail(gScriptItemId) && gUnknown_0202E8F4 != 0)
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].func = sub_808A180;
+    }
+    else
+    {
+        MenuZeroFillWindowRect(0, 0, 29, 19);
+        sub_806D538(0, 0);
+        gTasks[taskID].func = sub_8089CD4;
+    }
+}
+
+static void sub_808A2AC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+        PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A228);
+}
+
+static void sub_808A2DC(u8 taskID)
+{
+    u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+    DestroyTask(taskID);
+    sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3);
+}
+
+static void sub_808A330(u8 taskID)
+{
+    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A2DC);
+}
+
+static void sub_808A34C(void)
+{
+    RunTasks();
+}
+
+static void sub_808A358(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+static void sub_808A3A4(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            EWRAM_1B000.unk262 = 3;
+            sub_8089E84();
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808A3F8(void)
+{
+    if (ItemIsMail(gScriptItemId))
+    {
+        u8 taskID = CreateTask(sub_808A330, 0);
+        gPaletteFade.bufferTransferDisabled = 1;
+        sub_806BD58(taskID, 0);
+        sub_806C994(taskID, gLastFieldPokeMenuOpened);
+        sub_806BF74(taskID, 0);
+        if (!(bool8)(GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_HELD_ITEM)))
+        {
+            SetMainCallback2(sub_808A34C);
+            return;
+        }
+        else
+            DestroyTask(taskID);
+    }
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptItemId)
+    {
+        sub_806AF4C(0, 0xFF, sub_808A2AC, 0xFF);
+        SetMainCallback2(sub_808A358);
+    }
+    else
+    {
+        sub_806AF4C(0, 0xFF, sub_8089D94, 5);
+        SetMainCallback2(sub_808A3A4);
+    }
+}
+
+static void sub_808A4D4(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808A520(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptResult == 0)
+    {
+        if (gUnknown_0202E8F8)
+            RemoveBagItem(gUnknown_0202E8F8, 1);
+        AddBagItem(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM), 1);
+        TakeMailFromMon(&gPlayerParty[gLastFieldPokeMenuOpened]);
+        SetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM, (void*) &gUnknown_0202E8F8);
+        sub_806AF4C(0, 0xFF, sub_8089CD4, 0);
+    }
+    else
+        sub_806AF4C(0, 0xFF, sub_808A5BC, 0xFF);
+    SetMainCallback2(sub_808A4D4);
+}
+
+static void sub_808A5BC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 0);
+        gTasks[taskID].func = sub_808A1E0;
+    }
+}
+
+static void sub_808A604(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sub_80A61D0);
+        DestroyTask(taskID);
+    }
+}
+
+static void PokemonMenu_GiveItem(u8 taskID)
+{
+    gUnknown_0202E8F5 = sub_806CA38(taskID);
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808A604;
+}
+
+static void sub_808A678(u8 taskID)
+{
+    sub_808A8D4(taskID);
+}
+
+static void PokemonMenu_TakeItem(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    PartyMenuTryGiveMonHeldItem_806ECE8(taskID, sub_808A678);
+}
+
+static void PokemonMenu_TakeMail(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    DoTakeMail(taskID, sub_808A678);
+}
+
+static void PokemonMenu_Mail(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806E750(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, 0);
+    gTasks[taskID].func = sub_808A73C;
+}
+
+static void sub_808A73C(u8 taskID)
+{
+    if (gMain.newAndRepeatedKeys == DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        if (sPokeMenuCursorPos == 0)
+            sPokeMenuCursorPos = MoveMenuCursor(sUnknown_0839F584.unk0 - 1);
+        else
+            sPokeMenuCursorPos = MoveMenuCursor(-1);
+    }
+    if (gMain.newAndRepeatedKeys == DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        if (sPokeMenuCursorPos == sUnknown_0839F584.unk0 - 1)
+            sPokeMenuCursorPos = MoveMenuCursor(1 - sUnknown_0839F584.unk0);
+        else
+            sPokeMenuCursorPos = MoveMenuCursor(1);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_806E7D0(0, &sUnknown_0839F584);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void PokemonMenu_ReadMail(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808A848;
+}
+
+static void sub_808A848(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        HandleReadMail(&gSaveBlock1.mail[mailID], sub_808A8A8, 1);
+    }
+}
+
+static void sub_808A8A8(void)
+{
+    gUnknown_020384F0 = gLastFieldPokeMenuOpened;
+    ewram1B000.unk262 = 4;
+    sub_8089F14();
+}
+
+static void sub_808A8D4(u8 taskID)
+{
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D538(0, 0);
+    gTasks[taskID].func = sub_8089CD4;
+}
+
+static void PokemonMenu_Cancel(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    PlaySE(SE_SELECT);
+    sub_808A8D4(taskID);
+}
+
+static void PokemonMenu_CancelSubmenu(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    PlaySE(SE_SELECT);
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    sub_8089C7C(sPokeMenuCursorPos);
+    gTasks[taskID].func = sub_8089D94;
+}
+
+#define IS_SOFTBOILED_MILKDRINK(ID)((ID == (POKEMENU_MILK_DRINK - POKEMENU_FIRST_FIELD_MOVE_ID) || ID == (POKEMENU_SOFT_BOILED - POKEMENU_FIRST_FIELD_MOVE_ID)))
+#define IS_SURF(ID)((ID == (POKEMENU_SURF - POKEMENU_FIRST_FIELD_MOVE_ID)))
+#define IS_FLY(ID)((ID == (POKEMENU_FLY - POKEMENU_FIRST_FIELD_MOVE_ID)))
+
+#define tFieldMoveId data[11]
+
+static void PokemonMenu_FieldMove(u8 taskID)
+{
+    s16* data = gTasks[taskID].data;
+
+    HandleDestroyMenuCursors();
+    tFieldMoveId = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID;
+    if (sub_80F9344() == TRUE)
+    {
+        MenuZeroFillWindowRect(19, 0, 29, 19);
+        if (IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
+            sub_806D538(9, 0);
+        else
+            sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
+        gTasks[taskID].func = sub_808ABF4;
+    }
+    else if (tFieldMoveId <= 7 && FlagGet(BADGE01_GET + tFieldMoveId) != TRUE)
+    {
+        // can't use a field HM move without a proper badge
+        MenuZeroFillWindowRect(19, 0, 29, 19);
+        sub_806D5A4();
+        sub_806E834(gOtherText_CantBeUsedBadge, 1);
+        gTasks[taskID].func = sub_808AAF0;
+    }
+    else
+    {
+        if (sFieldMoveFuncs[tFieldMoveId].func() == TRUE)
+        {
+            sPokeMenuCursorPos = 0;
+            if (!IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
+            {
+                gTasks[taskID].func = sub_808AB34;
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            }
+            else
+                sub_8133D28(taskID);
+        }
+        else
+        {
+            MenuZeroFillWindowRect(19, 0, 29, 19);
+            if (IS_SURF(tFieldMoveId) && TestPlayerAvatarFlags(8))
+                sub_806D538(8, 0);
+            else
+                sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
+            gTasks[taskID].func = sub_808ABF4;
+        }
+    }
+}
+
+static void sub_808AAF0(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1 && (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON))
+    {
+        MenuZeroFillWindowRect(0, 14, 29, 19);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void sub_808AB34(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        if (!IS_FLY(gTasks[taskID].tFieldMoveId) || ShouldDoBrailleFlyEffect())
+            SetMainCallback2(c2_exit_to_overworld_2_switch);
+        else
+            SetMainCallback2(CB2_InitFlyRegionMap);
+        DestroyTask(taskID);
+    }
+}
+
+#undef tFieldMoveId
+
+void FieldCallback_Teleport(void)
+{
+    pal_fill_black();
+    CreateTask(sub_808ABA8, 8);
+}
+
+static void sub_808ABA8(u8 taskID)
+{
+    if (sub_807D770() == TRUE)
+    {
+        gFieldEffectArguments[0] = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
+        gUnknown_03005CE4();
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808ABF4(u8 taskID)
+{
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        MenuZeroFillWindowRect(1, 17, 28, 18);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void sub_808AC2C(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_SURF);
+}
+
+static bool8 SetUpFieldMove_Surf(void)
+{
+    if (PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AC2C;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AC8C(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_FLY);
+}
+
+static bool8 SetUpFieldMove_Fly(void)
+{
+    if (ShouldDoBrailleFlyEffect())
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = DoBrailleFlyEffect;
+        return TRUE;
+    }
+    if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AC8C;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_808AD0C(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808AD58(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    sub_806AF4C(0, 0xFF, sub_8089CD4, 0);
+    SetMainCallback2(sub_808AD0C);
+}
+
+u16 unref_sub_808AD88(void)
+{
+    return GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
+}
+
+static void sub_808ADAC(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_DIVE);
+}
+
+static bool8 SetUpFieldMove_Dive(void)
+{
+    gFieldEffectArguments[1] = sub_8068F18();
+    if (gFieldEffectArguments[1])
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808ADAC;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AE08(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_WATERFALL);
+}
+
+static bool8 SetUpFieldMove_Waterfall(void)
+{
+    s16 x, y;
+    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+    if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE
+        && IsPlayerSurfingNorth() == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AE08;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AE8C(void)
+{
+    u8 i;
+    u8 arg = gScriptItemId - 33;
+    for (i = 0; i < 6; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+        {
+            sub_806D668(i);
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg))
+                sub_806BC3C(i, 0x9A);
+            else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gScriptItemId)))
+                sub_806BC3C(i, 0xA8);
+            else
+                sub_806BC3C(i, 0x8C);
+        }
+    }
+}
+
+static void sub_808AF20(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !GetEvolutionTargetSpecies(&gPlayerParty[i], 3, gScriptItemId))
+            {
+                sub_806D668(i);
+                sub_806BC3C(i, 0);
+            }
+        }
+    }
+}
+
+static void sub_808AF80(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            if (gUnknown_02038561 == 0)
+            {
+                switch (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId))
+                {
+                case 1:
+                    sub_808AE8C();
+                    break;
+                case 2:
+                    sub_808AF20();
+                    break;
+                }
+            }
+            if (gLastFieldPokeMenuOpened > 5 || !GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES))
+                gLastFieldPokeMenuOpened = 0;
+            sub_806C994(ewram1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(ewram1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808B020(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    switch (gUnknown_02038561)
+    {
+    case 0:
+        if (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId) == 1)
+            sub_806AF4C(0, 0, sub_808B0C0, 20);
+        else
+            sub_806AF4C(0, 0, sub_808B0C0, 3);
+        break;
+    case 4:
+        sub_806AF4C(0, 0, sub_808B1EC, 0xFF);
+        break;
+    case 1:
+    case 3:
+        sub_806AF4C(0, 0, sub_808B0C0, 4);
+        break;
+    }
+    SetMainCallback2(sub_808AF80);
+}
+
+void sub_808B0C0(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BD80(taskID))
+        {
+        case 1:
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
+                PlaySE(SE_HAZURE);
+            else
+            {
+                sub_806D5A4();
+                if (gUnknown_02038561 == 0)
+                    gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+                if (gUnknown_02038561 == 1)
+                {
+                    PlaySE(SE_SELECT);
+                    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808B2EC);
+                }
+                if (gUnknown_02038561 == 3)
+                {
+                    PlaySE(SE_SELECT);
+                    PartyMenuTryGiveMonMail(taskID, sub_808B2B4);
+                }
+            }
+            break;
+        case 2:
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            PlaySE(SE_SELECT);
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            if (gUnknown_02038561 == 0 || gUnknown_02038561 == 1)
+                gTasks[taskID].func = sub_808B25C;
+            if (gUnknown_02038561 == 3)
+                gTasks[taskID].func = sub_808B2B4;
+            break;
+        }
+    }
+}
+
+static void sub_808B1EC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+        gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+}
+
+static void sub_808B224(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808B25C;
+}
+
+static void sub_808B25C(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sub_80A5B40);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808B288(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(Mailbox_ReturnToMailListAfterDeposit);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808B2B4(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808B288;
+}
+
+static void sub_808B2EC(u8 taskID)
+{
+    if (gUnknown_0202E8F4 == 2)
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].func = sub_808B338;
+    }
+    else
+        sub_808B224(taskID);
+}
+
+static void sub_808B338(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID;
+
+        gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+        mailID = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808B3EC, 3);
+    }
+}
+
+static void sub_808B3A0(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+static void sub_808B3EC(void)
+{
+    IntrCallback callback;
+
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptResult == 0)
+    {
+        if (gUnknown_0202E8F8)
+            RemoveBagItem(gUnknown_0202E8F8, 1);
+        AddBagItem(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM), 1);
+        TakeMailFromMon(&gPlayerParty[gLastFieldPokeMenuOpened]);
+        SetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM, (void*) &gUnknown_0202E8F8);
+        CreateTask(sub_808B25C, 5);
+        gPaletteFade.bufferTransferDisabled = 0;
+        callback = sub_806AEDC;
+    }
+    else
+    {
+        sub_806AF4C(0, 0, sub_808B4A4, 0xFF);
+        callback = sub_808B3A0;
+    }
+    SetMainCallback2(callback);
+}
+
+static void sub_808B4A4(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 1);
+        gTasks[taskID].func = sub_808B4EC;
+    }
+}
+
+static void sub_808B4EC(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1)
+        sub_808B224(taskID);
+}
+
+void sub_808B508(u8 taskID)
+{
+    sub_808B224(taskID);
+}
+
+static void sub_808B518(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808B564(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (sub_809FA30() != 4)
+        sub_806AF4C(0, 0, TaughtMove, 0xFF);
+    else
+        sub_806AF4C(0, 0, StopTryingToTeachMove_806F588, 0xFF);
+    SetMainCallback2(sub_808B518);
+}
+
+void sub_808B5B4(u32 taskID)
+{
+    gUnknown_03005CF0 = gTasks[taskID].func;
+    gTasks[taskID].func = sub_808B5E4;
+    sub_808B5E4(taskID);
+}
+
+static void sub_808B5E4(u8 taskID)
+{
+    if (sub_8055870() != TRUE)
+        gTasks[taskID].func = gUnknown_03005CF0;
+}
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 8d85705c8..27d7022fe 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -4,7 +4,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 
 extern u8 gUnknown_02039324;
@@ -14,7 +14,7 @@ int GameClear(void)
     int i;
     bool32 ribbonGet;
 
-    HealPlayerParty();
+    ScrSpecial_HealPlayerParty();
 
     if (FlagGet(SYS_GAME_CLEAR) == TRUE)
     {
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 7c46d4d0a..57c7cff1d 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -10,11 +10,11 @@
 #include "items.h"
 #include "load_save.h"
 #include "link.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "mystery_event_script.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "save.h"
 #include "script.h"
 #include "secret_base.h"
@@ -40,7 +40,7 @@ static u8 gUnknown_0300071C[4];
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
 void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
-void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
+void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
 struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
 void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
diff --git a/src/region_map.c b/src/region_map.c
index 076dfecec..900c9ad71 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -9,7 +9,7 @@
 #include "palette.h"
 #include "pokemon_menu.h"
 #include "region_map.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "secret_base.h"
 #include "songs.h"
 #include "sprite.h"
@@ -714,7 +714,7 @@ static void InitializeCursorPosition(void)
         return;
     }
 
-    switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
+    switch (GetMapTypeByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
     {
     default:
     case 0:
@@ -733,7 +733,7 @@ static void InitializeCursorPosition(void)
         break;
     case 3:
     case 6:
-        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
         gRegionMap->mapSecId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
@@ -742,7 +742,7 @@ static void InitializeCursorPosition(void)
         y = gSaveBlock1.warp4.y;
         break;
     case 8:
-        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
         gRegionMap->mapSecId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
@@ -758,12 +758,12 @@ static void InitializeCursorPosition(void)
             if (gRegionMap->mapSecId != MAPSEC_UNK_0x57)
             {
                 r4 = &gSaveBlock1.warp4;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                mapHeader = Overworld_GetMapHeaderByGroupAndId(r4->mapGroup, r4->mapNum);
             }
             else
             {
                 r4 = &gSaveBlock1.warp2;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                mapHeader = Overworld_GetMapHeaderByGroupAndId(r4->mapGroup, r4->mapNum);
                 gRegionMap->mapSecId = mapHeader->regionMapSectionId;
             }
             gRegionMap->playerIsInCave = FALSE;
@@ -850,7 +850,7 @@ static void sub_80FB600(void)
     default:
     case 0:
         {
-            struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+            struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
             u16 r1;
 
             gRegionMap->mapSecId = mapHeader->regionMapSectionId;
diff --git a/src/rom3.c b/src/rom3.c
index 3b4b6a941..3f4860ecc 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -1081,10 +1081,10 @@ void EmitFaintingCry(u8 a)
     PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4);
 }
 
-void EmitIntroSlide(u8 a, u8 b)
+void EmitIntroSlide(u8 a, u8 battleTerrain)
 {
     gBattleBuffersTransferData[0] = 46;
-    gBattleBuffersTransferData[1] = b;
+    gBattleBuffersTransferData[1] = battleTerrain;
     PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 2);
 }
 
diff --git a/src/rom6.c b/src/rom6.c
index ff032b6c2..3a5071034 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -6,7 +6,7 @@
 #include "field_player_avatar.h"
 #include "item_use.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -17,7 +17,7 @@ extern u16 gScriptLastTalked;
 extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
-extern u8 UseRockSmashScript[];
+extern u8 S_UseRockSmash[];
 
 EWRAM_DATA struct MapPosition gUnknown_0203923C = {0};
 
@@ -64,9 +64,9 @@ static void task08_080C9820(u8 taskId)
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId])
      || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
     {
-        if (gMapHeader.mapType == 5)
+        if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
-            FieldEffectStart(0x3B);
+            FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
             gTasks[taskId].func = sub_810B428;
         }
         else
@@ -82,7 +82,7 @@ static void sub_810B3DC(u8 taskId)
 {
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
     {
-        FieldEffectStart(0x3B);
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_810B428;
     }
 }
@@ -91,17 +91,17 @@ static void sub_810B428(u8 taskId)
 {
     if (!FieldEffectActiveListContains(6))
     {
-        gUnknown_0202FF84[1] = player_get_direction_lower_nybble();
-        if (gUnknown_0202FF84[1] == 1)
-            gUnknown_0202FF84[2] = 0;
-        if (gUnknown_0202FF84[1] == 2)
-            gUnknown_0202FF84[2] = 1;
-        if (gUnknown_0202FF84[1] == 3)
-            gUnknown_0202FF84[2] = 2;
-        if (gUnknown_0202FF84[1] == 4)
-            gUnknown_0202FF84[2] = 3;
+        gFieldEffectArguments[1] = player_get_direction_lower_nybble();
+        if (gFieldEffectArguments[1] == 1)
+            gFieldEffectArguments[2] = 0;
+        if (gFieldEffectArguments[1] == 2)
+            gFieldEffectArguments[2] = 1;
+        if (gFieldEffectArguments[1] == 3)
+            gFieldEffectArguments[2] = 2;
+        if (gFieldEffectArguments[1] == 4)
+            gFieldEffectArguments[2] = 3;
         sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
-        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gUnknown_0202FF84[2]);
+        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
         FieldEffectActiveListRemove(6);
         gTasks[taskId].func = sub_810B4CC;
     }
@@ -120,7 +120,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 {
     if (npc_before_player_of_type(0x56) == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810B53C;
         return TRUE;
     }
@@ -132,8 +132,8 @@ bool8 SetUpFieldMove_RockSmash(void)
 
 static void sub_810B53C(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(UseRockSmashScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseRockSmash);
 }
 
 int FldEff_RockSmash(void)
@@ -149,15 +149,15 @@ int FldEff_RockSmash(void)
 static void sub_810B58C(void)
 {
     PlaySE(SE_W088);
-    FieldEffectActiveListRemove(0x25);
+    FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
     EnableBothScriptContexts();
 }
 
 int SetUpFieldMove_Dig(void)
 {
-    if (sub_80CA1C8() == TRUE)
+    if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810B5D8;
         return TRUE;
     }
@@ -170,8 +170,8 @@ int SetUpFieldMove_Dig(void)
 static void sub_810B5D8(void)
 {
     sub_8053014();
-    FieldEffectStart(0x26);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_DIG);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 int FldEff_UseDig(void)
@@ -189,7 +189,7 @@ static void sub_810B634(void)
 {
     u8 taskId;
 
-    FieldEffectActiveListRemove(0x26);
+    FieldEffectActiveListRemove(FLDEFF_USE_DIG);
     if (ShouldDoBrailleDigEffect())
     {
         DoBrailleDigEffect();
diff --git a/src/safari_zone.c b/src/safari_zone.c
index a47c8e951..14fd1ddc4 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -4,7 +4,7 @@
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "string_util.h"
 #include "text.h"
@@ -51,7 +51,7 @@ void SetSafariZoneFlag(void)
 
 void ResetSafariZoneFlag(void)
 {
-    FlagReset(SYS_SAFARI_MODE);
+    FlagClear(SYS_SAFARI_MODE);
 }
 
 void EnterSafariMode(void)
diff --git a/src/save.c b/src/save.c
index adf39268e..eae3f4470 100644
--- a/src/save.c
+++ b/src/save.c
@@ -3,7 +3,7 @@
 #include "gba/flash_internal.h"
 #include "save.h"
 #include "load_save.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "save_failed_screen.h"
 
 #define GETVALIDSTATUSBITFIELD ((1 << ARRAY_COUNT(gSaveSectionLocations)) - 1)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 66578f350..31a90158a 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -31,7 +31,7 @@
 #include "party_menu.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "script_menu.h"
@@ -50,11 +50,11 @@ typedef void (*NativeFunc)(void);
 extern u32 gUnknown_0202E8AC;
 
 static EWRAM_DATA u32 gUnknown_0202E8B0 = 0;
-static EWRAM_DATA u16 gUnknown_0202E8B4 = 0;
-static EWRAM_DATA u16 gUnknown_0202E8B6 = 0;
-static EWRAM_DATA u16 gUnknown_0202E8B8 = 0;
-static EWRAM_DATA u16 gUnknown_0202E8BA = 0;
-static EWRAM_DATA u16 gUnknown_0202E8BC = 0;
+static EWRAM_DATA u16 sPauseCounter = 0;
+static EWRAM_DATA u16 sMovingNpcId = 0;
+static EWRAM_DATA u16 sMovingNpcMapBank = 0;
+static EWRAM_DATA u16 sMovingNpcMapId = 0;
+static EWRAM_DATA u16 sFieldEffectScriptId = 0;
 
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
@@ -109,8 +109,8 @@ bool8 ScrCmd_end(struct ScriptContext *ctx)
 
 bool8 ScrCmd_jumpasm(struct ScriptContext *ctx)
 {
-    u32 addr = ScriptReadWord(ctx);
-    SetupNativeScript(ctx, (void *)addr);
+    bool8 (*addr)(void) = (bool8 (*)(void))ScriptReadWord(ctx);
+    SetupNativeScript(ctx, addr);
     return TRUE;
 }
 
@@ -542,7 +542,7 @@ bool8 ScrCmd_setflag(struct ScriptContext *ctx)
 
 bool8 ScrCmd_clearflag(struct ScriptContext *ctx)
 {
-    FlagReset(ScriptReadHalfword(ctx));
+    FlagClear(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
@@ -567,8 +567,8 @@ bool8 ScrCmd_lighten(struct ScriptContext *ctx)
 
 bool8 ScrCmd_darken(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
-    sub_8053CE4(value);
+    u16 flashLevel = VarGet(ScriptReadHalfword(ctx));
+    Overworld_SetFlashLevel(flashLevel);
     return FALSE;
 }
 
@@ -598,9 +598,9 @@ bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
 
 bool8 s28_pause_asm()
 {
-    gUnknown_0202E8B4--;
+    sPauseCounter--;
 
-    if (gUnknown_0202E8B4 == 0)
+    if (sPauseCounter == 0)
         return TRUE;
     else
         return FALSE;
@@ -608,7 +608,7 @@ bool8 s28_pause_asm()
 
 bool8 ScrCmd_pause(struct ScriptContext *ctx)
 {
-    gUnknown_0202E8B4 = ScriptReadHalfword(ctx);
+    sPauseCounter = ScriptReadHalfword(ctx);
     SetupNativeScript(ctx, s28_pause_asm);
     return TRUE;
 }
@@ -815,7 +815,7 @@ bool8 ScrCmd_playsfx(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 s30_music_check_asm()
+static bool8 WaitForSoundEffectFinish()
 {
     if (!IsSEPlaying())
         return TRUE;
@@ -825,7 +825,7 @@ bool8 s30_music_check_asm()
 
 bool8 ScrCmd_checksound(struct ScriptContext *ctx)
 {
-    SetupNativeScript(ctx, s30_music_check_asm);
+    SetupNativeScript(ctx, WaitForSoundEffectFinish);
     return TRUE;
 }
 
@@ -835,14 +835,14 @@ bool8 ScrCmd_fanfare(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 s32_fanfare_wait_asm()
+static bool8 WaitForFanfareFinish()
 {
     return IsFanfareTaskInactive();
 }
 
 bool8 ScrCmd_waitfanfare(struct ScriptContext *ctx)
 {
-    SetupNativeScript(ctx, s32_fanfare_wait_asm);
+    SetupNativeScript(ctx, WaitForFanfareFinish);
     return TRUE;
 }
 
@@ -870,15 +870,15 @@ bool8 ScrCmd_fadedefault(struct ScriptContext *ctx)
 
 bool8 ScrCmd_fademusic(struct ScriptContext *ctx)
 {
-    sub_8053FB0(ScriptReadHalfword(ctx));
+    Overworld_ChangeMusicTo(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
 bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
 {
-    u8 val = ScriptReadByte(ctx);
-    if (val)
-        FadeOutBGMTemporarily(4 * val);
+    u8 speed = ScriptReadByte(ctx);
+    if (speed != 0)
+        FadeOutBGMTemporarily(4 * speed);
     else
         FadeOutBGMTemporarily(4);
     SetupNativeScript(ctx, IsBGMPausedOrStopped);
@@ -887,9 +887,9 @@ bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
 
 bool8 ScrCmd_fadein(struct ScriptContext *ctx)
 {
-    u8 val = ScriptReadByte(ctx);
-    if (val)
-        FadeInBGM(4 * val);
+    u8 speed = ScriptReadByte(ctx);
+    if (speed != 0)
+        FadeInBGM(4 * speed);
     else
         FadeInBGM(4);
     return FALSE;
@@ -897,54 +897,56 @@ bool8 ScrCmd_fadein(struct ScriptContext *ctx)
 
 bool8 ScrCmd_move(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    void *v2 = (void *)ScriptReadWord(ctx);
-    exec_movement(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
-    gUnknown_0202E8B6 = v1;
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    void *movementScript = (void *)ScriptReadWord(ctx);
+
+    ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, movementScript);
+    sMovingNpcId = localId;
     return FALSE;
 }
 
 bool8 ScrCmd_movecoords(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    void *v2 = (void *)ScriptReadWord(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    exec_movement(v1, v4, v3, v2);
-    gUnknown_0202E8B6 = v1;
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    void *movementScript = (void *)ScriptReadWord(ctx);
+    u8 mapGroup = ScriptReadByte(ctx);
+    u8 mapNum = ScriptReadByte(ctx);
+
+    ScriptMovement_StartObjectMovementScript(localId, mapNum, mapGroup, movementScript);
+    sMovingNpcId = localId;
     return FALSE;
 }
 
-bool8 s51a_0806B288(void)
+static bool8 WaitForMovementFinish(void)
 {
-    return sub_80A212C(gUnknown_0202E8B6, gUnknown_0202E8BA, gUnknown_0202E8B8);
+    return ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapId, sMovingNpcMapBank);
 }
 
 bool8 ScrCmd_waitmove(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    if (v1)
-        gUnknown_0202E8B6 = v1;
-    gUnknown_0202E8B8 = gSaveBlock1.location.mapGroup;
-    gUnknown_0202E8BA = gSaveBlock1.location.mapNum;
-    SetupNativeScript(ctx, s51a_0806B288);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+
+    if (localId != 0)
+        sMovingNpcId = localId;
+    sMovingNpcMapBank = gSaveBlock1.location.mapGroup;
+    sMovingNpcMapId = gSaveBlock1.location.mapNum;
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
 bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2;
-    u8 v3;
-
-    if (v1)
-        gUnknown_0202E8B6 = v1;
-
-    v2 = ScriptReadByte(ctx);
-    v3 = ScriptReadByte(ctx);
-    gUnknown_0202E8B8 = v2;
-    gUnknown_0202E8BA = v3;
-    SetupNativeScript(ctx, s51a_0806B288);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    u8 mapBank;
+    u8 mapId;
+
+    if (localId != 0)
+        sMovingNpcId = localId;
+    mapBank = ScriptReadByte(ctx);
+    mapId = ScriptReadByte(ctx);
+    sMovingNpcMapBank = mapBank;
+    sMovingNpcMapId = mapId;
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
@@ -994,7 +996,7 @@ bool8 ScrCmd_movespriteperm(struct ScriptContext *ctx)
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
     u16 v2 = VarGet(ScriptReadHalfword(ctx));
     u32 v3 = VarGet(ScriptReadHalfword(ctx));
-    update_saveblock1_field_object_coords(v1, v2, v3);
+    Overworld_SaveMapObjCoords(v1, v2, v3);
     return FALSE;
 }
 
@@ -1054,9 +1056,9 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 
 bool8 ScrCmd_spriteface(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = ScriptReadByte(ctx);
-    FieldObjectTurnByLocalIdAndMap(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    u8 direction = ScriptReadByte(ctx);
+    FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction);
     return FALSE;
 }
 
@@ -1064,7 +1066,7 @@ bool8 ScrCmd_spritebehave(struct ScriptContext *ctx)
 {
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
     u8 v2 = ScriptReadByte(ctx);
-    update_saveblock1_field_object_movement_behavior(v1, v2);
+    Overworld_SaveMapObjMovementType(v1, v2);
     return FALSE;
 }
 
@@ -1112,7 +1114,7 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     {
         if (gMapObjects[gSelectedMapObject].active)
         {
-            sub_8064DD8();
+            LockSelectedMapObject();
             SetupNativeScript(ctx, sub_8064DB4);
         }
         else
@@ -1198,9 +1200,9 @@ bool8 ScrCmd_waitbutton(struct ScriptContext *ctx)
 
 bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    if (yes_no_box(v1, v2) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    if (ScriptMenu_YesNo(left, top) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1213,11 +1215,11 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
 
 bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (sub_80B5054(v1, v2, v3, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1230,12 +1232,12 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
 
 bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u8 v5 = ScriptReadByte(ctx);
-    if (sub_80B50B0(v1, v2, v3, v5, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 defaultChoice = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_MultichoiceWithDefault(left, top, multichoiceId, ignoreBPress, defaultChoice) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1248,22 +1250,22 @@ bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showbox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    MenuDrawTextWindow(v1, v2, v3, v4);
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 right = ScriptReadByte(ctx);
+    u8 bottom = ScriptReadByte(ctx);
+    MenuDrawTextWindow(left, top, right, bottom);
     return FALSE;
 }
 
 bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u8 v5 = ScriptReadByte(ctx);
-    if (sub_80B5578(v1, v2, v3, v5, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 numColumns = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_MultichoiceGrid(left, top, multichoiceId, ignoreBPress, numColumns) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1276,21 +1278,22 @@ bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
 
 bool8 ScrCmd_hidebox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    MenuZeroFillWindowRect(v1, v2, v3, v4);
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 right = ScriptReadByte(ctx);
+    u8 bottom = ScriptReadByte(ctx);
+    MenuZeroFillWindowRect(left, top, right, bottom);
     return FALSE;
 }
 
+// unused
 bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (Multichoice(v1, v2, v3, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1303,19 +1306,19 @@ bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    sub_80B58C4(v1, v2, v3);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
+    ScriptMenu_ShowPokemonPic(species, x, y);
     return FALSE;
 }
 
 bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
 {
-    void *func = picbox_close();
-    if (!func)
-        return FALSE;
+    bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
+    if (func == NULL)
+        return FALSE;
     SetupNativeScript(ctx, func);
     return TRUE;
 }
@@ -1447,29 +1450,29 @@ bool8 ScrCmd_vbuffer(struct ScriptContext *ctx)
 
 bool8 ScrCmd_givepokemon(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u8 v5 = ScriptReadByte(ctx);
-    u16 v7 = VarGet(ScriptReadHalfword(ctx));
-    u32 v8 = ScriptReadWord(ctx);
-    u32 v9 = ScriptReadWord(ctx);
-    u8 v10 = ScriptReadByte(ctx);
-    gScriptResult = ScriptGiveMon(v3, v5, v7, v8, v9, v10);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u8 level = ScriptReadByte(ctx);
+    u16 item = VarGet(ScriptReadHalfword(ctx));
+    u32 unkParam1 = ScriptReadWord(ctx);
+    u32 unkParam2 = ScriptReadWord(ctx);
+    u8 unkParam3 = ScriptReadByte(ctx);
+    gScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
     return FALSE;
 }
 
 bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
-    gScriptResult = ScriptGiveEgg(value);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    gScriptResult = ScriptGiveEgg(species);
     return FALSE;
 }
 
 bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u16 v4 = ScriptReadHalfword(ctx);
-    ScriptSetMonMoveSlot(v2, v4, v3);
+    u8 partyIndex = ScriptReadByte(ctx);
+    u8 slot = ScriptReadByte(ctx);
+    u16 move = ScriptReadHalfword(ctx);
+    ScriptSetMonMoveSlot(partyIndex, move, slot);
     return FALSE;
 }
 
@@ -1499,7 +1502,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
     u32 amount = ScriptReadWord(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B79B8(&gSaveBlock1.money, amount);
+        AddMoney(&gSaveBlock1.money, amount);
     return FALSE;
 }
 
@@ -1508,7 +1511,7 @@ bool8 ScrCmd_paymoney(struct ScriptContext *ctx)
     u32 amount = ScriptReadWord(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B79E0(&gSaveBlock1.money, amount);
+        RemoveMoney(&gSaveBlock1.money, amount);
     return FALSE;
 }
 
@@ -1523,19 +1526,19 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showmoney(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B7C14(gSaveBlock1.money, v2, v3);
+        OpenMoneyWindow(gSaveBlock1.money, x, y);
     return FALSE;
 }
 
 bool8 ScrCmd_hidemoney(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    RemoveMoneyLabelObject(v2, v3);
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
+    CloseMoneyWindow(x, y);
     return FALSE;
 }
 
@@ -1545,7 +1548,7 @@ bool8 ScrCmd_updatemoney(struct ScriptContext *ctx)
     u8 v3 = ScriptReadByte(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B7BEC(gSaveBlock1.money, v2, v3);
+        UpdateMoneyWindow(gSaveBlock1.money, v2, v3);
     return FALSE;
 }
 
@@ -1575,32 +1578,32 @@ bool8 ScrCmd_updatecoins(struct ScriptContext *ctx)
 
 bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = TrainerBattleConfigure(ctx->scriptPtr);
+    ctx->scriptPtr = BattleSetup_ConfigureTrainerBattle(ctx->scriptPtr);
     return FALSE;
 }
 
 bool8 ScrCmd_reptrainerbattle(struct ScriptContext *ctx)
 {
-    sub_80825E4();
+    BattleSetup_StartTrainerBattle();
     return TRUE;
 }
 
 bool8 ScrCmd_endtrainerbattle(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = sub_80826E8();
+    ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
 bool8 ScrCmd_endtrainerbattle2(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = sub_8082700();
+    ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
 }
 
 bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    ctx->comparisonResult = trainer_flag_check(index);
+    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
     return FALSE;
 }
 
@@ -1620,16 +1623,16 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
 
 bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 {
-    u16 v2 = ScriptReadHalfword(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u16 v5 = ScriptReadHalfword(ctx);
-    ScriptWildBattle(v2, v4, v5);
+    u16 species = ScriptReadHalfword(ctx);
+    u8 level = ScriptReadByte(ctx);
+    u16 item = ScriptReadHalfword(ctx);
+    CreateScriptedWildMon(species, level, item);
     return FALSE;
 }
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    StartBattle_ScriptedWild();
+    BattleSetup_StartScriptedWildBattle();
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -1668,13 +1671,13 @@ bool8 ScrCmd_pokecasino(struct ScriptContext *ctx)
 
 bool8 ScrCmd_event_8a(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (!v3)
-        PlantBerryTree(v2, 0, v4, FALSE);
+    u8 treeId = ScriptReadByte(ctx);
+    u8 berry = ScriptReadByte(ctx);
+    u8 growthStage = ScriptReadByte(ctx);
+    if (berry == 0)
+        PlantBerryTree(treeId, 0, growthStage, FALSE);
     else
-        PlantBerryTree(v2, v3, v4, FALSE);
+        PlantBerryTree(treeId, berry, growthStage, FALSE);
     return FALSE;
 }
 
@@ -1716,21 +1719,21 @@ bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
 bool8 ScrCmd_doanimation(struct ScriptContext *ctx)
 {
     u16 effectId = VarGet(ScriptReadHalfword(ctx));
-    gUnknown_0202E8BC = effectId;
-    FieldEffectStart(gUnknown_0202E8BC);
+    sFieldEffectScriptId = effectId;
+    FieldEffectStart(sFieldEffectScriptId);
     return FALSE;
 }
 
 bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    gUnknown_0202FF84[v2] = (s16)VarGet(ScriptReadHalfword(ctx));
+    u8 argNum = ScriptReadByte(ctx);
+    gFieldEffectArguments[argNum] = (s16)VarGet(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
 static bool8 sub_8067B48()
 {
-    if (!FieldEffectActiveListContains(gUnknown_0202E8BC))
+    if (!FieldEffectActiveListContains(sFieldEffectScriptId))
         return TRUE;
     else
         return FALSE;
@@ -1738,7 +1741,7 @@ static bool8 sub_8067B48()
 
 bool8 ScrCmd_checkanimation(struct ScriptContext *ctx)
 {
-    gUnknown_0202E8BC = VarGet(ScriptReadHalfword(ctx));
+    sFieldEffectScriptId = VarGet(ScriptReadHalfword(ctx));
     SetupNativeScript(ctx, sub_8067B48);
     return TRUE;
 }
@@ -1758,9 +1761,9 @@ bool8 ScrCmd_checkgender(struct ScriptContext *ctx)
 
 bool8 ScrCmd_pokecry(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u16 v5 = VarGet(ScriptReadHalfword(ctx));
-    PlayCry5(v3, v5);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u16 mode = VarGet(ScriptReadHalfword(ctx));
+    PlayCry5(species, mode);
     return FALSE;
 }
 
@@ -1772,16 +1775,16 @@ bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
 
 bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u16 v5 = VarGet(ScriptReadHalfword(ctx));
-    u16 v7 = VarGet(ScriptReadHalfword(ctx));
+    u16 x = VarGet(ScriptReadHalfword(ctx));
+    u16 y = VarGet(ScriptReadHalfword(ctx));
+    u16 tileId = VarGet(ScriptReadHalfword(ctx));
     u16 v8 = VarGet(ScriptReadHalfword(ctx));
-    v3 += 7;
-    v5 += 7;
+    x += 7;
+    y += 7;
     if (!v8)
-        MapGridSetMetatileIdAt(v3, v5, v7);
+        MapGridSetMetatileIdAt(x, y, tileId);
     else
-        MapGridSetMetatileIdAt(v3, v5, v7 | 0xC00);
+        MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
     return FALSE;
 }
 
@@ -1791,7 +1794,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
     x += 7;
     y += 7;
-    PlaySE(sub_8058790(x, y));
+    PlaySE(GetDoorSoundEffect(x, y));
     FieldAnimateDoorOpen(x, y);
     return FALSE;
 }
diff --git a/src/script.c b/src/script.c
index 8f12da437..f049b96fc 100644
--- a/src/script.c
+++ b/src/script.c
@@ -40,7 +40,7 @@ u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
     return 1;
 }
 
-void SetupNativeScript(struct ScriptContext *ctx, void *ptr)
+void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void))
 {
     ctx->mode = 2;
     ctx->nativePtr = ptr;
@@ -64,7 +64,7 @@ u8 RunScriptCommand(struct ScriptContext *ctx)
     case 2:
         if (ctx->nativePtr)
         {
-            if (ctx->nativePtr() == 1)
+            if (ctx->nativePtr() == TRUE)
                 ctx->mode = 1;
             return 1;
         }
@@ -228,16 +228,16 @@ void ScriptContext2_RunNewScript(const u8 *ptr)
         ;
 }
 
-u8 *mapheader_get_tagged_pointer(u8 tag)
+static u8 *mapheader_get_tagged_pointer(u8 tag)
 {
     u8 *mapScripts = gMapHeader.mapScripts;
 
-    if (!mapScripts)
+    if (mapScripts == NULL)
         return NULL;
 
     while (1)
     {
-        if (!*mapScripts)
+        if (*mapScripts == 0)
             return NULL;
         if (*mapScripts == tag)
         {
@@ -248,14 +248,14 @@ u8 *mapheader_get_tagged_pointer(u8 tag)
     }
 }
 
-void mapheader_run_script_by_tag(u8 tag)
+static void mapheader_run_script_by_tag(u8 tag)
 {
     u8 *ptr = mapheader_get_tagged_pointer(tag);
     if (ptr)
         ScriptContext2_RunNewScript(ptr);
 }
 
-u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
+static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
 {
     u8 *ptr = mapheader_get_tagged_pointer(tag);
 
@@ -316,7 +316,7 @@ void mapheader_run_first_tag4_script_list_match(void)
         ScriptContext2_RunNewScript(ptr);
 }
 
-u32 CalculateRamScriptChecksum(void)
+static u32 CalculateRamScriptChecksum(void)
 {
     u32 i;
     u32 sum = 0;
diff --git a/src/script_menu.c b/src/script_menu.c
index 6e1a12a60..e25e74d8c 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,10 +1,12 @@
 #include "global.h"
+#include "script.h"
 #include "script_menu.h"
 #include "event_data.h"
 #include "field_effect.h"
 #include "menu.h"
 #include "palette.h"
 #include "script.h"
+#include "songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "strings.h"
@@ -13,538 +15,544 @@
 // multichoice lists
 const struct MenuAction MultichoiceList_00[] =
 {
-    {(u8 *)OtherText_Petalburg, 0},
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Petalburg, NULL},
+    {OtherText_Slateport, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_02[] =
 {
-    {(u8 *)OtherText_Enter, 0},
-    {(u8 *)OtherText_Info3, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Enter, NULL},
+    {OtherText_Info3, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_03[] =
 {
-    {(u8 *)OtherText_WhatsAContest, 0},
-    {(u8 *)OtherText_TypesOfContest, 0},
-    {(u8 *)OtherText_Ranks, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_WhatsAContest, NULL},
+    {OtherText_TypesOfContest, NULL},
+    {OtherText_Ranks, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_04[] =
 {
-    {(u8 *)OtherText_CoolContest, 0},
-    {(u8 *)OtherText_BeautyContest, 0},
-    {(u8 *)OtherText_CuteContest, 0},
-    {(u8 *)OtherText_SmartContest, 0},
-    {(u8 *)OtherText_ToughContest, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_CoolContest, NULL},
+    {OtherText_BeautyContest, NULL},
+    {OtherText_CuteContest, NULL},
+    {OtherText_SmartContest, NULL},
+    {OtherText_ToughContest, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_06[] =
 {
-    {(u8 *)OtherText_Decoration, 0},
-    {(u8 *)OtherText_PackUp, 0},
-    {(u8 *)OtherText_Registry, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Decoration, NULL},
+    {OtherText_PackUp, NULL},
+    {OtherText_Registry, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_05[] =
 {
-    {(u8 *)OtherText_Decoration, 0},
-    {(u8 *)OtherText_PackUp, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Decoration, NULL},
+    {OtherText_PackUp, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_07[] =
 {
-    {(u8 *)OtherText_Register, 0},
-    {(u8 *)OtherText_Registry, 0},
-    {(u8 *)OtherText_Information, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Register, NULL},
+    {OtherText_Registry, NULL},
+    {OtherText_Information, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_12[] =
 {
-    {(u8 *)OtherText_Mach, 0},
-    {(u8 *)OtherText_Acro, 0},
+    {OtherText_Mach, NULL},
+    {OtherText_Acro, NULL},
 };
 
 const struct MenuAction MultichoiceList_13[] =
 {
-    {(u8 *)OtherText_Poison, 0},
-    {(u8 *)OtherText_Paralysis, 0},
-    {(u8 *)OtherText_Sleep, 0},
-    {(u8 *)OtherText_Burn, 0},
-    {(u8 *)OtherText_Frozen, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Poison, NULL},
+    {OtherText_Paralysis, NULL},
+    {OtherText_Sleep, NULL},
+    {OtherText_Burn, NULL},
+    {OtherText_Frozen, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_14[] =
 {
-    {(u8 *)OtherText_Dewford, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Dewford, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_16[] =
 {
-    {(u8 *)OtherText_SawIt, 0},
-    {(u8 *)OtherText_NotYet, 0},
+    {OtherText_SawIt, NULL},
+    {OtherText_NotYet, NULL},
 };
 
 const struct MenuAction MultichoiceList_17[] =
 {
-    {(u8 *)OtherText_Yes, 0},
-    {(u8 *)OtherText_No, 0},
-    {(u8 *)OtherText_Info3, 0},
+    {OtherText_Yes, NULL},
+    {OtherText_No, NULL},
+    {OtherText_Info3, NULL},
 };
 
 const struct MenuAction MultichoiceList_18[] =
 {
-    {(u8 *)OtherText_SingleBattle, 0},
-    {(u8 *)OtherText_DoubleBattle, 0},
-    {(u8 *)OtherText_MultiBattle, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_SingleBattle, NULL},
+    {OtherText_DoubleBattle, NULL},
+    {OtherText_MultiBattle, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_19[] =
 {
-    {(u8 *)OtherText_Littleroot, 0},
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_Lilycove, 0},
+    {OtherText_Littleroot, NULL},
+    {OtherText_Slateport, NULL},
+    {OtherText_Lilycove, NULL},
 };
 
 const struct MenuAction MultichoiceList_20[] =
 {
-    {(u8 *)OtherText_Yes, 0},
-    {(u8 *)OtherText_No, 0},
-    {(u8 *)OtherText_Info3, 0},
+    {OtherText_Yes, NULL},
+    {OtherText_No, NULL},
+    {OtherText_Info3, NULL},
 };
 
 const struct MenuAction MultichoiceList_23[] =
 {
-    {(u8 *)OtherText_MakeAChallenge, 0},
-    {(u8 *)OtherText_ObtainInformation, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_MakeAChallenge, NULL},
+    {OtherText_ObtainInformation, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_24[] =
 {
-    {(u8 *)OtherText_Lv50_2, 0},
-    {(u8 *)OtherText_Lv100_2, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Lv50_2, NULL},
+    {OtherText_Lv100_2, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_25[] =
 {
-    {(u8 *)OtherText_Zigzagoon, 0},
-    {(u8 *)OtherText_Nincada, 0},
-    {(u8 *)OtherText_Poochyena, 0},
+    {OtherText_Zigzagoon, NULL},
+    {OtherText_Nincada, NULL},
+    {OtherText_Poochyena, NULL},
 };
 
 const struct MenuAction MultichoiceList_26[] =
 {
-    {(u8 *)OtherText_Nincada2, 0},
-    {(u8 *)OtherText_Lotad, 0},
-    {(u8 *)OtherText_Roselia, 0},
+    {OtherText_Nincada2, NULL},
+    {OtherText_Lotad, NULL},
+    {OtherText_Roselia, NULL},
 };
 
 const struct MenuAction MultichoiceList_27[] =
 {
-    {(u8 *)OtherText_Shroomish, 0},
-    {(u8 *)OtherText_Nincada3, 0},
-    {(u8 *)OtherText_Surskit, 0},
+    {OtherText_Shroomish, NULL},
+    {OtherText_Nincada3, NULL},
+    {OtherText_Surskit, NULL},
 };
 
 const struct MenuAction MultichoiceList_28[] =
 {
-    {(u8 *)OtherText_Treecko, 0},
-    {(u8 *)OtherText_Torchic, 0},
-    {(u8 *)OtherText_Mudkip, 0},
+    {OtherText_Treecko, NULL},
+    {OtherText_Torchic, NULL},
+    {OtherText_Mudkip, NULL},
 };
 
 const struct MenuAction MultichoiceList_29[] =
 {
-    {(u8 *)OtherText_Seedot, 0},
-    {(u8 *)OtherText_Shroomish2, 0},
-    {(u8 *)OtherText_Spinda, 0},
+    {OtherText_Seedot, NULL},
+    {OtherText_Shroomish2, NULL},
+    {OtherText_Spinda, NULL},
 };
 
 const struct MenuAction MultichoiceList_30[] =
 {
-    {(u8 *)OtherText_Shroomish3, 0},
-    {(u8 *)OtherText_Zigzagoon2, 0},
-    {(u8 *)OtherText_Wurmple, 0},
+    {OtherText_Shroomish3, NULL},
+    {OtherText_Zigzagoon2, NULL},
+    {OtherText_Wurmple, NULL},
 };
 
 const struct MenuAction MultichoiceList_31[] =
 {
-    {(u8 *)OtherText_PokeBall, 0},
-    {(u8 *)OtherText_SuperPotion, 0},
-    {(u8 *)OtherText_SamePrice, 0},
+    {OtherText_PokeBall, NULL},
+    {OtherText_SuperPotion, NULL},
+    {OtherText_SamePrice, NULL},
 };
 
 const struct MenuAction MultichoiceList_32[] =
 {
-    {(u8 *)OtherText_Yen135, 0},
-    {(u8 *)OtherText_Yen155, 0},
-    {(u8 *)OtherText_Yen175, 0},
+    {OtherText_Yen135, NULL},
+    {OtherText_Yen155, NULL},
+    {OtherText_Yen175, NULL},
 };
 
 const struct MenuAction MultichoiceList_33[] =
 {
-    {(u8 *)OtherText_CostMore, 0},
-    {(u8 *)OtherText_CostLess, 0},
-    {(u8 *)OtherText_SamePrice2, 0},
+    {OtherText_CostMore, NULL},
+    {OtherText_CostLess, NULL},
+    {OtherText_SamePrice2, NULL},
 };
 
 const struct MenuAction MultichoiceList_34[] =
 {
-    {(u8 *)OtherText_MaleSymbol, 0},
-    {(u8 *)OtherText_FemaleSymbol, 0},
-    {(u8 *)OtherText_Neither, 0},
+    {OtherText_MaleSymbol, NULL},
+    {OtherText_FemaleSymbol, NULL},
+    {OtherText_Neither, NULL},
 };
 
 const struct MenuAction MultichoiceList_35[] =
 {
-    {(u8 *)OtherText_Males, 0},
-    {(u8 *)OtherText_Females, 0},
-    {(u8 *)OtherText_SameNumber, 0},
+    {OtherText_Males, NULL},
+    {OtherText_Females, NULL},
+    {OtherText_SameNumber, NULL},
 };
 
 const struct MenuAction MultichoiceList_36[] =
 {
-    {(u8 *)OtherText_Male, 0},
-    {(u8 *)OtherText_Female, 0},
-    {(u8 *)OtherText_ItDepends, 0},
+    {OtherText_Male, NULL},
+    {OtherText_Female, NULL},
+    {OtherText_ItDepends, NULL},
 };
 
 const struct MenuAction MultichoiceList_37[] =
 {
-    {(u8 *)OtherText_Six2, 0},
-    {(u8 *)OtherText_Eight2, 0},
-    {(u8 *)OtherText_Ten, 0},
+    {OtherText_Six2, NULL},
+    {OtherText_Eight2, NULL},
+    {OtherText_Ten, NULL},
 };
 
 const struct MenuAction MultichoiceList_38[] =
 {
-    {(u8 *)OtherText_One, 0},
-    {(u8 *)OtherText_Two, 0},
-    {(u8 *)OtherText_Three, 0},
+    {OtherText_One, NULL},
+    {OtherText_Two, NULL},
+    {OtherText_Three, NULL},
 };
 
 const struct MenuAction MultichoiceList_39[] =
 {
-    {(u8 *)OtherText_Six, 0},
-    {(u8 *)OtherText_Seven, 0},
-    {(u8 *)OtherText_Eight, 0},
+    {OtherText_Six, NULL},
+    {OtherText_Seven, NULL},
+    {OtherText_Eight, NULL},
 };
 
 const struct MenuAction MultichoiceList_42[] =
 {
-    {(u8 *)OtherText_FreshWater, 0},
-    {(u8 *)OtherText_SodaPop, 0},
-    {(u8 *)OtherText_Lemonade, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_FreshWater, NULL},
+    {OtherText_SodaPop, NULL},
+    {OtherText_Lemonade, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_43[] =
 {
-    {(u8 *)OtherText_HowToRide, 0},
-    {(u8 *)OtherText_HowToTurn, 0},
-    {(u8 *)OtherText_SandySlopes, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_HowToRide, NULL},
+    {OtherText_HowToTurn, NULL},
+    {OtherText_SandySlopes, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_44[] =
 {
-    {(u8 *)OtherText_Wheelies, 0},
-    {(u8 *)OtherText_BunnyHops, 0},
-    {(u8 *)OtherText_Jumping, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Wheelies, NULL},
+    {OtherText_BunnyHops, NULL},
+    {OtherText_Jumping, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_45[] =
 {
-    {(u8 *)OtherText_Satisfied, 0},
-    {(u8 *)OtherText_Dissatisfied, 0},
+    {OtherText_Satisfied, NULL},
+    {OtherText_Dissatisfied, NULL},
 };
 
 const struct MenuAction MultichoiceList_46[] =
 {
-    {(u8 *)OtherText_Deepseatooth, 0},
-    {(u8 *)OtherText_Deepseascale, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Deepseatooth, NULL},
+    {OtherText_Deepseascale, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_47[] =
 {
-    {(u8 *)OtherText_BlueFlute2, 0},
-    {(u8 *)OtherText_YellowFlute2, 0},
-    {(u8 *)OtherText_RedFlute2, 0},
-    {(u8 *)OtherText_WhiteFlute2, 0},
-    {(u8 *)OtherText_BlackFlute2, 0},
-    {(u8 *)OtherText_GlassChair, 0},
-    {(u8 *)OtherText_GlassDesk, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueFlute2, NULL},
+    {OtherText_YellowFlute2, NULL},
+    {OtherText_RedFlute2, NULL},
+    {OtherText_WhiteFlute2, NULL},
+    {OtherText_BlackFlute2, NULL},
+    {OtherText_GlassChair, NULL},
+    {OtherText_GlassDesk, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_48[] =
 {
-    {(u8 *)OtherText_TreeckoDoll, 0},
-    {(u8 *)OtherText_TorchicDoll, 0},
-    {(u8 *)OtherText_MudkipDoll, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_TreeckoDoll, NULL},
+    {OtherText_TorchicDoll, NULL},
+    {OtherText_MudkipDoll, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_55[] =
 {
-    {(u8 *)OtherText_TM32, 0},
-    {(u8 *)OtherText_TM29, 0},
-    {(u8 *)OtherText_TM35, 0},
-    {(u8 *)OtherText_TM24, 0},
-    {(u8 *)OtherText_TM13, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_TM32, NULL},
+    {OtherText_TM29, NULL},
+    {OtherText_TM35, NULL},
+    {OtherText_TM24, NULL},
+    {OtherText_TM13, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_49[] =
 {
-    {(u8 *)OtherText_50Coins, 0},
-    {(u8 *)OtherText_500Coins, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_50Coins, NULL},
+    {OtherText_500Coins, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_50[] =
 {
-    {(u8 *)OtherText_Excellent, 0},
-    {(u8 *)OtherText_NotSoHot, 0},
+    {OtherText_Excellent, NULL},
+    {OtherText_NotSoHot, NULL},
 };
 
 const struct MenuAction MultichoiceList_52[] =
 {
-    {(u8 *)OtherText_Lilycove, 0},
-    {(u8 *)OtherText_BattleTower, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Lilycove, NULL},
+    {OtherText_BattleTower, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_53[] =
 {
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_Lilycove, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Slateport, NULL},
+    {OtherText_Lilycove, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_54[] =
 {
-    {(u8 *)OtherText_Right, 0},
-    {(u8 *)OtherText_Left, 0},
+    {OtherText_Right, NULL},
+    {OtherText_Left, NULL},
 };
 
 const struct MenuAction MultichoiceList_56[] =
 {
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_BattleTower, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Slateport, NULL},
+    {OtherText_BattleTower, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_57[] =
 {
-    {(u8 *)OtherText_1F_2, 0},
-    {(u8 *)OtherText_2F_2, 0},
-    {(u8 *)OtherText_3F_2, 0},
-    {(u8 *)OtherText_4F_2, 0},
-    {(u8 *)OtherText_5F_2, 0},
+    {OtherText_1F_2, NULL},
+    {OtherText_2F_2, NULL},
+    {OtherText_3F_2, NULL},
+    {OtherText_4F_2, NULL},
+    {OtherText_5F_2, NULL},
 };
 
 const struct MenuAction MultichoiceList_58[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_59[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_60[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_61[] =
 {
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_62[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_63[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_64[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_65[] =
 {
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_66[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_67[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_68[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_69[] =
 {
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_70[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_71[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_72[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_01[] =
 {
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {gOtherText_CancelNoTerminator, NULL},
+};
+
+struct MultichoiceListStruct
+{
+    const struct MenuAction *list;
+    u8 count;
 };
 
 const struct MultichoiceListStruct gMultichoiceLists[] =
 {
-    {(struct MenuAction *)MultichoiceList_00, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_02, 3},
-    {(struct MenuAction *)MultichoiceList_03, 4},
-    {(struct MenuAction *)MultichoiceList_04, 6},
-    {(struct MenuAction *)MultichoiceList_05, 3},
-    {(struct MenuAction *)MultichoiceList_06, 4},
-    {(struct MenuAction *)MultichoiceList_07, 4},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_12, 2},
-    {(struct MenuAction *)MultichoiceList_13, 6},
-    {(struct MenuAction *)MultichoiceList_14, 2},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_16, 2},
-    {(struct MenuAction *)MultichoiceList_17, 3},
-    {(struct MenuAction *)MultichoiceList_18, 4},
-    {(struct MenuAction *)MultichoiceList_19, 3},
-    {(struct MenuAction *)MultichoiceList_20, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_23, 3},
-    {(struct MenuAction *)MultichoiceList_24, 3},
-    {(struct MenuAction *)MultichoiceList_25, 3},
-    {(struct MenuAction *)MultichoiceList_26, 3},
-    {(struct MenuAction *)MultichoiceList_27, 3},
-    {(struct MenuAction *)MultichoiceList_28, 3},
-    {(struct MenuAction *)MultichoiceList_29, 3},
-    {(struct MenuAction *)MultichoiceList_30, 3},
-    {(struct MenuAction *)MultichoiceList_31, 3},
-    {(struct MenuAction *)MultichoiceList_32, 3},
-    {(struct MenuAction *)MultichoiceList_33, 3},
-    {(struct MenuAction *)MultichoiceList_34, 3},
-    {(struct MenuAction *)MultichoiceList_35, 3},
-    {(struct MenuAction *)MultichoiceList_36, 3},
-    {(struct MenuAction *)MultichoiceList_37, 3},
-    {(struct MenuAction *)MultichoiceList_38, 3},
-    {(struct MenuAction *)MultichoiceList_39, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_42, 4},
-    {(struct MenuAction *)MultichoiceList_43, 4},
-    {(struct MenuAction *)MultichoiceList_44, 4},
-    {(struct MenuAction *)MultichoiceList_45, 2},
-    {(struct MenuAction *)MultichoiceList_46, 3},
-    {(struct MenuAction *)MultichoiceList_47, 8},
-    {(struct MenuAction *)MultichoiceList_48, 4},
-    {(struct MenuAction *)MultichoiceList_49, 3},
-    {(struct MenuAction *)MultichoiceList_50, 2},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_52, 3},
-    {(struct MenuAction *)MultichoiceList_53, 3},
-    {(struct MenuAction *)MultichoiceList_54, 2},
-    {(struct MenuAction *)MultichoiceList_55, 6},
-    {(struct MenuAction *)MultichoiceList_56, 3},
-    {(struct MenuAction *)MultichoiceList_57, 5},
-    {(struct MenuAction *)MultichoiceList_58, 2},
-    {(struct MenuAction *)MultichoiceList_59, 2},
-    {(struct MenuAction *)MultichoiceList_60, 3},
-    {(struct MenuAction *)MultichoiceList_61, 2},
-    {(struct MenuAction *)MultichoiceList_62, 3},
-    {(struct MenuAction *)MultichoiceList_63, 3},
-    {(struct MenuAction *)MultichoiceList_64, 4},
-    {(struct MenuAction *)MultichoiceList_65, 2},
-    {(struct MenuAction *)MultichoiceList_66, 3},
-    {(struct MenuAction *)MultichoiceList_67, 3},
-    {(struct MenuAction *)MultichoiceList_68, 4},
-    {(struct MenuAction *)MultichoiceList_69, 3},
-    {(struct MenuAction *)MultichoiceList_70, 4},
-    {(struct MenuAction *)MultichoiceList_71, 4},
-    {(struct MenuAction *)MultichoiceList_72, 5}
+    {MultichoiceList_00, ARRAY_COUNT(MultichoiceList_00)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_02, ARRAY_COUNT(MultichoiceList_02)},
+    {MultichoiceList_03, ARRAY_COUNT(MultichoiceList_03)},
+    {MultichoiceList_04, ARRAY_COUNT(MultichoiceList_04)},
+    {MultichoiceList_05, ARRAY_COUNT(MultichoiceList_05)},
+    {MultichoiceList_06, ARRAY_COUNT(MultichoiceList_06)},
+    {MultichoiceList_07, ARRAY_COUNT(MultichoiceList_07)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_12, ARRAY_COUNT(MultichoiceList_12)},
+    {MultichoiceList_13, ARRAY_COUNT(MultichoiceList_13)},
+    {MultichoiceList_14, ARRAY_COUNT(MultichoiceList_14)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_16, ARRAY_COUNT(MultichoiceList_16)},
+    {MultichoiceList_17, ARRAY_COUNT(MultichoiceList_17)},
+    {MultichoiceList_18, ARRAY_COUNT(MultichoiceList_18)},
+    {MultichoiceList_19, ARRAY_COUNT(MultichoiceList_19)},
+    {MultichoiceList_20, ARRAY_COUNT(MultichoiceList_20)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_23, ARRAY_COUNT(MultichoiceList_23)},
+    {MultichoiceList_24, ARRAY_COUNT(MultichoiceList_24)},
+    {MultichoiceList_25, ARRAY_COUNT(MultichoiceList_25)},
+    {MultichoiceList_26, ARRAY_COUNT(MultichoiceList_26)},
+    {MultichoiceList_27, ARRAY_COUNT(MultichoiceList_27)},
+    {MultichoiceList_28, ARRAY_COUNT(MultichoiceList_28)},
+    {MultichoiceList_29, ARRAY_COUNT(MultichoiceList_29)},
+    {MultichoiceList_30, ARRAY_COUNT(MultichoiceList_30)},
+    {MultichoiceList_31, ARRAY_COUNT(MultichoiceList_31)},
+    {MultichoiceList_32, ARRAY_COUNT(MultichoiceList_32)},
+    {MultichoiceList_33, ARRAY_COUNT(MultichoiceList_33)},
+    {MultichoiceList_34, ARRAY_COUNT(MultichoiceList_34)},
+    {MultichoiceList_35, ARRAY_COUNT(MultichoiceList_35)},
+    {MultichoiceList_36, ARRAY_COUNT(MultichoiceList_36)},
+    {MultichoiceList_37, ARRAY_COUNT(MultichoiceList_37)},
+    {MultichoiceList_38, ARRAY_COUNT(MultichoiceList_38)},
+    {MultichoiceList_39, ARRAY_COUNT(MultichoiceList_39)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_42, ARRAY_COUNT(MultichoiceList_42)},
+    {MultichoiceList_43, ARRAY_COUNT(MultichoiceList_43)},
+    {MultichoiceList_44, ARRAY_COUNT(MultichoiceList_44)},
+    {MultichoiceList_45, ARRAY_COUNT(MultichoiceList_45)},
+    {MultichoiceList_46, ARRAY_COUNT(MultichoiceList_46)},
+    {MultichoiceList_47, ARRAY_COUNT(MultichoiceList_47)},
+    {MultichoiceList_48, ARRAY_COUNT(MultichoiceList_48)},
+    {MultichoiceList_49, ARRAY_COUNT(MultichoiceList_49)},
+    {MultichoiceList_50, ARRAY_COUNT(MultichoiceList_50)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_52, ARRAY_COUNT(MultichoiceList_52)},
+    {MultichoiceList_53, ARRAY_COUNT(MultichoiceList_53)},
+    {MultichoiceList_54, ARRAY_COUNT(MultichoiceList_54)},
+    {MultichoiceList_55, ARRAY_COUNT(MultichoiceList_55)},
+    {MultichoiceList_56, ARRAY_COUNT(MultichoiceList_56)},
+    {MultichoiceList_57, ARRAY_COUNT(MultichoiceList_57)},
+    {MultichoiceList_58, ARRAY_COUNT(MultichoiceList_58)},
+    {MultichoiceList_59, ARRAY_COUNT(MultichoiceList_59)},
+    {MultichoiceList_60, ARRAY_COUNT(MultichoiceList_60)},
+    {MultichoiceList_61, ARRAY_COUNT(MultichoiceList_61)},
+    {MultichoiceList_62, ARRAY_COUNT(MultichoiceList_62)},
+    {MultichoiceList_63, ARRAY_COUNT(MultichoiceList_63)},
+    {MultichoiceList_64, ARRAY_COUNT(MultichoiceList_64)},
+    {MultichoiceList_65, ARRAY_COUNT(MultichoiceList_65)},
+    {MultichoiceList_66, ARRAY_COUNT(MultichoiceList_66)},
+    {MultichoiceList_67, ARRAY_COUNT(MultichoiceList_67)},
+    {MultichoiceList_68, ARRAY_COUNT(MultichoiceList_68)},
+    {MultichoiceList_69, ARRAY_COUNT(MultichoiceList_69)},
+    {MultichoiceList_70, ARRAY_COUNT(MultichoiceList_70)},
+    {MultichoiceList_71, ARRAY_COUNT(MultichoiceList_71)},
+    {MultichoiceList_72, ARRAY_COUNT(MultichoiceList_72)},
 };
 
 const u8 *const gUnknown_083CE048[] =
@@ -574,37 +582,50 @@ extern u8 gPCText_WhichPCShouldBeAccessed[];
 
 extern u16 gScriptResult;
 
-bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4)
+static void Task_HandleMultichoiceInput(u8);
+static void Task_HandleYesNoInput(u8);
+static void Task_HandleMultichoiceGridInput(u8);
+static u16 GetStringWidthInTilesForScriptMenu(const u8 *str);
+static void DrawMultichoiceMenu(u8, u8, u8, const struct MenuAction *list, u8, u8);
+static void StartScriptMenuTask(u8, u8, u8, u8, u8, u8);
+static void sub_80B53B4(u8, u8, u8, const struct MenuAction *list, u8);
+static bool8 IsPicboxClosed(void);
+
+bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DrawMultichoiceMenu(left, top, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4, 0);
+        DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, 0);
         return TRUE;
     }
 }
 
-bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5)
+bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 defaultChoice)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DrawMultichoiceMenu(left, top, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4, var5);
+        DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, defaultChoice);
         return TRUE;
     }
 }
 
-u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
+static u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
 {
     // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8.
     return (GetStringWidthGivenWindowConfig((struct WindowConfig *)&gWindowConfig_81E6CE4, str) + 7) / 8;
 }
 
-void DrawMultichoiceMenu(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4, u8 cursorPos)
+static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos)
 {
     u16 width = GetStringWidthInTilesForScriptMenu(list[0].text);
     u16 newWidth;
@@ -633,75 +654,79 @@ void DrawMultichoiceMenu(u8 left, u8 top, u8 count, struct MenuAction *list, u8
     MenuDrawTextWindow(left, top, right, bottom);
     PrintMenuItems(left + 1, top + 1, count, list);
     InitMenu(0, left + 1, top + 1, count, cursorPos, right - left - 1);
-    sub_80B5230(left, top, right, bottom, var4, count);
+    StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count);
 }
 
-void sub_80B5230(u8 left, u8 top, u8 right, u8 bottom, u8 unkVar, u8 count)
+#define tLeft         data[0]
+#define tTop          data[1]
+#define tRight        data[2]
+#define tBottom       data[3]
+#define tIgnoreBPress data[4]
+#define tDoWrap       data[5]
+
+static void StartScriptMenuTask(u8 left, u8 top, u8 right, u8 bottom, u8 ignoreBPress, u8 count)
 {
-    u8 taskId = CreateTask(sub_80B52B4, 80);
+    u8 taskId = CreateTask(Task_HandleMultichoiceInput, 80);
 
-    gTasks[taskId].data[0] = left;
-    gTasks[taskId].data[1] = top;
-    gTasks[taskId].data[2] = right;
-    gTasks[taskId].data[3] = bottom;
-    gTasks[taskId].data[4] = unkVar;
+    gTasks[taskId].tLeft = left;
+    gTasks[taskId].tTop = top;
+    gTasks[taskId].tRight = right;
+    gTasks[taskId].tBottom = bottom;
+    gTasks[taskId].tIgnoreBPress = ignoreBPress;
 
     if (count > 3)
-        gTasks[taskId].data[5] = TRUE;
+        gTasks[taskId].tDoWrap = TRUE;
     else
-        gTasks[taskId].data[5] = FALSE;
+        gTasks[taskId].tDoWrap = FALSE;
 }
 
-void sub_80B52B4(u8 taskId)
+static void Task_HandleMultichoiceInput(u8 taskId)
 {
-    s8 var;
+    s8 selection;
 
     if (!gPaletteFade.active)
     {
-        if (!gTasks[taskId].data[5])
-            var = ProcessMenuInputNoWrap();
+        if (!gTasks[taskId].tDoWrap)
+            selection = ProcessMenuInputNoWrap();
         else
-            var = ProcessMenuInput();
+            selection = ProcessMenuInput();
 
-        if (var != -2)
+        if (selection != -2)
         {
-            if (var == -1)
+            if (selection == -1)
             {
-                if (!gTasks[taskId].data[4])
-                {
-                    PlaySE(5);
-                    gScriptResult = 127;
-                }
-                else
-                {
+                if (gTasks[taskId].tIgnoreBPress)
                     return;
-                }
+                PlaySE(SE_SELECT);
+                gScriptResult = 127;
             }
             else
             {
-                gScriptResult = var;
+                gScriptResult = selection;
             }
             HandleDestroyMenuCursors();
-            MenuZeroFillWindowRect(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[2], gTasks[taskId].data[3]);
+            MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
             DestroyTask(taskId);
             EnableBothScriptContexts();
         }
     }
 }
 
-bool8 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4)
+bool8 Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        sub_80B53B4(var1, var2, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4);
+        sub_80B53B4(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress);
         return TRUE;
     }
 }
 
-void sub_80B53B4(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4)
+static void sub_80B53B4(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress)
 {
     u16 width = GetStringWidthInTilesForScriptMenu(list[0].text);
     u16 newWidth;
@@ -722,22 +747,24 @@ void sub_80B53B4(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4)
 
     PrintMenuItems(left, top, count, list);
     InitMenu(0, left, top, count, 0, right - left - 1);
-    sub_80B5230(left, top, right, bottom, var4, count);
+    StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count);
 }
 
-bool8 yes_no_box(u8 var1, u8 var2)
+bool8 ScriptMenu_YesNo(u8 left, u8 top)
 {
     u8 taskId;
 
-    if (FuncIsActiveTask(task_yes_no_maybe) == 1)
+    if (FuncIsActiveTask(Task_HandleYesNoInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DisplayYesNoMenu(var1, var2, 1);
-        taskId = CreateTask(task_yes_no_maybe, 0x50);
-        gTasks[taskId].data[0] = var1;
-        gTasks[taskId].data[1] = var2;
+        DisplayYesNoMenu(left, top, 1);
+        taskId = CreateTask(Task_HandleYesNoInput, 0x50);
+        gTasks[taskId].tLeft = left;
+        gTasks[taskId].tTop = top;
         return TRUE;
     }
 }
@@ -751,13 +778,13 @@ bool8 IsScriptActive(void)
         return TRUE;
 }
 
-void task_yes_no_maybe(u8 taskId)
+static void Task_HandleYesNoInput(u8 taskId)
 {
     u8 left, top;
 
-    if (gTasks[taskId].data[2] < 5)
+    if (gTasks[taskId].tRight < 5)
     {
-        gTasks[taskId].data[2]++;
+        gTasks[taskId].tRight++;
         return;
     }
 
@@ -767,7 +794,7 @@ void task_yes_no_maybe(u8 taskId)
         return;
     case -1:
     case 1:
-        PlaySE(5);
+        PlaySE(SE_SELECT);
         gScriptResult = 0;
         break;
     case 0:
@@ -775,19 +802,19 @@ void task_yes_no_maybe(u8 taskId)
         break;
     }
 
-    left = gTasks[taskId].data[0];
-    top = gTasks[taskId].data[1];
+    left = gTasks[taskId].tLeft;
+    top = gTasks[taskId].tTop;
 
     MenuZeroFillWindowRect(left, top, left + 6, top + 5);
     DestroyTask(taskId);
     EnableBothScriptContexts();
 }
 
-bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
 {
     u8 bottom = 0;
 
-    if (FuncIsActiveTask(sub_80B5684) == TRUE)
+    if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE)
     {
         return FALSE;
     }
@@ -800,7 +827,7 @@ bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
 
         sub_807274C(left, top, gMultichoiceLists[multichoiceId].count, 0, gMultichoiceLists[multichoiceId].list, columnCount, 0);
 
-        taskId = CreateTask(sub_80B5684, 80);
+        taskId = CreateTask(Task_HandleMultichoiceGridInput, 80);
 
         if (!((gMultichoiceLists[multichoiceId].count >> 1) < columnCount || (gMultichoiceLists[multichoiceId].count & 1))
          || columnCount == 1 || gMultichoiceLists[multichoiceId].count == columnCount)
@@ -813,58 +840,62 @@ bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
         }
 
         width = sub_807288C(columnCount);
-        gTasks[taskId].data[0] = left;
-        gTasks[taskId].data[1] = top;
-        gTasks[taskId].data[2] = width + left + 2;
-        gTasks[taskId].data[3] = bottom;
-        gTasks[taskId].data[4] = a4;
+        gTasks[taskId].tLeft = left;
+        gTasks[taskId].tTop = top;
+        gTasks[taskId].tRight = width + left + 2;
+        gTasks[taskId].tBottom = bottom;
+        gTasks[taskId].tIgnoreBPress = ignoreBPress;
         return TRUE;
     }
 }
 
-void sub_80B5684(u8 taskId)
+static void Task_HandleMultichoiceGridInput(u8 taskId)
 {
-    s8 var = sub_80727CC();
+    s8 selection = sub_80727CC();
 
-    if (var != -2)
+    if (selection != -2)
     {
-        if (var == -1)
+        if (selection == -1)
         {
-            if (!gTasks[taskId].data[4])
-            {
-                PlaySE(5);
-                gScriptResult = 127;
-            }
-            else
-            {
+            if (gTasks[taskId].tIgnoreBPress)
                 return;
-            }
+            PlaySE(SE_SELECT);
+            gScriptResult = 127;
         }
         else
         {
-            gScriptResult = var;
+            gScriptResult = selection;
         }
         HandleDestroyMenuCursors();
-        MenuZeroFillWindowRect(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[2], gTasks[taskId].data[3]);
+        MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
         DestroyTask(taskId);
         EnableBothScriptContexts();
     }
 }
 
-bool8 TryCreatePCMenu(void)
+#undef tLeft
+#undef tTop
+#undef tRight
+#undef tBottom
+#undef tIgnoreBPress
+#undef tDoWrap
+
+bool8 ScrSpecial_CreatePCMenu(void)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        CreatePCMenu();
+        ScriptMenu_CreatePCMenu();
         return TRUE;
     }
 }
 
 #if ENGLISH
-void CreatePCMenu(void)
+void ScriptMenu_CreatePCMenu(void)
 {
     u16 playersPCWidth = GetStringWidthInTilesForScriptMenu(gPCText_PlayersPC);
     u8 width;
@@ -896,11 +927,11 @@ void CreatePCMenu(void)
 
     MenuPrint(gPCText_PlayersPC, 1, 3);
     InitMenu(0, 1, 1, numChoices, 0, width + 1);
-    sub_80B5230(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices);
+    StartScriptMenuTask(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices);
 }
 #elif GERMAN
 __attribute__((naked))
-void CreatePCMenu(void) {
+void ScriptMenu_CreatePCMenu(void) {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
     sub sp, 0x18\n\
@@ -1051,7 +1082,7 @@ _080B584A:\n\
     str r7, [sp, 0x4]\n\
     movs r0, 0\n\
     movs r1, 0\n\
-    bl sub_80B5230\n\
+    bl StartScriptMenuTask\n\
     add sp, 0x18\n\
     pop {r4-r7}\n\
     pop {r0}\n\
@@ -1063,72 +1094,85 @@ _080B588C: .4byte gPCText_PlayersPC\n\
 }
 #endif
 
-void sub_80B5838(void)
+void ScriptMenu_DisplayPCStartupPrompt(void)
 {
     MenuDisplayMessageBox();
     MenuPrint(gPCText_WhichPCShouldBeAccessed, 2, 15);
 }
 
-void task_picbox(u8 taskId)
+#define tState       data[0]
+#define tMonSpecies  data[1]
+#define tMonSpriteId data[2]
+#define tWindowX     data[3]
+#define tWindowY     data[4]
+
+static void Task_PokemonPicWindow(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    switch (task->data[0])
+    switch (task->tState)
     {
     case 0:
-        task->data[0]++;
+        task->tState++;
         break;
     case 1:
         break;
     case 2:
-        FreeResourcesAndDestroySprite(&gSprites[task->data[2]]);
-        task->data[0]++;
+        FreeResourcesAndDestroySprite(&gSprites[task->tMonSpriteId]);
+        task->tState++;
         break;
     case 3:
-        MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
+        MenuZeroFillWindowRect(task->tWindowX, task->tWindowY, task->tWindowX + 9, task->tWindowY + 10);
         DestroyTask(taskId);
         break;
     }
 }
 
-bool8 sub_80B58C4(u16 var1, u8 var2, u8 var3)
+bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y)
 {
     u8 taskId;
-    u8 var;
+    u8 spriteId;
 
-    if (FindTaskIdByFunc(task_picbox) != 0xFF)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF)
+    {
         return FALSE;
+    }
     else
     {
-        MenuDrawTextWindow(var2, var3, var2 + 9, var3 + 10);
-        taskId = CreateTask(task_picbox, 0x50);
-        gTasks[taskId].data[0] = 0;
-        gTasks[taskId].data[1] = var1;
-        var = CreateMonSprite_PicBox(var1, var2 * 8 + 40, var3 * 8 + 40, 0);
-        gTasks[taskId].data[2] = var;
-        gTasks[taskId].data[3] = var2;
-        gTasks[taskId].data[4] = var3;
-        gSprites[var].callback = SpriteCallbackDummy;
-        gSprites[var].oam.priority = 0;
+        MenuDrawTextWindow(x, y, x + 9, y + 10);
+        taskId = CreateTask(Task_PokemonPicWindow, 0x50);
+        gTasks[taskId].tState = 0;
+        gTasks[taskId].tMonSpecies = species;
+        spriteId = CreateMonSprite_PicBox(species, x * 8 + 40, y * 8 + 40, 0);
+        gTasks[taskId].tMonSpriteId = spriteId;
+        gTasks[taskId].tWindowX = x;
+        gTasks[taskId].tWindowY = y;
+        gSprites[spriteId].callback = SpriteCallbackDummy;
+        gSprites[spriteId].oam.priority = 0;
         return TRUE;
     }
-}
+}  
 
-void *picbox_close(void)
+bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void)
 {
-    u8 taskId = FindTaskIdByFunc(task_picbox);
+    u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow);
 
     if (taskId == 0xFF)
         return NULL;
-
-    gTasks[taskId].data[0]++;
-    return (void *)sub_80B59AC;
+    gTasks[taskId].tState++;
+    return IsPicboxClosed;
 }
 
-bool8 sub_80B59AC(void)
+static bool8 IsPicboxClosed(void)
 {
-    if (FindTaskIdByFunc(task_picbox) == 0xFF)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF)
         return TRUE;
     else
         return FALSE;
 }
+
+#undef tState      
+#undef tMonSpecies 
+#undef tMonSpriteId
+#undef tWindowX    
+#undef tWindowY  
diff --git a/src/script_movement.c b/src/script_movement.c
index e25b60a3c..30e10b451 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -13,33 +13,33 @@ static bool8 sub_80A21F4(u8, u8, u8 *);
 static u8 sub_80A2260(u8, u8);
 static bool8 sub_80A2370(u8, u8);
 static void sub_80A23C8(u8, u8, u8, u8 *);
-static void sub_80A2408(u8);
+static void UnfreezeObjects(u8);
 static void Task_80A244C(u8);
 static void sub_80A2490(u8, u8, u8, u8 *);
 
-bool8 exec_movement(u8 a, u8 b, u8 c, u8 *d)
+bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, u8 *movementScript)
 {
     u8 mapObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId))
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjId))
         return TRUE;
     if (!FuncIsActiveTask(Task_80A244C))
         sub_80A2198(50);
-    return sub_80A21F4(sub_80A21E0(), mapObjId, d);
+    return sub_80A21F4(sub_80A21E0(), mapObjId, movementScript);
 }
 
-bool8 sub_80A212C(u8 a, u8 b, u8 c)
+bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank)
 {
     u8 mapObjId;
     u8 r4;
     u8 r1;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId))
-        return 1;
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &mapObjId))
+        return TRUE;
     r4 = sub_80A21E0();
     r1 = sub_80A2260(r4, mapObjId);
     if (r1 == 16)
-        return 1;
+        return TRUE;
     return sub_80A2370(r4, r1);
 }
 
@@ -50,7 +50,7 @@ void sub_80A2178(void)
     taskId = sub_80A21E0();
     if (taskId != 0xFF)
     {
-        sub_80A2408(taskId);
+        UnfreezeObjects(taskId);
         DestroyTask(taskId);
     }
 }
@@ -70,27 +70,31 @@ static u8 sub_80A21E0(void)
     return FindTaskIdByFunc(Task_80A244C);
 }
 
-static bool8 sub_80A21F4(u8 taskId, u8 b, u8 *c)
+static bool8 sub_80A21F4(u8 taskId, u8 mapObjId, u8 *movementScript)
 {
     u8 r4;
 
-    r4 = sub_80A2260(taskId, b);
+    r4 = sub_80A2260(taskId, mapObjId);
     if (r4 != 16)
     {
         if (sub_80A2370(taskId, r4) == 0)
+        {
             return TRUE;
+        }
         else
         {
-            sub_80A23C8(taskId, r4, b, c);
+            sub_80A23C8(taskId, r4, mapObjId, movementScript);
             return FALSE;
         }
     }
     r4 = sub_80A2260(taskId, 0xFF);
     if (r4 == 16)
+    {
         return TRUE;
+    }
     else
     {
-        sub_80A23C8(taskId, r4, b, c);
+        sub_80A23C8(taskId, r4, mapObjId, movementScript);
         return FALSE;
     }
 }
@@ -156,9 +160,9 @@ static bool8 sub_80A2370(u8 taskId, u8 b)
         return FALSE;
 }
 
-static void npc_obj_offscreen_culling_and_flag_update(u8 a, u8 *b)
+static void npc_obj_offscreen_culling_and_flag_update(u8 a, u8 *movementScript)
 {
-    gUnknown_020384F8[a] = b;
+    gUnknown_020384F8[a] = movementScript;
 }
 
 static u8 *sub_80A23B8(u8 a)
@@ -166,23 +170,23 @@ static u8 *sub_80A23B8(u8 a)
     return gUnknown_020384F8[a];
 }
 
-static void sub_80A23C8(u8 taskId, u8 b, u8 c, u8 *d)
+static void sub_80A23C8(u8 taskId, u8 b, u8 mapObjId, u8 *movementScript)
 {
     sub_80A2318(taskId, b);
-    npc_obj_offscreen_culling_and_flag_update(b, d);
-    sub_80A22D0(taskId, b, c);
+    npc_obj_offscreen_culling_and_flag_update(b, movementScript);
+    sub_80A22D0(taskId, b, mapObjId);
 }
 
-static void sub_80A2408(u8 a)
+static void UnfreezeObjects(u8 taskId)
 {
-    u8 *ptr;
+    u8 *pMapObjId;
     u8 i;
 
-    ptr = (u8 *)&gTasks[a].data[1];
-    for (i = 0; i < 16; i++, ptr++)
+    pMapObjId = (u8 *)&gTasks[taskId].data[1];
+    for (i = 0; i < 16; i++, pMapObjId++)
     {
-        if (*ptr != 0xFF)
-            UnfreezeMapObject(&gMapObjects[*ptr]);
+        if (*pMapObjId != 0xFF)
+            UnfreezeMapObject(&gMapObjects[*pMapObjId]);
     }
 }
 
@@ -199,23 +203,23 @@ static void Task_80A244C(u8 taskId)
     }
 }
 
-static void sub_80A2490(u8 taskId, u8 b, u8 c, u8 *d)
+static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, u8 *d)
 {
     u8 var;
 
-    if (FieldObjectIsSpecialAnimActive(&gMapObjects[c])
-     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[c]))
+    if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId])
+     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
         return;
 
     var = *d;
     if (var == 0xFE)
     {
         sub_80A2348(taskId, b);
-        FreezeMapObject(&gMapObjects[c]);
+        FreezeMapObject(&gMapObjects[mapObjId]);
     }
     else
     {
-        if (!FieldObjectSetSpecialAnim(&gMapObjects[c], var))
+        if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var))
         {
             d++;
             npc_obj_offscreen_culling_and_flag_update(b, d);
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index cbca07011..323df991a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -18,7 +18,7 @@
 #include "pokedex.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 #include "species.h"
 #include "task.h"
@@ -511,7 +511,7 @@ void ScriptRandom(void)
     *scriptPtr = random % *scriptPtr;
 }
 
-void HealPlayerParty(void)
+void ScrSpecial_HealPlayerParty(void)
 {
     u8 i, j;
     u8 ppBonuses;
@@ -542,41 +542,39 @@ void HealPlayerParty(void)
     }
 }
 
-u8 ScriptGiveMon(u16 species, u8 var, u16 item, u32 var3, u32 var4, u8 var5)
+u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 unused3)
 {
-    u16 nationalSpecies;
+    u16 nationalDexNum;
     int sentToPc;
-    u8 array[2];
+    u8 heldItem[2];
     struct Pokemon mon;
 
-    CreateMon(&mon, species, var, 32, 0, 0, 0, 0);
-    array[0] = item;
-    array[1] = item >> 8;
-    SetMonData(&mon, MON_DATA_HELD_ITEM, array);
+    CreateMon(&mon, species, level, 32, 0, 0, 0, 0);
+    heldItem[0] = item;
+    heldItem[1] = item >> 8;
+    SetMonData(&mon, MON_DATA_HELD_ITEM, heldItem);
     sentToPc = GiveMonToPlayer(&mon);
-    nationalSpecies = SpeciesToNationalPokedexNum(species);
+    nationalDexNum = SpeciesToNationalPokedexNum(species);
 
-    // nested if check to fool compiler
     switch(sentToPc)
     {
-        case 0:
-        case 1:
-            GetNationalPokedexFlag(nationalSpecies, 2);
-            GetNationalPokedexFlag(nationalSpecies, 3);
-            return sentToPc;
-        default:
-            return sentToPc;
+    case 0:
+    case 1:
+        GetNationalPokedexFlag(nationalDexNum, 2);
+        GetNationalPokedexFlag(nationalDexNum, 3);
+        break;
     }
+    return sentToPc;
 }
 
-u8 ScriptGiveEgg(u16 value)
+u8 ScriptGiveEgg(u16 species)
 {
     struct Pokemon mon;
-    u8 data;
+    u8 isEgg;
 
-    sub_8042044(&mon, value, 1);
-    data = 1;
-    SetMonData(&mon, MON_DATA_IS_EGG, &data);
+    sub_8042044(&mon, species, 1);
+    isEgg = TRUE;
+    SetMonData(&mon, MON_DATA_IS_EGG, &isEgg);
 
     return GiveMonToPlayer(&mon);
 }
@@ -622,18 +620,18 @@ bool8 GetNameOfEnigmaBerryInPlayerParty(void)
     return hasItem;
 }
 
-void ScriptWildBattle(u16 species, u8 level, u16 item)
+void CreateScriptedWildMon(u16 species, u8 level, u16 item)
 {
-    u8 data[2];
+    u8 heldItem[2];
 
     ZeroEnemyPartyMons();
     CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0);
 
     if(item)
     {
-        data[0] = item;
-        data[1] = item >> 8;
-        SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, data);
+        heldItem[0] = item;
+        heldItem[1] = item >> 8;
+        SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, heldItem);
     }
 }
 
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 2b48cc0d8..f930df8e2 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -9,16 +9,15 @@
 #include "party_menu.h"
 #include "pokemon.h"
 #include "pokemon_summary_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_pokemon_80F9.h"
+#include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
 
-
-
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -59,7 +58,7 @@ void sub_80F9A4C(void)
 
 void sub_80F9A8C(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         gPaletteFade.bufferTransferDisabled = 1;
         OpenPartyMenu((u8) gTasks[taskId].data[0], 0);
@@ -69,10 +68,10 @@ void sub_80F9A8C(u8 taskId)
 
 bool8 sub_80F9ACC(void)
 {
-    switch(EWRAM_1B000.unk264)
+    switch (EWRAM_1B000.unk264)
     {
     case 0:
-        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        if (EWRAM_1B000.unk266 < gPlayerPartyCount)
         {
             TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
             EWRAM_1B000.unk266++;
@@ -92,7 +91,7 @@ bool8 sub_80F9ACC(void)
         EWRAM_1B000.unk264++;
         break;
     case 3:
-        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        if (sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -116,7 +115,7 @@ bool8 sub_80F9ACC(void)
         EWRAM_1B000.unk264++;
         break;
     case 7: // the only case that can return true.
-        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        if (sub_806B58C(EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -135,9 +134,9 @@ void sub_80F9C00(void)
 {
     u8 i;
 
-    for(i = 0; i < gPlayerPartyCount; i++)
+    for (i = 0; i < gPlayerPartyCount; i++)
     {
-        switch(sub_80AE47C(&gPlayerParty[i]))
+        switch (sub_80AE47C(&gPlayerParty[i]))
         {
         case 0:
         case 3:
@@ -154,18 +153,18 @@ void sub_80F9C00(void)
 
 void sub_80F9C6C(u8 var)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
-        switch(sub_806BD80(var))
+        switch (sub_806BD80(var))
         {
         case 1:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gUnknown_02038694 = sub_806CA38(var);
             gSpecialVar_0x8004 = gUnknown_02038694;
             sub_8123138(var);
             break;
         case 2:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gUnknown_02038694 = 0xFF;
             gSpecialVar_0x8004 = 0xFF;
             sub_8123138(var);
@@ -176,10 +175,10 @@ void sub_80F9C6C(u8 var)
 
 bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case 6 calls a different function. why
 {
-    switch(EWRAM_1B000.unk264)
+    switch (EWRAM_1B000.unk264)
     {
     case 0:
-        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        if (EWRAM_1B000.unk266 < gPlayerPartyCount)
         {
             TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
             EWRAM_1B000.unk266++;
@@ -199,7 +198,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case
         EWRAM_1B000.unk264++;
         break;
     case 3:
-        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        if (sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -223,7 +222,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case
         EWRAM_1B000.unk264++;
         break;
     case 7: // the only case that can return true.
-        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        if (sub_806B58C(EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -242,9 +241,9 @@ void sub_80F9E1C(void)
 {
     u8 i;
 
-    for(i = 0; i < gPlayerPartyCount; i++)
+    for (i = 0; i < gPlayerPartyCount; i++)
     {
-        if(!sub_8040574(&gPlayerParty[i]))
+        if (!sub_8040574(&gPlayerParty[i]))
             sub_806BC3C(i, 0x9A);
         else
             sub_806BC3C(i, 0x8C);
@@ -253,18 +252,18 @@ void sub_80F9E1C(void)
 
 void sub_80F9E64(u8 var)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
-        switch(sub_806BD80(var))
+        switch (sub_806BD80(var))
         {
         case 1:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gSpecialVar_0x8004 = sub_806CA38(var);
             gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]);
             sub_8123138(var);
             break;
         case 2:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gSpecialVar_0x8004 = 0xFF;
             sub_8123138(var);
         }
@@ -278,23 +277,23 @@ void sub_80F9EEC(void)
     gFieldCallback = sub_8080990;
 }
 
-void sub_80F9F3C(void) // count pokemon moves
+void ScrSpecial_CountPokemonMoves(void) // count pokemon moves
 {
     u8 i;
 
     gScriptResult = 0;
 
-    for(i = 0; i < 4; i++) // checks MOVE1-MOVE4
-        if(GetMonData(&gPlayerParty[gSpecialVar_0x8004], i + 13))
+    for (i = 0; i < 4; i++) // checks MOVE1-MOVE4
+        if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i))
             gScriptResult++;
 }
 
-void sub_80F9F84(void)
+void ScrSpecial_GetPokemonNicknameAndMoveName(void)
 {
-    struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
-    u16 data = GetMonData(party, gSpecialVar_0x8005 + 13);
+    struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_0x8004];
+    u16 data = GetMonData(pkmn, MON_DATA_MOVE1 + gSpecialVar_0x8005);
 
-    GetMonNickname(party, gStringVar1);
+    GetMonNickname(pkmn, gStringVar1);
     StringCopy(gStringVar2, gMoveNames[data]);
 }
 
@@ -431,7 +430,7 @@ void sub_80FA0DC(void)
     SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], 0, gSpecialVar_0x8005);
     RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005);
 
-    for(i = gSpecialVar_0x8005; i < 3; i++)
+    for (i = gSpecialVar_0x8005; i < 3; i++)
         sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
 }
 
@@ -440,6 +439,6 @@ void sub_80FA148(void)
     struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
     gScriptResult = 0;
 
-    if(GetMonData(party, MON_DATA_IS_EGG))
+    if (GetMonData(party, MON_DATA_IS_EGG))
         gScriptResult = 1;
 }
diff --git a/src/secret_base.c b/src/secret_base.c
index 4e8331f5c..b2cd1f094 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -14,7 +14,7 @@
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "string_util.h"
 #include "strings.h"
@@ -270,7 +270,7 @@ void sub_80BBAF0(void)
 
 bool8 sub_80BBB24(void)
 {
-    if (gMapHeader.mapType == 9 && VarGet(VAR_0x4097) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0)
         return FALSE;
     return TRUE;
 }
@@ -380,7 +380,7 @@ void sub_80BBDD0(void)
                 gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + 0x3f20;
                 VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]);
                 gScriptResult = gMapHeader.events->mapObjects[objid].localId;
-                FlagReset(gSpecialVar_0x8004 + 0xAE);
+                FlagClear(gSpecialVar_0x8004 + 0xAE);
                 show_sprite(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
                 sub_805C0F8(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
                 sub_805C78C(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
@@ -690,7 +690,7 @@ _080BBEDA:\n\
     adds r0, 0xAE\n\
     lsls r0, 16\n\
     lsrs r0, 16\n\
-    bl FlagReset\n\
+    bl FlagClear\n\
     ldr r3, _080BBF9C @ =gScriptResult\n\
     ldrb r0, [r3]\n\
     mov r4, r10\n\
diff --git a/src/shop.c b/src/shop.c
index 6a88f1394..22250b1c4 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -23,7 +23,7 @@
 #include "decoration.h"
 #include "items.h"
 #include "songs.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "decoration_inventory.h"
 #include "field_camera.h"
 
@@ -60,7 +60,7 @@ EWRAM_DATA u8 gUnknown_02038730 = 0;
 EWRAM_DATA u8 gUnknown_02038731 = 0;
 
 // rodata
-static const struct MenuAction2 gUnknown_083CC6D0[] =
+static const struct MenuAction2 sBuySellQuitMenuActions[] =
 {
     { MartText_Buy, sub_80B2EFC },
     { MartText_Sell, sub_80B2F30 },
@@ -88,13 +88,13 @@ u8 CreateShopMenu(u8 martType)
     {
         gMartInfo.numChoices = 2;
         MenuDrawTextWindow(0, 0, 10, 7);
-        PrintMenuItemsReordered(1, 1, 3, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6E8);
+        PrintMenuItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8);
     }
     else
     {
         gMartInfo.numChoices = 1;
         MenuDrawTextWindow(0, 0, 10, 5);
-        PrintMenuItemsReordered(1, 1, 2, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB);
+        PrintMenuItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB);
     }
     InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel
 
@@ -145,11 +145,11 @@ void sub_80B2E38(u8 var)
         PlaySE(SE_SELECT);
         if (gMartInfo.martType == MART_TYPE_0)
         {
-            gUnknown_083CC6D0[gUnknown_083CC6E8[gMartInfo.cursor]].func(local);
+            sBuySellQuitMenuActions[gUnknown_083CC6E8[gMartInfo.cursor]].func(local);
         }
         else
         {
-            gUnknown_083CC6D0[gUnknown_083CC6EB[gMartInfo.cursor]].func(local);
+            sBuySellQuitMenuActions[gUnknown_083CC6EB[gMartInfo.cursor]].func(local);
         }
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -294,7 +294,7 @@ void BuyMenuDrawGraphics(void)
     gMartInfo.cursor = zero;
     gMartInfo.choicesAbove = zero2;
     MenuZeroFillWindowRect(0, 0, 0x20, 0x20);
-    sub_80B7C14(gSaveBlock1.money, 0, 0);
+    OpenMoneyWindow(gSaveBlock1.money, 0, 0);
     sub_80B3764(0, 7);
     sub_80B37EC();
     sub_80B3270();
@@ -530,7 +530,7 @@ void sub_80B37F8(u8 taskId)
     u16 itemId = gMartInfo.itemList[itemListIndex];
     u32 price = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
 
-    sub_80B7A94(gTasks[taskId].data[1] * price, 6, 6, 11);
+    PrintMoneyAmount(gTasks[taskId].data[1] * price, 6, 6, 11);
     gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
     gStringVar1[1] = 0x14;
     gStringVar1[2] = 0x6;
@@ -559,7 +559,7 @@ void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode)
     if (hasControlCode != FALSE)
         stringPtr = &gStringVar1[3];
 
-    sub_80B79F8(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4);
+    GetMoneyAmountText(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4);
     MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1);
 }
 
@@ -588,7 +588,7 @@ void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode)
     }
     else
     {
-        sub_80B79F8(stringPtr, gDecorations[itemId].price, 0x4);
+        GetMoneyAmountText(stringPtr, gDecorations[itemId].price, 0x4);
         MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 0x1);
     }
 }
@@ -648,9 +648,9 @@ void sub_80B3AEC(u8 taskId)
 void sub_80B3B80(u8 taskId)
 {
     IncrementGameStat(0x26);
-    sub_80B79E0(&gSaveBlock1.money, gMartTotalCost);
+    RemoveMoney(&gSaveBlock1.money, gMartTotalCost);
     PlaySE(SE_REGI);
-    sub_80B7BEC(gSaveBlock1.money, 0, 0);
+    UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
     gTasks[taskId].func = sub_80B3AEC;
 }
 
@@ -1165,7 +1165,7 @@ void Task_ExitBuyMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        RemoveMoneyLabelObject(0, 0);
+        CloseMoneyWindow(0, 0);
         BuyMenuFreeMemory();
         SetMainCallback2(c2_exit_to_overworld_2_switch);
         DestroyTask(taskId);
diff --git a/src/start_menu.c b/src/start_menu.c
index 411690aff..6e44090df 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -15,7 +15,7 @@
 #include "pokedex.h"
 #include "pokemon_menu.h"
 #include "pokenav.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "save.h"
 #include "save_menu_util.h"
@@ -505,7 +505,7 @@ static u8 RunSaveDialogCallback(void)
     return saveDialogCallback();
 }
 
-void InitSaveDialog(void)
+void ScrSpecial_DoSaveDialog(void)
 {
     sub_807160C();
     CreateTask(Task_SaveDialog, 0x50);
@@ -515,7 +515,7 @@ static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void))
 {
     StringExpandPlaceholders(gStringVar4, ptr);
     MenuDisplayMessageBox();
-    sub_8072044(gStringVar4);
+    MenuPrintMessageDefaultCoords(gStringVar4);
     savingComplete = TRUE;
     saveDialogCallback = func;
 }
diff --git a/src/strings.c b/src/strings.c
index 219c5bec1..6c8dce9d6 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -861,7 +861,7 @@ const u8 gOtherText_AtBattleStart[] = _("At the battle’s start.");
 const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle.");
 const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle.");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song");
 const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?");
 const u8 gOtherText_Interview[] = _("Interview");
@@ -1781,7 +1781,7 @@ const u8 gOtherText_AtBattleStart[] = _("Zum Kampfbeginn");
 const u8 gOtherText_UponWinningBattle[] = _("Über den Sieg");
 const u8 gOtherText_UponLosingBattle[] = _("Über die Niederlage");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("Das BARDEN-Lied");
 const u8 gOtherText_WhatsHipHappening[] = _("Was ist hip? Was ist top?");
 const u8 gOtherText_Interview[] = _("Interview");
diff --git a/src/time_events.c b/src/time_events.c
index e1b9a2e9e..accb03db8 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -4,7 +4,7 @@
 #include "field_weather.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "task.h"
@@ -81,13 +81,13 @@ void UpdateShoalTideFlag(void)
         1,
     };
 
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()))
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()))
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
             FlagSet(SYS_SHOAL_TIDE);
         else
-            FlagReset(SYS_SHOAL_TIDE);
+            FlagClear(SYS_SHOAL_TIDE);
     }
 }
 
diff --git a/src/trader.c b/src/trader.c
index ea06058e9..61f48fad8 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -3,6 +3,7 @@
 #include "decoration_inventory.h"
 #include "event_data.h"
 #include "main.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "script.h"
@@ -36,7 +37,7 @@ void sub_810993C(void)
 {
     u8 i, j;
     u8 buffer[12];
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 3; i++)
     {
@@ -55,13 +56,13 @@ void sub_810993C(void)
     }
 }
 
-void sub_81099CC(void)
+void TraderSetup(void)
 {
     u8 i;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
-    trader->unk0 = 2;
-    trader->unk31 = 0;
+    trader->id = MAUVILLE_MAN_TRADER;
+    trader->alreadyTraded = FALSE;
 
     for (i = 0; i < 4; i++)
     {
@@ -74,8 +75,8 @@ void sub_81099CC(void)
 
 void sub_8109A20(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    trader->unk31 = 0;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    trader->alreadyTraded = FALSE;
 }
 
 void sub_8109A30(u8 value)
@@ -83,12 +84,12 @@ void sub_8109A30(u8 value)
     VarSet(VAR_RECYCLE_GOODS, value);
 }
 
-void sub_8109A48(u8 taskId)
+void CreateAvailableDecorationsMenu(u8 taskId)
 {
     u8 i;
     u8 numChoices = 1;
     u8 numDecorations = 0;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 4; i++)
     {
@@ -139,9 +140,9 @@ void sub_8109B34(u8 taskId, u8 decorationId)
     EnableBothScriptContexts();
 }
 
-void sub_8109B7C(u8 taskId)
+void Task_HandleGetDecorationMenuInput(u8 taskId)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     if (gMain.newKeys & DPAD_UP)
     {
@@ -174,13 +175,13 @@ void sub_8109B7C(u8 taskId)
     }
 }
 
-void sub_8109C44(void)
+void ScrSpecial_GetTraderTradedFlag(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    gScriptResult = trader->unk31;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    gScriptResult = trader->alreadyTraded;
 }
 
-void sub_8109C58(void)
+void ScrSpecial_DoesPlayerHaveNoDecorations(void)
 {
     u8 i;
 
@@ -195,7 +196,7 @@ void sub_8109C58(void)
     gScriptResult = TRUE;
 }
 
-void sub_8109C90(void)
+void ScrSpecial_IsDecorationFull(void)
 {
     gScriptResult = FALSE;
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@@ -206,7 +207,7 @@ void sub_8109C90(void)
     }
 }
 
-void sub_8109CF0(void)
+void ScrSpecial_TraderMenuGiveDecoration(void)
 {
     CreateTask(sub_80FE7A8, 0);
 }
@@ -242,20 +243,20 @@ void sub_8109DAC(u8 taskId)
     EnableBothScriptContexts();
 }
 
-void sub_8109DE0(void)
+void ScrSpecial_TraderDoDecorationTrade(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     sub_81340A8(gSpecialVar_0x8006);
     IsThereStorageSpaceForDecoration(gSpecialVar_0x8004);
     StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName);
     trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006;
     sub_810993C();
-    trader->unk31 = 1;
+    trader->alreadyTraded = TRUE;
 }
 
-void sub_8109E34(void)
+void ScrSpecial_TraderMenuGetDecoration(void)
 {
-    u8 taskId = CreateTask(sub_8109B7C, 0);
-    sub_8109A48(taskId);
+    u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
+    CreateAvailableDecorationsMenu(taskId);
 }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 626c5a7bf..bcb62ede6 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -10,7 +10,7 @@
 #include "money.h"
 #include "palette.h"
 #include "pokedex.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
@@ -509,7 +509,7 @@ static void sub_8093688(void)
     ewram0.var_5 = 0;
     ewram0.var_6 = 0;
     for (i = 0; i < 4; i++)
-        sub_80EB3FC(ewram0.var_20[i], ewram0.var_64.var_28[i]);
+        EasyChat_GetWordText(ewram0.var_20[i], ewram0.var_64.var_28[i]);
     sub_80936D4();
 }
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index feb35c67c..5a8ebbafc 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -9,113 +9,132 @@
 #include "task.h"
 #include "util.h"
 
-extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16);
-extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *);
-extern bool8 (*gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *);
+const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp");
+const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp");
+const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp");
+
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16, s16, s16) =
+{
+    GetTrainerApproachDistanceSouth,
+    GetTrainerApproachDistanceNorth,
+    GetTrainerApproachDistanceWest,
+    GetTrainerApproachDistanceEast,
+};
 
 extern struct SpriteTemplate gSpriteTemplate_839B510;
 extern struct SpriteTemplate gSpriteTemplate_839B528;
 
 bool8 CheckTrainers(void)
 {
-    u8 i;
+    u8 mapObjId;
 
-    for (i = 0; i < 16; i++)
+    for (mapObjId = 0; mapObjId < 16; mapObjId++)
     {
-        if ( gMapObjects[i].active )
-            if ( gMapObjects[i].trainerType == 1 ||  gMapObjects[i].trainerType == 3 )
-                if ( CheckTrainer(i) )
-                    return TRUE;
+        if (gMapObjects[mapObjId].active
+         && (gMapObjects[mapObjId].trainerType == 1 ||  gMapObjects[mapObjId].trainerType == 3)
+         && CheckTrainer(mapObjId))
+            return TRUE;
     }
     return FALSE;
 }
 
-bool8 CheckTrainer(u8 trainer)
+bool8 CheckTrainer(u8 mapObjId)
 {
-   u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(trainer);
+    u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjId);
 
-   if (GetTrainerFlagFromScriptPointer(scriptPtr))
-       return FALSE;
-   else
-   {
-       struct MapObject *trainerObj = &gMapObjects[trainer];
-       u8 canApproach = TrainerCanApproachPlayer(trainerObj);
+    if (GetTrainerFlagFromScriptPointer(scriptPtr))
+    {
+        return FALSE;
+    }
+    else
+    {
+        struct MapObject *trainerObj = &gMapObjects[mapObjId];
+        bool8 canApproach = TrainerCanApproachPlayer(trainerObj);
 
-       if (canApproach != 0)
+        if (canApproach)
         {
-           TrainerWantsBattle(trainer, scriptPtr);
-           sub_80842C8(trainerObj, (canApproach - 1));
-           return TRUE;
+            TrainerWantsBattle(mapObjId, scriptPtr);
+            sub_80842C8(trainerObj, (canApproach - 1));
+            return TRUE;
         }
-       else
-       {
-           return FALSE;
-       }
-   }
+        else
+        {
+            return FALSE;
+        }
+    }
 }
 
 bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
 {
     s16 x, y;
     u8 i;
-    u8 playerCoord;
+    u8 approachDistance;
 
     PlayerGetDestCoords(&x, &y);
-    if ( trainerObj->trainerType == 1 ) // trainers that don't spin
+    if (trainerObj->trainerType == 1)  // can only see in one direction
     {
-        playerCoord = gIsTrainerInRange[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, trainerObj->mapobj_unk_18);
+        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, trainerObj->mapobj_unk_18);
     }
-    else // spinners
+    else  // can see in all directions
     {
         for (i = 0; i < 4; i++)
         {
-            playerCoord = gIsTrainerInRange[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-            if ( CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, i + 1) ) // directions are 1-4 instead of 0-3. south north west east
-                return playerCoord;
+            approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+            if (CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+                return approachDistance;
         }
-        return FALSE;
     }
+    return FALSE;
 }
 
-bool8 IsTrainerInRangeSouth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far south the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.x == x
-        && y > trainerObj->coords2.y
-        && y <= trainerObj->coords2.y + vision )
+    if (trainerObj->coords2.x == x
+     && y > trainerObj->coords2.y
+     && y <= trainerObj->coords2.y + range)
         return (y - trainerObj->coords2.y);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeNorth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far north the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.x == x
-        && y < trainerObj->coords2.y
-        && y >= trainerObj->coords2.y - vision )
+    if (trainerObj->coords2.x == x
+     && y < trainerObj->coords2.y
+     && y >= trainerObj->coords2.y - range)
         return (trainerObj->coords2.y - y);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeWest(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far west the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.y == y
-        && x < trainerObj->coords2.x
-        && x >= trainerObj->coords2.x - vision )
+    if (trainerObj->coords2.y == y
+     && x < trainerObj->coords2.x
+     && x >= trainerObj->coords2.x - range)
         return (trainerObj->coords2.x - x);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far east the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.y == y
-        && x > trainerObj->coords2.x
-        && x <= trainerObj->coords2.x + vision )
+    if (trainerObj->coords2.y == y
+     && x > trainerObj->coords2.x
+     && x <= trainerObj->coords2.x + range)
         return (x - trainerObj->coords2.x);
     else
-        return FALSE;
+        return 0;
 }
 
 #ifdef BUGFIX_TRAINERAPPROACH
@@ -124,25 +143,24 @@ bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16
 #define COLLISION_MASK 1
 #endif
 
-bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerCoord, u8 direction)
+bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
     u8 unk19b_temp;
     u8 i;
-    u8 var;
+    u8 collision;
 
-    if (!playerCoord)
+    if (approachDistance == 0)
         return FALSE;
 
     x = trainerObj->coords2.x;
     y = trainerObj->coords2.y;
 
-    for (i = 0; i <= playerCoord - 1; i++, MoveCoords(direction, &x, &y))
+    for (i = 0; i <= approachDistance - 1; i++, MoveCoords(direction, &x, &y))
     {
-        var = sub_8060024((struct MapObject *)trainerObj, x, y, direction);
-
-        if (var && (var & COLLISION_MASK))
+        collision = sub_8060024((struct MapObject *)trainerObj, x, y, direction);
+        if (collision != 0 && (collision & COLLISION_MASK))
             return FALSE;
     }
 
@@ -152,176 +170,212 @@ bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerC
     trainerObj->mapobj_unk_19 = 0;
     trainerObj->mapobj_unk_19b = 0;
 
-    var = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
+    collision = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
 
     trainerObj->mapobj_unk_19 = unk19_temp;
     trainerObj->mapobj_unk_19b = unk19b_temp;
-    if (var == 4)
-        return playerCoord;
+    if (collision == 4)
+        return approachDistance;
 
     return FALSE;
 }
 
-void sub_80842C8(struct MapObject *trainerObj, u8 taskId)
+#define tTrainerObjHi   data[1]
+#define tTrainerObjLo   data[2]
+
+void sub_80842C8(struct MapObject *trainerObj, u8 b)
 {
-    struct Task *task = &gTasks[CreateTask(RunTrainerSeeFuncList, 0x50)];
+    u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50);
+    struct Task *task = &gTasks[taskId];
 
-    task->data[1] = (u32)(trainerObj) >> 16;
-    task->data[2] = (u32)(trainerObj);
-    task->data[3] = taskId;
+    task->tTrainerObjHi = (u32)(trainerObj) >> 16;
+    task->tTrainerObjLo = (u32)(trainerObj);
+    task->data[3] = b;
 }
 
-void sub_80842FC(TaskFunc func)
+void sub_80842FC(TaskFunc followupFunc)
 {
-    TaskFunc func2 = RunTrainerSeeFuncList;
-    u8 taskId = FindTaskIdByFunc(func2);
+    TaskFunc taskFunc = RunTrainerSeeFuncList;
+    u8 taskId = FindTaskIdByFunc(taskFunc);
 
-    SetTaskFuncWithFollowupFunc(taskId, RunTrainerSeeFuncList, func);
+    SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
     gTasks[taskId].data[0] = 1;
-    func2(taskId);
-}
+    taskFunc(taskId);
+}
+
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_8084394,
+    sub_8084398,
+    sub_80843DC,
+    sub_808441C,
+    sub_8084478,
+    sub_8084534,
+    sub_8084578,
+    sub_80845AC,
+    sub_80845C8,
+    sub_80845FC,
+    sub_8084654,
+    sub_80846C8,
+};
 
 void RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *trainerObj = (struct MapObject *)((task->data[1] << 16) | (task->data[2]));
+    struct MapObject *trainerObj = (struct MapObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo));
 
     if (!trainerObj->active)
+    {
         SwitchTaskToFollowupFunc(taskId);
+    }
     else
-        while (gTrainerSeeFuncList[task->data[0]](taskId, task, trainerObj));
+    {
+        while (gTrainerSeeFuncList[task->data[0]](taskId, task, trainerObj))
+            ;
+    }
 }
 
-u8 sub_8084394() // cant be void because it is called with RunTrainerSeeFuncList with arguments.
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments.
 {
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     u8 direction;
 
-    FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0);
-
+    FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
-
     FieldObjectSetSpecialAnim(trainerObj, direction);
     task->data[0]++;
-    return 1;
+    return TRUE;
 }
 
-s8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldEffectActiveListContains(0))
-        return 0;
+    {
+        return FALSE;
+    }
     else
     {
         task->data[0]++;
-        if ((u8)(trainerObj->animPattern - 57) <= 1)
+        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
             task->data[0] = 6;
         if (trainerObj->animPattern == 63)
             task->data[0] = 8;
-        return 1;
+        return TRUE;
     }
 }
 
-s8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
-            if (task->data[3])
-            {
-                FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
-                task->data[3]--;
-            }
-            else
-            {
-                FieldObjectSetSpecialAnim(trainerObj, 0x3E);
-                task->data[0]++;
-            }
+        if (task->data[3])
+        {
+            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            task->data[3]--;
+        }
+        else
+        {
+            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            task->data[0]++;
+        }
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct MapObject *playerObj;
 
     if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
-        return 0;
+        return FALSE;
 
     npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
     sub_805C774(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
     sub_805C754(trainerObj);
 
     playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-     && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
-        return 0;
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        return FALSE;
 
     sub_80597E8();
     FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
     task->data[0]++;
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
 {
     struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
 
-    if ( !FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(playerObj) )
-    SwitchTaskToFollowupFunc(taskId);
-
-    return 0;
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        SwitchTaskToFollowupFunc(taskId);
+    return FALSE;
 }
 
-s8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x59);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if ( FieldObjectClearAnimIfSpecialAnimFinished(trainerObj) )
+    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
         task->data[0] = 3;
 
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x3E);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
     {
-        gUnknown_0202FF84[0] = trainerObj->coords2.x;
-        gUnknown_0202FF84[1] = trainerObj->coords2.y;
-        gUnknown_0202FF84[2] = gSprites[trainerObj->spriteId].subpriority - 1;
-        gUnknown_0202FF84[3] = 2;
-        task->data[4] = FieldEffectStart(49);
+        gFieldEffectArguments[0] = trainerObj->coords2.x;
+        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct Sprite *sprite;
 
@@ -336,17 +390,25 @@ s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
         FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->mapobj_unk_18));
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldEffectActiveListContains(49))
         task->data[0] = 3;
 
-    return 0;
+    return FALSE;
 }
 
+static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *) =
+{
+    sub_80845C8,
+    sub_80845FC,
+    sub_8084654,
+    sub_80846C8,
+};
+
 void sub_80846E4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
@@ -375,12 +437,14 @@ void sub_8084794(struct MapObject *var)
     StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var);
 }
 
-void sub_80847C8(void)
+static void Task_DestroyTrainerApproachTask(u8);
+
+void ScrSpecial_EndTrainerApproach(void)
 {
-    sub_80842FC(sub_80847D8);
+    sub_80842FC(Task_DestroyTrainerApproachTask);
 }
 
-void sub_80847D8(u8 taskId)
+static void Task_DestroyTrainerApproachTask(u8 taskId)
 {
     DestroyTask(taskId);
     EnableBothScriptContexts();
@@ -421,9 +485,9 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = 1;
 
-    sprite->data0 = gUnknown_0202FF84[0];
-    sprite->data1 = gUnknown_0202FF84[1];
-    sprite->data2 = gUnknown_0202FF84[2];
+    sprite->data0 = gFieldEffectArguments[0];
+    sprite->data1 = gFieldEffectArguments[1];
+    sprite->data2 = gFieldEffectArguments[2];
     sprite->data3 = -5;
     sprite->data7 = a2;
 
diff --git a/src/tv.c b/src/tv.c
index a254bcd5f..734cbad6f 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -15,7 +15,7 @@
 #include "species.h"
 #include "pokedex.h"
 #include "naming_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "map_constants.h"
 #include "strings.h"
 #include "battle.h"
@@ -31,7 +31,7 @@
 #include "pokedex.h"
 #include "region_map.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script_menu.h"
 #include "species.h"
@@ -235,7 +235,7 @@ void UpdateTVScreensOnMap(int width, int height)
         }
         else if (FlagGet(SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring()))
         {
-            FlagReset(SYS_TV_WATCH);
+            FlagClear(SYS_TV_WATCH);
             SetTVMetatilesOnMap(width, height, 0x3);
         }
         break;
@@ -388,7 +388,7 @@ bool8 GabbyAndTyGetLastQuote(void)
     if (gSaveBlock1.gabbyAndTyData.quote == 0xffff)
         return FALSE;
 
-    sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+    EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
     gSaveBlock1.gabbyAndTyData.quote |= 0xffff;
     return TRUE;
 }
@@ -942,7 +942,6 @@ void sub_80BE97C(bool8 flag)
 
 void sub_80BE9D4(void)
 {
-    //TVShow *show;
     gUnknown_03005D38.var0 = sub_80BF74C(gSaveBlock1.tvShows);
     if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_FISHING_ADVICE) != 1)
     {
@@ -1624,7 +1623,7 @@ void sub_80BF79C(TVShow *arg0)
             break;
         i++;
     }
-    sub_80EB3FC(gStringVar3, arg0->recentHappenings.var04[i]);
+    EasyChat_GetWordText(gStringVar3, arg0->recentHappenings.var04[i]);
 }
 
 u8 sub_80BF7E8(struct TVShowNameRaterShow *arg0)
@@ -2575,20 +2574,20 @@ void DoTVShowBravoTrainerPokemonProfile(void)
         break;
     case 3:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 5:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
         CopyContestCategoryToStringVar(1, bravoTrainer->contestCategory);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         if (bravoTrainer->var14)
             gUnknown_020387E8 = 6;
         else
@@ -2597,7 +2596,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     case 6:
         StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]);
         StringCopy(gStringVar2, gMoveNames[bravoTrainer->var14]);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         gUnknown_020387E8 = 7;
         break;
     case 7:
@@ -2680,7 +2679,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         gUnknown_020387E8 = 11;
         break;
     case 11:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         if (bravoTrainerTower->var1b == 0)
             gUnknown_020387E8 = 12;
         else
@@ -2688,7 +2687,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         break;
     case 12:
     case 13:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         TVShowConvertInternationalString(gStringVar2, bravoTrainerTower->trainerName, bravoTrainerTower->language);
         TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
         gUnknown_020387E8 = 14;
@@ -3106,12 +3105,12 @@ void DoTVShowPokemonFanClubOpinions(void)
     case 3:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
         StringCopy(gStringVar2, gSpeciesNames[fanclubOpinions->var02]);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[0]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[0]);
         gUnknown_020387E8 = 4;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[1]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[1]);
         TVShowDone();
         break;
     }
@@ -3176,7 +3175,7 @@ void DoTVShowInSearchOfTrainers(void)
         gUnknown_020387E8 = 8;
         break;
     case 8:
-        sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+        EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
         StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
         StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
         gScriptResult = 1;
diff --git a/src/unknown_task.c b/src/unknown_task.c
index 81b89ef92..5ec7fa6bc 100644
--- a/src/unknown_task.c
+++ b/src/unknown_task.c
@@ -2,11 +2,12 @@
 #include "data2.h"
 #include "task.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 struct UnknownStruct1
 {
     void *src[2];
-    void *dest;
+    volatile void *dest;
     u32 unkC;
     void (*unk10)(void);
     u8 srcBank;
@@ -17,14 +18,6 @@ struct UnknownStruct1
     u8 filler19[0x7];
 };
 
-struct UnknownStruct2
-{
-    void *dest;
-    u32 control;
-    u8 unk8;
-    u8 unk9;
-};
-
 static void sub_80896F4(void);
 static void sub_8089714(void);
 
@@ -68,7 +61,7 @@ void dp12_8087EA4(void)
     gUnknown_03004DC0.taskId = 0xFF;
 }
 
-void sub_80895F8(struct UnknownStruct2 unk)
+void sub_80895F8(struct UnknownTaskStruct unk)
 {
     if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1))
     {
@@ -214,7 +207,7 @@ u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
 {
     int i;
     int offset;
-    struct UnknownStruct2 unk;
+    struct UnknownTaskStruct unk;
     u8 taskId;
 
     dp12_8087EA4();
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 0c8f59959..be3003680 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -5,7 +5,7 @@
 
 #include "global.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "string_util.h"
 #include "strings.h"
 #include "sprite.h"
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 7001c2eaa..390898917 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -5,11 +5,12 @@
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
+#include "map_constants.h"
 #include "metatile_behavior.h"
 #include "pokeblock.h"
 #include "rng.h"
 #include "roamer.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "species.h"
@@ -2901,7 +2902,7 @@ const struct WildPokemonInfo Underwater2_WaterMonsInfo = {4, Underwater2_WaterMo
 extern u16 gRoute119WaterTileData[];
 extern u16 gScriptResult;
 extern struct WildPokemon gWildFeebasRoute119Data;
-extern u8 Event_RepelWoreOff[];
+extern u8 S_RepelWoreOff[];
 
 EWRAM_DATA static u8 sWildEncountersDisabled = 0;
 EWRAM_DATA static u32 sFeebasRngValue = 0;
@@ -2911,7 +2912,7 @@ EWRAM_DATA static u32 sFeebasRngValue = 0;
 static u16 FeebasRandom(void);
 static void FeebasSeedRng(u16 seed);
 
-static bool8 RepelCheck(u8 level);
+static bool8 IsWildLevelAllowedByRepel(u8 level);
 static void ApplyFluteEncounterRateMod(u32 *encRate);
 static void ApplyCleanseTagEncounterRateMod(u32 *encRate);
 
@@ -2952,7 +2953,8 @@ static bool8 CheckFeebas(void)
     u8 route119section = 0;
     u16 waterTileNum;
 
-    if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 0x22)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119)
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
         x -= 7;
@@ -3193,7 +3195,7 @@ static bool8 GenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, bool8
         break;
     }
     level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
-    if (checkRepel == TRUE && RepelCheck(level) == FALSE)
+    if (checkRepel == TRUE && IsWildLevelAllowedByRepel(level) == FALSE)
         return FALSE;
     else
     {
@@ -3215,7 +3217,7 @@ static bool8 SetUpMassOutbreakEncounter(bool8 checkRepel)
 {
     u16 i;
 
-    if (checkRepel == TRUE && RepelCheck(gSaveBlock1.outbreakPokemonLevel) == 0)
+    if (checkRepel == TRUE && IsWildLevelAllowedByRepel(gSaveBlock1.outbreakPokemonLevel) == FALSE)
         return FALSE;
     else
     {
@@ -3302,9 +3304,9 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         if (TryStartRoamerEncounter() == TRUE)
                         {
                             roamer = &gSaveBlock1.roamer;
-                            if (RepelCheck(roamer->level))
+                            if (IsWildLevelAllowedByRepel(roamer->level))
                             {
-                                StartBattle_Roamer();
+                                BattleSetup_StartRoamerBattle();
                                 return 1;
                             }
                         }
@@ -3312,7 +3314,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         {
                             if (DoMassOutbreakEncounterTest() == TRUE && SetUpMassOutbreakEncounter(1) == TRUE)
                             {
-                                CheckForSafariZoneAndProceed();
+                                BattleSetup_StartWildBattle();
                                 return 1;
                             }
                             if (GenerateWildMon(gWildMonHeaders[headerNum].landMonsInfo, 0, TRUE) == TRUE)
@@ -3336,9 +3338,9 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         if (TryStartRoamerEncounter() == TRUE)
                         {
                             roamer = &gSaveBlock1.roamer;
-                            if (RepelCheck(roamer->level))
+                            if (IsWildLevelAllowedByRepel(roamer->level))
                             {
-                                StartBattle_Roamer();
+                                BattleSetup_StartRoamerBattle();
                                 return 1;
                             }
                         }
@@ -3349,7 +3351,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                             {
                             label:
                                 //_0808527A
-                                CheckForSafariZoneAndProceed();
+                                BattleSetup_StartWildBattle();
                                 return 1;
                             }
                         }
@@ -3361,7 +3363,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
     return 0;
 }
 
-void RockSmashWildEncounter(void)
+void ScrSpecial_RockSmashWildEncounter(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3377,7 +3379,7 @@ void RockSmashWildEncounter(void)
         else if (DoWildEncounterTest(wildPokemonInfo->encounterRate, 1) == TRUE
          && GenerateWildMon(wildPokemonInfo, 2, TRUE) == TRUE)
         {
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             gScriptResult = 1;
             return;
         }
@@ -3403,14 +3405,14 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (TryStartRoamerEncounter() == TRUE)
             {
-                StartBattle_Roamer();
+                BattleSetup_StartRoamerBattle();
                 return TRUE;
             }
             if (DoMassOutbreakEncounterTest() == TRUE)
-                SetUpMassOutbreakEncounter(0);
+                SetUpMassOutbreakEncounter(FALSE);
             else
                 GenerateWildMon(wildPokemonInfo, 0, FALSE);
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             return TRUE;
         }
         else if (MetatileBehavior_IsWaterWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == 1)
@@ -3420,18 +3422,18 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (TryStartRoamerEncounter() == TRUE)
             {
-                StartBattle_Roamer();
+                BattleSetup_StartRoamerBattle();
                 return TRUE;
             }
             GenerateWildMon(wildPokemonInfo, 1, FALSE);
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             return TRUE;
         }
     }
     return FALSE;
 }
 
-bool8 GetFishingWildMonListHeader(void)
+bool8 DoesCurrentMapHaveFishingMons(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3460,7 +3462,7 @@ void FishingWildEncounter(u8 rod)
     }
     IncrementGameStat(12);
     sub_80BEA50(species);
-    CheckForSafariZoneAndProceed();
+    BattleSetup_StartWildBattle();
 }
 
 u16 GetLocalWildMon(bool8 *isWaterMon)
@@ -3497,7 +3499,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon)
     }
 }
 
-u16 GetMirageIslandMon(void)
+u16 GetLocalWaterMon(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3521,20 +3523,21 @@ bool8 UpdateRepelCounter(void)
         VarSet(VAR_REPEL_STEP_COUNT, steps);
         if (steps == 0)
         {
-            ScriptContext1_SetupScript(Event_RepelWoreOff);
+            ScriptContext1_SetupScript(S_RepelWoreOff);
             return TRUE;
         }
     }
     return FALSE;
 }
 
-//Returns FALSE if Repel prevents wild Pokemon at the specified level from appearing
-static bool8 RepelCheck(u8 level)
+static bool8 IsWildLevelAllowedByRepel(u8 wildLevel)
 {
     u8 i;
 
     if (!VarGet(VAR_REPEL_STEP_COUNT))
+    {
         return TRUE;
+    }
     else
     {
         for (i = 0; i < 6; i++)
@@ -3542,7 +3545,9 @@ static bool8 RepelCheck(u8 level)
             // UB: Too few arguments for function 'GetMonData'
             if (GetMonData(&gPlayerParty[i], MON_DATA_HP) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
             {
-                if (level < (u8)GetMonData(&gPlayerParty[i], MON_DATA_LEVEL))
+                u8 ourLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+
+                if (wildLevel < ourLevel)
                     return FALSE;
                 else
                     return TRUE;
diff --git a/sym_bss.txt b/sym_bss.txt
index b1080604f..aa16612ed 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -8,7 +8,7 @@
     .include "src/trade.o"
 	.include "src/berry_blender.o"
 	.include "src/play_time.o"
-	.include "src/rom4.o"
+	.include "src/overworld.o"
 	.include "src/field_camera.o"
 	.include "src/field_map_obj.o"
 	.include "src/field_message_box.o"
@@ -27,7 +27,7 @@
     .include "src/battle_anim_80CA710.o"
     .include "src/easy_chat.o"
     .include "src/pokenav.o"
-    .include "src/mauville_old_man.o"
+	.include "src/mauville_man.o"
 	.include "src/menu_helpers.o"
 	.include "src/contest_painting.o"
 	.include "src/pokeblock.o"
diff --git a/sym_common.txt b/sym_common.txt
index 5a535ae87..d9da3ec3b 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -118,7 +118,7 @@ gUnknown_03004828: @ 3004828
 	.space 0x8
 
 	.include "berry_blender.o"
-	.include "rom4.o"
+	.include "overworld.o"
 	.include "fieldmap.o"
 	.include "field_camera.o"
 	.include "field_map_obj.o"
@@ -160,14 +160,7 @@ gUnknown_03005560: @ 3005560
 gUnknown_030056A0: @ 30056A0
 	.space 0x640
 
-@ pokemon_menu
-
-gLastFieldPokeMenuOpened: @ 3005CE0
-	.space 0x4
-
-gUnknown_03005CE4: @ 3005CE4
-	.space 0x4
-
+    .include "pokemon_menu.o"
 	.include "pokedex.o"
 
 @ pokemon_summary_screen
@@ -244,12 +237,7 @@ gUnknown_03005E0C: @ 3005E0C
 	.space 0x4
 
 	.include "contest_painting.o"
-
-@ evolution_scene
-
-	.align 2
-gUnknown_03005E94: @ 3005E94
-	.space 0x4
+    .include "evolution_scene.o"
 
 @ pokedex_cry_screen
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ac6b8b728..040173cfd 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -287,7 +287,7 @@ gPID_perBank: @ 2024E70
 gBattleMovePower: @ 2024E80
 	.space 0x2
 
-word_2024E82: @ 2024E82
+gMoveToLearn: @ 2024E82
 	.space 0x2
 
 gBattleMonForms: @ 2024E84
@@ -310,7 +310,7 @@ gUnknown_020297D8: @ 20297D8
 
 	.include "src/berry_blender.o"
 	.include "src/new_game.o"
-	.include "src/rom4.o"
+	.include "src/overworld.o"
 	.include "src/fieldmap.o"
 	.include "src/field_camera.o"
 	.include "src/field_player_avatar.o"
@@ -374,17 +374,8 @@ gUnknown_0202FF58: @ 202FF58
 gUnknown_0202FFA4: @ 202FFA4
 	.space 0x4
 
-@ pokemon_menu
-
-gUnknown_0202FFA8: @ 202FFA8
-	.space 0x1
-
-gUnknown_0202FFA9: @ 202FFA9
-	.space 0x1
-
-gUnknown_0202FFAA: @ 202FFAA
-	.space 0xA
 
+	.include "src/pokemon_menu.o"
 	.include "src/pokedex.o"
 	.include "src/trainer_card.o"
 	.include "src/pokemon_storage_system.o"
@@ -554,13 +545,7 @@ gUnknown_020388B4: @ 20388B4
 	.space 0x4
 
 	.include "src/mon_markings.o"
-
-@ mauville_old_man
-
-	.align 2
-gUnknown_020388BC: @ 20388BC
-	.space 0x4
-
+	.include "src/mauville_man.o"
 	.include "src/menu_helpers.o"
 	.include "src/region_map.o"
 	.include "src/decoration.o"