Merge branch 'master' into battle

asm/battle_message.s

@@ -1802,7 +1802,7 @@ _080D8120:
 	cmp r1, 0
 	beq _080D8134
 	mov r0, sp
-	bl sub_80E7460
+	bl CopyEReaderTrainerName5
 	mov r4, sp
 	b _080D8382
 _080D8134:

asm/battle_tower.s

@@ -358,8 +358,8 @@ _080E5C20: .4byte gSaveBlock2Ptr
 _080E5C24: .4byte 0x0000056c
 	thumb_func_end sub_80E5B14
 
-	thumb_func_start sub_80E5C28
+	thumb_func_start ChooseNextBattleTowerTrainer
-sub_80E5C28: @ 80E5C28
+ChooseNextBattleTowerTrainer: @ 80E5C28
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -637,7 +637,7 @@ _080E5E4C: .4byte 0x00000572
 _080E5E50: .4byte gSaveBlock2Ptr
 _080E5E54: .4byte 0x0000056c
 _080E5E58: .4byte 0x00000571
-	thumb_func_end sub_80E5C28
+	thumb_func_end ChooseNextBattleTowerTrainer
 
 	thumb_func_start sub_80E5E5C
 sub_80E5E5C: @ 80E5E5C
@@ -651,14 +651,14 @@ sub_80E5E5C: @ 80E5E5C
 _080E5E6C: .4byte 0x00004010
 	thumb_func_end sub_80E5E5C
 
-	thumb_func_start sub_80E5E70
+	thumb_func_start SetEReaderTrainerGfxId
-sub_80E5E70: @ 80E5E70
+SetEReaderTrainerGfxId: @ 80E5E70
 	push {lr}
 	movs r0, 0xC8
 	bl sub_80E5E5C
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80E5E70
+	thumb_func_end SetEReaderTrainerGfxId
 
 	thumb_func_start sub_80E5E7C
 sub_80E5E7C: @ 80E5E7C
@@ -1700,8 +1700,8 @@ _080E6640: .4byte gUnknown_84020C4
 _080E6644: .4byte 0x0000ffff
 	thumb_func_end sub_80E6564
 
-	thumb_func_start sub_80E6648
+	thumb_func_start CheckPartyBattleTowerBanlist
-sub_80E6648: @ 80E6648
+CheckPartyBattleTowerBanlist: @ 80E6648
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1854,7 +1854,7 @@ _080E6770:
 _080E6780: .4byte gSpecialVar_0x8004
 _080E6784: .4byte gSaveBlock2Ptr
 _080E6788: .4byte 0x0000055c
-	thumb_func_end sub_80E6648
+	thumb_func_end CheckPartyBattleTowerBanlist
 
 	thumb_func_start sub_80E678C
 sub_80E678C: @ 80E678C
@@ -1918,8 +1918,8 @@ _080E67F0:
 _080E67F8: .4byte gStringVar4
 	thumb_func_end sub_80E678C
 
-	thumb_func_start sub_80E67FC
+	thumb_func_start PrintBattleTowerTrainerGreeting
-sub_80E67FC: @ 80E67FC
+PrintBattleTowerTrainerGreeting: @ 80E67FC
 	push {lr}
 	ldr r0, _080E6818 @ =gSaveBlock2Ptr
 	ldr r2, [r0]
@@ -1962,7 +1962,7 @@ _080E684C:
 	bx r0
 	.align 2, 0
 _080E6850: .4byte 0xffffc154
-	thumb_func_end sub_80E67FC
+	thumb_func_end PrintBattleTowerTrainerGreeting
 
 	thumb_func_start sub_80E6854
 sub_80E6854: @ 80E6854
@@ -2048,8 +2048,8 @@ _080E68F8: .4byte sub_80E6854
 _080E68FC: .4byte CB2_InitBattle
 	thumb_func_end sub_80E68C4
 
-	thumb_func_start sub_80E6900
+	thumb_func_start StartSpecialBattle
-sub_80E6900: @ 80E6900
+StartSpecialBattle: @ 80E6900
 	push {r4-r6,lr}
 	sub sp, 0x4
 	ldr r0, _080E691C @ =gUnknown_203AAB8
@@ -2168,10 +2168,10 @@ _080E69FC: .4byte gBattleTypeFlags
 _080E6A00: .4byte 0x00000808
 _080E6A04: .4byte gTrainerBattleOpponent_A
 _080E6A08: .4byte sub_80E68C4
-	thumb_func_end sub_80E6900
+	thumb_func_end StartSpecialBattle
 
-	thumb_func_start sub_80E6A0C
+	thumb_func_start SetBattleTowerProperty
-sub_80E6A0C: @ 80E6A0C
+SetBattleTowerProperty: @ 80E6A0C
 	push {r4-r6,lr}
 	ldr r1, _080E6A34 @ =gSaveBlock2Ptr
 	ldr r0, [r1]
@@ -2469,10 +2469,10 @@ _080E6C80:
 	bx r0
 	.align 2, 0
 _080E6C88: .4byte 0x0000055c
-	thumb_func_end sub_80E6A0C
+	thumb_func_end SetBattleTowerProperty
 
-	thumb_func_start sub_80E6C8C
+	thumb_func_start BattleTowerUtil
-sub_80E6C8C: @ 80E6C8C
+BattleTowerUtil: @ 80E6C8C
 	push {r4,lr}
 	ldr r1, _080E6CB4 @ =gSaveBlock2Ptr
 	ldr r0, [r1]
@@ -2652,10 +2652,10 @@ _080E6E08:
 	bx r0
 	.align 2, 0
 _080E6E10: .4byte 0x0000055c
-	thumb_func_end sub_80E6C8C
+	thumb_func_end BattleTowerUtil
 
-	thumb_func_start sub_80E6E14
+	thumb_func_start SetBattleTowerParty
-sub_80E6E14: @ 80E6E14
+SetBattleTowerParty: @ 80E6E14
 	push {r4,r5,lr}
 	movs r2, 0
 	ldr r5, _080E6E3C @ =gUnknown_203B0D4
@@ -2671,7 +2671,7 @@ _080E6E1E:
 	adds r2, 0x1
 	cmp r2, 0x2
 	ble _080E6E1E
-	bl sub_80A03D8
+	bl ReducePlayerPartyToThree
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -2679,7 +2679,7 @@ _080E6E1E:
 _080E6E3C: .4byte gUnknown_203B0D4
 _080E6E40: .4byte gSaveBlock2Ptr
 _080E6E44: .4byte 0x0000056d
-	thumb_func_end sub_80E6E14
+	thumb_func_end SetBattleTowerParty
 
 	thumb_func_start sub_80E6E48
 sub_80E6E48: @ 80E6E48
@@ -2858,8 +2858,8 @@ _080E6FB0: .4byte 0x0000056d
 _080E6FB4: .4byte gUnknown_2024220
 	thumb_func_end sub_80E6EE0
 
-	thumb_func_start sub_80E6FB8
+	thumb_func_start SaveBattleTowerProgress
-sub_80E6FB8: @ 80E6FB8
+SaveBattleTowerProgress: @ 80E6FB8
 	push {r4,r5,lr}
 	ldr r0, _080E703C @ =gSaveBlock2Ptr
 	ldr r1, [r0]
@@ -2933,15 +2933,15 @@ _080E7048: .4byte 0x00000564
 _080E704C: .4byte gBattleOutcome
 _080E7050: .4byte 0x0000055d
 _080E7054: .4byte 0x0000055e
-	thumb_func_end sub_80E6FB8
+	thumb_func_end SaveBattleTowerProgress
 
-	thumb_func_start sub_80E7058
+	thumb_func_start BattleTower_SoftReset
-sub_80E7058: @ 80E7058
+BattleTower_SoftReset: @ 80E7058
 	push {lr}
 	bl DoSoftReset
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80E7058
+	thumb_func_end BattleTower_SoftReset
 
 	thumb_func_start sub_80E7064
 sub_80E7064: @ 80E7064
@@ -3142,8 +3142,8 @@ _080E71C8: .4byte 0x0000ffff
 _080E71CC: .4byte 0x0000270f
 	thumb_func_end sub_80E7188
 
-	thumb_func_start sub_80E71D0
+	thumb_func_start DetermineBattleTowerPrize
-sub_80E71D0: @ 80E71D0
+DetermineBattleTowerPrize: @ 80E71D0
 	push {r4,r5,lr}
 	ldr r4, _080E7214 @ =gSaveBlock2Ptr
 	ldr r1, [r4]
@@ -3201,10 +3201,10 @@ _080E7240:
 	bx r0
 	.align 2, 0
 _080E7248: .4byte gUnknown_84020DA
-	thumb_func_end sub_80E71D0
+	thumb_func_end DetermineBattleTowerPrize
 
-	thumb_func_start sub_80E724C
+	thumb_func_start GiveBattleTowerPrize
-sub_80E724C: @ 80E724C
+GiveBattleTowerPrize: @ 80E724C
 	push {r4-r6,lr}
 	ldr r5, _080E7288 @ =gSaveBlock2Ptr
 	ldr r1, [r5]
@@ -3255,10 +3255,10 @@ _080E72AA:
 	.align 2, 0
 _080E72B0: .4byte gSpecialVar_Result
 _080E72B4: .4byte 0x0000055e
-	thumb_func_end sub_80E724C
+	thumb_func_end GiveBattleTowerPrize
 
-	thumb_func_start sub_80E72B8
+	thumb_func_start AwardBattleTowerRibbons
-sub_80E72B8: @ 80E72B8
+AwardBattleTowerRibbons: @ 80E72B8
 	push {r4-r7,lr}
 	ldr r0, _080E7334 @ =gSaveBlock2Ptr
 	ldr r0, [r0]
@@ -3328,7 +3328,7 @@ _080E7338: .4byte 0x0000055c
 _080E733C: .4byte gSpecialVar_Result
 _080E7340: .4byte 0x0000056d
 _080E7344: .4byte gPlayerParty
-	thumb_func_end sub_80E72B8
+	thumb_func_end AwardBattleTowerRibbons
 
 	thumb_func_start sub_80E7348
 sub_80E7348: @ 80E7348
@@ -3469,8 +3469,8 @@ _080E7458: .4byte gSaveBlock2Ptr
 _080E745C: .4byte 0x000004a1
 	thumb_func_end GetEreaderTrainerClassId
 
-	thumb_func_start sub_80E7460
+	thumb_func_start CopyEReaderTrainerName5
-sub_80E7460: @ 80E7460
+CopyEReaderTrainerName5: @ 80E7460
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -3495,7 +3495,7 @@ _080E746E:
 	.align 2, 0
 _080E7488: .4byte gSaveBlock2Ptr
 _080E748C: .4byte 0x000004a4
-	thumb_func_end sub_80E7460
+	thumb_func_end CopyEReaderTrainerName5
 
 	thumb_func_start ValidateEReaderTrainer
 ValidateEReaderTrainer: @ 80E7490
@@ -3594,8 +3594,8 @@ _080E752A:
 	bx r0
 	thumb_func_end sub_80E7524
 
-	thumb_func_start sub_80E7538
+	thumb_func_start PrintEReaderTrainerGreeting
-sub_80E7538: @ 80E7538
+PrintEReaderTrainerGreeting: @ 80E7538
 	push {lr}
 	ldr r0, _080E754C @ =gSaveBlock2Ptr
 	ldr r0, [r0]
@@ -3607,7 +3607,7 @@ sub_80E7538: @ 80E7538
 	bx r0
 	.align 2, 0
 _080E754C: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_80E7538
+	thumb_func_end PrintEReaderTrainerGreeting
 
 	thumb_func_start sub_80E7550
 sub_80E7550: @ 80E7550
@@ -3649,8 +3649,8 @@ _080E7594: .4byte gSaveBlock2Ptr
 _080E7598: .4byte 0x000004bc
 	thumb_func_end sub_80E7550
 
-	thumb_func_start sub_80E759C
+	thumb_func_start Dummy_TryEnableBravoTrainerBattleTower
-sub_80E759C: @ 80E759C
+Dummy_TryEnableBravoTrainerBattleTower: @ 80E759C
 	push {lr}
 	movs r0, 0x1
 _080E75A0:
@@ -3659,6 +3659,6 @@ _080E75A0:
 	bge _080E75A0
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80E759C
+	thumb_func_end Dummy_TryEnableBravoTrainerBattleTower
 
 	.align 2, 0 @ Don't pad with nop.

asm/cable_club.s

@@ -1625,7 +1625,7 @@ _08081404:
 	.align 2, 0
 _0808140C: .4byte gBattleTypeFlags
 _08081410:
-	bl sub_80A03D8
+	bl ReducePlayerPartyToThree
 	ldr r1, _08081440 @ =gBattleTypeFlags
 	movs r0, 0x4B
 _08081418:
@@ -1848,7 +1848,7 @@ _080815D4:
 	.align 2, 0
 _080815DC: .4byte gBattleTypeFlags
 _080815E0:
-	bl sub_80A03D8
+	bl ReducePlayerPartyToThree
 	ldr r1, _08081610 @ =gBattleTypeFlags
 	movs r0, 0x4B
 _080815E8:

asm/easy_chat.s

@@ -576,8 +576,8 @@ _080BDB14: .4byte 0x00002cc4
 _080BDB18: .4byte gStringVar4
 	thumb_func_end sub_80BDA7C
 
-	thumb_func_start sub_80BDB1C
+	thumb_func_start BufferRandomHobbyOrLifestyleString
-sub_80BDB1C: @ 80BDB1C
+BufferRandomHobbyOrLifestyleString: @ 80BDB1C
 	push {lr}
 	bl Random
 	movs r1, 0x1
@@ -597,7 +597,7 @@ _080BDB2E:
 	bx r0
 	.align 2, 0
 _080BDB44: .4byte gStringVar2
-	thumb_func_end sub_80BDB1C
+	thumb_func_end BufferRandomHobbyOrLifestyleString
 
 	thumb_func_start sub_80BDB48
 sub_80BDB48: @ 80BDB48

asm/field_control_avatar.s

@@ -366,9 +366,9 @@ sub_806CAC8: @ 806CAC8
 	bl IncrementGameStat
 	bl MENewsJisanStepCounter
 	bl IncrementRenewableHiddenItemStepCounter
-	bl sub_80CC918
+	bl RunMassageCooldownStepCounter
-	bl sub_80CB054
+	bl IncrementResortGorgeousStepCounter
-	bl sub_80CCFBC
+	bl BirthIslandDeoxysStepCounter
 	mov r0, sp
 	adds r1, r4, 0
 	adds r2, r6, 0

asm/fldeff_cut.s

@@ -33,7 +33,7 @@ sub_8097898: @ 8097898
 	ldr r4, _080978CC @ =gUnknown_2039874
 	movs r0, 0
 	strb r0, [r4]
-	bl sub_80CCD84
+	bl CutMoveRuinValleyCheck
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -232,7 +232,7 @@ sub_8097A20: @ 8097A20
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08097A3C
-	bl sub_80CCDD0
+	bl CutMoveOpenDottedHoleDoor
 	b _08097A42
 	.align 2, 0
 _08097A38: .4byte gUnknown_2039874

asm/learn_move.s

@@ -15,8 +15,8 @@ sub_80E4620: @ 80E4620
 	bx r0
 	thumb_func_end sub_80E4620
 
-	thumb_func_start sub_80E4634
+	thumb_func_start DisplayMoveTutorMenu
-sub_80E4634: @ 80E4634
+DisplayMoveTutorMenu: @ 80E4634
 	push {lr}
 	sub sp, 0x4
 	bl ScriptContext2_Enable
@@ -35,7 +35,7 @@ sub_80E4634: @ 80E4634
 	bx r0
 	.align 2, 0
 _080E465C: .4byte sub_80E4660
-	thumb_func_end sub_80E4634
+	thumb_func_end DisplayMoveTutorMenu
 
 	thumb_func_start sub_80E4660
 sub_80E4660: @ 80E4660
@@ -1653,7 +1653,7 @@ _080E53F4:
 	movs r2, 0x2
 	movs r3, 0x2
 	bl sub_80E559C
-	ldr r1, _080E5440 @ =gUnknown_84886E8
+	ldr r1, _080E5440 @ =gMoveDescriptionPointers
 	subs r0, r5, 0x1
 	lsls r0, 2
 	adds r0, r1
@@ -1670,7 +1670,7 @@ _080E53F4:
 	bx r0
 	.align 2, 0
 _080E543C: .4byte gBattleMoves
-_080E5440: .4byte gUnknown_84886E8
+_080E5440: .4byte gMoveDescriptionPointers
 	thumb_func_end sub_80E5340
 
 	thumb_func_start sub_80E5444

asm/pokemon_size_record.s

@@ -323,8 +323,8 @@ sub_80A0904: @ 80A0904
 _080A0914: .4byte 0x0000403d
 	thumb_func_end sub_80A0904
 
-	thumb_func_start sub_80A0918
+	thumb_func_start GetHeracrossSizeRecordInfo
-sub_80A0918: @ 80A0918
+GetHeracrossSizeRecordInfo: @ 80A0918
 	push {lr}
 	ldr r0, _080A092C @ =0x0000403d
 	bl GetVarPointer
@@ -335,10 +335,10 @@ sub_80A0918: @ 80A0918
 	bx r0
 	.align 2, 0
 _080A092C: .4byte 0x0000403d
-	thumb_func_end sub_80A0918
+	thumb_func_end GetHeracrossSizeRecordInfo
 
-	thumb_func_start sub_80A0930
+	thumb_func_start CompareHeracrossSize
-sub_80A0930: @ 80A0930
+CompareHeracrossSize: @ 80A0930
 	push {r4,lr}
 	ldr r0, _080A0950 @ =0x0000403d
 	bl GetVarPointer
@@ -355,7 +355,7 @@ sub_80A0930: @ 80A0930
 	.align 2, 0
 _080A0950: .4byte 0x0000403d
 _080A0954: .4byte gSpecialVar_Result
-	thumb_func_end sub_80A0930
+	thumb_func_end CompareHeracrossSize
 
 	thumb_func_start sub_80A0958
 sub_80A0958: @ 80A0958
@@ -369,8 +369,8 @@ sub_80A0958: @ 80A0958
 _080A0968: .4byte 0x00004040
 	thumb_func_end sub_80A0958
 
-	thumb_func_start sub_80A096C
+	thumb_func_start GetMagikarpSizeRecordInfo
-sub_80A096C: @ 80A096C
+GetMagikarpSizeRecordInfo: @ 80A096C
 	push {lr}
 	ldr r0, _080A0980 @ =0x00004040
 	bl GetVarPointer
@@ -381,10 +381,10 @@ sub_80A096C: @ 80A096C
 	bx r0
 	.align 2, 0
 _080A0980: .4byte 0x00004040
-	thumb_func_end sub_80A096C
+	thumb_func_end GetMagikarpSizeRecordInfo
 
-	thumb_func_start sub_80A0984
+	thumb_func_start CompareMagikarpSize
-sub_80A0984: @ 80A0984
+CompareMagikarpSize: @ 80A0984
 	push {r4,lr}
 	ldr r0, _080A09A4 @ =0x00004040
 	bl GetVarPointer
@@ -401,7 +401,7 @@ sub_80A0984: @ 80A0984
 	.align 2, 0
 _080A09A4: .4byte 0x00004040
 _080A09A8: .4byte gSpecialVar_Result
-	thumb_func_end sub_80A0984
+	thumb_func_end CompareMagikarpSize
 
 	thumb_func_start GiveGiftRibbonToParty
 GiveGiftRibbonToParty: @ 80A09AC

asm/pokemon_storage_system.s

@@ -1751,8 +1751,8 @@ _0808C69C:
 _0808C6A4: .4byte gPaletteFade
 	thumb_func_end c3_0808C39C
 
-	thumb_func_start sub_808C6A8
+	thumb_func_start ShowPokemonStorageSystem
-sub_808C6A8: @ 808C6A8
+ShowPokemonStorageSystem: @ 808C6A8
 	push {lr}
 	ldr r0, _0808C6D0 @ =c3_0808C39C
 	movs r1, 0x50
@@ -1773,7 +1773,7 @@ sub_808C6A8: @ 808C6A8
 	.align 2, 0
 _0808C6D0: .4byte c3_0808C39C
 _0808C6D4: .4byte gTasks
-	thumb_func_end sub_808C6A8
+	thumb_func_end ShowPokemonStorageSystem
 
 	thumb_func_start mapldr_0808C6D8
 mapldr_0808C6D8: @ 808C6D8

asm/pokemon_summary_screen.s

@@ -6470,7 +6470,7 @@ _08137B1C:
 	str r1, [sp, 0x4]
 	str r6, [sp, 0x8]
 	str r5, [sp, 0xC]
-	ldr r3, _08137BC8 @ =gUnknown_84886E8
+	ldr r3, _08137BC8 @ =gMoveDescriptionPointers
 	mov r4, r8
 	ldrb r1, [r4]
 	lsls r1, 1
@@ -6502,7 +6502,7 @@ _08137BB8: .4byte 0x00003004
 _08137BBC: .4byte gUnknown_8463FA4
 _08137BC0: .4byte 0x0000316c
 _08137BC4: .4byte 0x00003188
-_08137BC8: .4byte gUnknown_84886E8
+_08137BC8: .4byte gMoveDescriptionPointers
 _08137BCC: .4byte 0x00003258
 	thumb_func_end sub_8137AF8
 
@@ -7652,7 +7652,7 @@ _081384C4: .4byte gEnemyParty
 _081384C8: .4byte gLinkPlayers
 _081384CC: .4byte 0x0000304c
 _081384D0:
-	bl sub_80CC1E4
+	bl GetPlayerTrainerId
 	adds r4, r0, 0
 	ldr r0, _0813851C @ =0x0000ffff
 	ands r4, r0

asm/post_battle_event_funcs.s

@@ -106,8 +106,8 @@ _080CA3BC: .4byte 0x0000083b
 _080CA3C0: .4byte CB2_DoHallOfFameScreen
 	thumb_func_end Special_HallOfFame
 
-	thumb_func_start sub_80CA3C4
+	thumb_func_start sp0C8_whiteout_maybe
-sub_80CA3C4: @ 80CA3C4
+sp0C8_whiteout_maybe: @ 80CA3C4
 	push {lr}
 	ldr r0, _080CA3D4 @ =CB2_WhiteOut
 	bl SetMainCallback2
@@ -116,6 +116,6 @@ sub_80CA3C4: @ 80CA3C4
 	bx r1
 	.align 2, 0
 _080CA3D4: .4byte CB2_WhiteOut
-	thumb_func_end sub_80CA3C4
+	thumb_func_end sp0C8_whiteout_maybe
 
 	.align 2, 0 @ Don't pad with nop.

asm/script_pokemon_util_80A0058.s

@@ -420,8 +420,8 @@ _080A0378: .4byte gSpecialVar_Result
 _080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80A0350
 
-	thumb_func_start sub_80A0380
+	thumb_func_start ChooseBattleTowerPlayerParty
-sub_80A0380: @ 80A0380
+ChooseBattleTowerPlayerParty: @ 80A0380
 	push {lr}
 	ldr r1, _080A0394 @ =gMain
 	ldr r0, _080A0398 @ =sub_80A039C
@@ -433,7 +433,7 @@ sub_80A0380: @ 80A0380
 	.align 2, 0
 _080A0394: .4byte gMain
 _080A0398: .4byte sub_80A039C
-	thumb_func_end sub_80A0380
+	thumb_func_end ChooseBattleTowerPlayerParty
 
 	thumb_func_start sub_80A039C
 sub_80A039C: @ 80A039C
@@ -450,7 +450,7 @@ sub_80A039C: @ 80A039C
 _080A03B0: .4byte gUnknown_203B0D4
 _080A03B4: .4byte gSpecialVar_Result
 _080A03B8:
-	bl sub_80A03D8
+	bl ReducePlayerPartyToThree
 	ldr r1, _080A03D0 @ =gSpecialVar_Result
 	movs r0, 0x1
 	strh r0, [r1]
@@ -465,8 +465,8 @@ _080A03D0: .4byte gSpecialVar_Result
 _080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80A039C
 
-	thumb_func_start sub_80A03D8
+	thumb_func_start ReducePlayerPartyToThree
-sub_80A03D8: @ 80A03D8
+ReducePlayerPartyToThree: @ 80A03D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -530,6 +530,6 @@ _080A042C:
 _080A0454: .4byte gPlayerParty
 _080A0458: .4byte gUnknown_203B0D4
 _080A045C: .4byte 0x05000096
-	thumb_func_end sub_80A03D8
+	thumb_func_end ReducePlayerPartyToThree
 
 	.align 2, 0 @ Don't pad with nop.

asm/script_pokemon_util_80BF8FC.s

@@ -36,8 +36,8 @@ _080BF934: .4byte sub_80BF97C
 _080BF938: .4byte gTasks
 	thumb_func_end Special_ChooseMonFromParty
 
-	thumb_func_start sub_80BF93C
+	thumb_func_start SelectMoveTutorMon
-sub_80BF93C: @ 80BF93C
+SelectMoveTutorMon: @ 80BF93C
 	push {lr}
 	sub sp, 0x4
 	bl ScriptContext2_Enable
@@ -65,7 +65,7 @@ sub_80BF93C: @ 80BF93C
 	.align 2, 0
 _080BF974: .4byte sub_80BF97C
 _080BF978: .4byte gTasks
-	thumb_func_end sub_80BF93C
+	thumb_func_end SelectMoveTutorMon
 
 	thumb_func_start sub_80BF97C
 sub_80BF97C: @ 80BF97C
@@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade
 _080BF9B8: .4byte gTasks
 	thumb_func_end sub_80BF97C
 
-	thumb_func_start Special_ChooseMoveToDelete
+	thumb_func_start SelectMove
-Special_ChooseMoveToDelete: @ 80BF9BC
+SelectMove: @ 80BF9BC
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r0, _080BF9F0 @ =gPlayerParty
@@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount
 _080BF9FC: .4byte CB2_ReturnToField
 _080BFA00: .4byte gFieldCallback
 _080BFA04: .4byte FieldCallback_ReturnToEventScript2
-	thumb_func_end Special_ChooseMoveToDelete
+	thumb_func_end SelectMove
 
 	thumb_func_start ScrSpecial_CountPokemonMoves
 ScrSpecial_CountPokemonMoves: @ 80BFA08
@@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8
 _080BFBA4: .4byte gPPUpGetMask
 	thumb_func_end sub_80BFAA8
 
-	thumb_func_start Special_DeleteSelectedMove
+	thumb_func_start DeleteMonMove
-Special_DeleteSelectedMove: @ 80BFBA8
+DeleteMonMove: @ 80BFBA8
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -385,10 +385,10 @@ _080BFBFC:
 _080BFC08: .4byte gSpecialVar_0x8004
 _080BFC0C: .4byte gPlayerParty
 _080BFC10: .4byte gSpecialVar_0x8005
-	thumb_func_end Special_DeleteSelectedMove
+	thumb_func_end DeleteMonMove
 
-	thumb_func_start sub_80BFC14
+	thumb_func_start IsSelectedMonEgg
-sub_80BFC14: @ 80BFC14
+IsSelectedMonEgg: @ 80BFC14
 	push {lr}
 	ldr r0, _080BFC38 @ =gSpecialVar_0x8004
 	ldrh r1, [r0]
@@ -417,6 +417,6 @@ _080BFC48:
 	bx r0
 	.align 2, 0
 _080BFC4C: .4byte gSpecialVar_Result
-	thumb_func_end sub_80BFC14
+	thumb_func_end IsSelectedMonEgg
 
 	.align 2, 0 @ Don't pad with nop.

asm/trade.s

@@ -13779,8 +13779,8 @@ _08053A94: .4byte gUnknown_826D1E4
 _08053A98: .4byte SpriteCallbackDummy
 	thumb_func_end sub_8053A0C
 
-	thumb_func_start sub_8053A9C
+	thumb_func_start GetInGameTradeSpeciesInfo
-sub_8053A9C: @ 8053A9C
+GetInGameTradeSpeciesInfo: @ 8053A9C
 	push {r4-r6,lr}
 	ldr r0, _08053AD0 @ =gSpecialVar_0x8004
 	ldrh r0, [r0]
@@ -13811,7 +13811,7 @@ _08053AD4: .4byte gUnknown_826CF8C
 _08053AD8: .4byte gStringVar1
 _08053ADC: .4byte gSpeciesNames
 _08053AE0: .4byte gStringVar2
-	thumb_func_end sub_8053A9C
+	thumb_func_end GetInGameTradeSpeciesInfo
 
 	thumb_func_start sub_8053AE4
 sub_8053AE4: @ 8053AE4
@@ -14078,8 +14078,8 @@ _08053CEE:
 _08053D28: .4byte gUnknown_826D1A8
 	thumb_func_end sub_8053CD4
 
-	thumb_func_start sub_8053D2C
+	thumb_func_start GetTradeSpecies
-sub_8053D2C: @ 8053D2C
+GetTradeSpecies: @ 8053D2C
 	push {r4-r6,lr}
 	ldr r6, _08053D58 @ =gSpecialVar_0x8005
 	ldrh r0, [r6]
@@ -14108,10 +14108,10 @@ _08053D62:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8053D2C
+	thumb_func_end GetTradeSpecies
 
-	thumb_func_start sub_8053D68
+	thumb_func_start CreateInGameTradePokemon
-sub_8053D68: @ 8053D68
+CreateInGameTradePokemon: @ 8053D68
 	push {lr}
 	ldr r0, _08053D7C @ =gSpecialVar_0x8005
 	ldrb r0, [r0]
@@ -14123,7 +14123,7 @@ sub_8053D68: @ 8053D68
 	.align 2, 0
 _08053D7C: .4byte gSpecialVar_0x8005
 _08053D80: .4byte gSpecialVar_0x8004
-	thumb_func_end sub_8053D68
+	thumb_func_end CreateInGameTradePokemon
 
 	thumb_func_start sub_8053D84
 sub_8053D84: @ 8053D84
@@ -14839,8 +14839,8 @@ _08054438: .4byte gWirelessCommType
 _0805443C: .4byte gMain
 	thumb_func_end sub_80543C4
 
-	thumb_func_start sub_8054440
+	thumb_func_start DoInGameTradeScene
-sub_8054440: @ 8054440
+DoInGameTradeScene: @ 8054440
 	push {lr}
 	sub sp, 0x4
 	bl ScriptContext2_Enable
@@ -14860,7 +14860,7 @@ sub_8054440: @ 8054440
 	bx r0
 	.align 2, 0
 _0805446C: .4byte sub_8054470
-	thumb_func_end sub_8054440
+	thumb_func_end DoInGameTradeScene
 
 	thumb_func_start sub_8054470
 sub_8054470: @ 8054470

common_syms/field_specials.txt

@@ -0,0 +1,2 @@
+sFieldSpecialsListMenuTemplate
+sFieldSpecialsListMenuScrollBuffer

data/data_835B488.s

@@ -785,7 +785,7 @@ gUnknown_83E0248:: @ 83E0248
 	.4byte gUnknown_841807D, NULL
 	.4byte gUnknown_841808E, NULL
 	.4byte gUnknown_841809C, NULL
-	.4byte gUnknown_8417929, NULL
+	.4byte gOtherText_Quit, NULL
 
 gUnknown_83E0268:: @ 83E0268
 	.4byte gUnknown_8417DFE, NULL

data/data_83F5738.s

@@ -1,3 +1,7 @@
+#include "constants/species.h"
+#include "constants/items.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 
 	.align 2
@@ -22,89 +26,6 @@ gUnknown_83F5864:: @ 83F5864
 gUnknown_83F5A44:: @ 83F5A44
 	.incbin "baserom.gba", 0x3F5A44, 0xB4
 
-gUnknown_83F5AF8:: @ 83F5AF8
-	.incbin "baserom.gba", 0x3F5AF8, 0x22
-
-gUnknown_83F5B1A:: @ 83F5B1A
-	.incbin "baserom.gba", 0x3F5B1A, 0x16
-
-gUnknown_83F5B30:: @ 83F5B30
-	.incbin "baserom.gba", 0x3F5B30, 0xC
-
-gUnknown_83F5B3C:: @ 83F5B3C
-	.incbin "baserom.gba", 0x3F5B3C, 0x8
-
-gUnknown_83F5B44:: @ 83F5B44
-	.incbin "baserom.gba", 0x3F5B44, 0x50
-
-gUnknown_83F5B94:: @ 83F5B94
-	.incbin "baserom.gba", 0x3F5B94, 0x12
-
-gUnknown_83F5BA6:: @ 83F5BA6
-	.incbin "baserom.gba", 0x3F5BA6, 0x12
-
-gUnknown_83F5BB8:: @ 83F5BB8
-	.incbin "baserom.gba", 0x3F5BB8, 0x9
-
-gUnknown_83F5BC1:: @ 83F5BC1
-	.incbin "baserom.gba", 0x3F5BC1, 0xB
-
-gUnknown_83F5BCC:: @ 83F5BCC
-	.incbin "baserom.gba", 0x3F5BCC, 0x150
-
-gUnknown_83F5D1C:: @ 83F5D1C
-	.incbin "baserom.gba", 0x3F5D1C, 0x10
-
-sStarterMon:: @ 83F5D2C
-	.incbin "baserom.gba", 0x3F5D2C, 0x6
-
-gUnknown_83F5D32:: @ 83F5D32
-	.incbin "baserom.gba", 0x3F5D32, 0x26
-
-gUnknown_83F5D58:: @ 83F5D58
-	.incbin "baserom.gba", 0x3F5D58, 0x198
-
-	.align 2
-gUnknown_83F5EF0:: @ 83F5EF0
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c"
-
-	.align 2
-gUnknown_83F5F24:: @ 83F5F24
-	.asciz "0"
-
-gUnknown_83F5F26:: @ 83F5F26
-	.incbin "baserom.gba", 0x3F5F26, 0x2A
-
-gUnknown_83F5F50:: @ 83F5F50
-	.incbin "baserom.gba", 0x3F5F50, 0x160
-
-gUnknown_83F60B0:: @ 83F60B0
-	.incbin "baserom.gba", 0x3F60B0, 0x20
-
-gUnknown_83F60D0:: @ 83F60D0
-	.incbin "baserom.gba", 0x3F60D0, 0x100
-
-gUnknown_83F61D0:: @ 83F61D0
-	.incbin "baserom.gba", 0x3F61D0, 0x20
-
-gUnknown_83F61F0:: @ 83F61F0
-	.incbin "baserom.gba", 0x3F61F0, 0xB
-
-gUnknown_83F61FB:: @ 83F61FB
-	.incbin "baserom.gba", 0x3F61FB, 0x8
-
-gUnknown_83F6203:: @ 83F6203
-	.incbin "baserom.gba", 0x3F6203, 0x3
-
-gUnknown_83F6206:: @ 83F6206
-	.incbin "baserom.gba", 0x3F6206, 0x160
-
-gUnknown_83F6366:: @ 83F6366
-	.incbin "baserom.gba", 0x3F6366, 0x16
-
-gUnknown_83F637C:: @ 83F637C
-	.incbin "baserom.gba", 0x3F637C, 0xC
-
 	.section .rodata.83F6C90
 gUnknown_83F6C90:: @ 83F6C90
 	.incbin "baserom.gba", 0x3F6C90, 0x20

data/data_8471F00.s

@@ -342,7 +342,7 @@ gUnknown_84827B4:: @ 84827B4
 	.include "data/text/move_descriptions.inc"
 
 	.align 2, 0
-gUnknown_84886E8:: @ 84886E8
+gMoveDescriptionPointers:: @ 84886E8
 	.4byte gMoveDescription_Pound
 	.4byte gMoveDescription_KarateChop
 	.4byte gMoveDescription_DoubleSlap

data/field_specials/unk_83F5F50.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F5F70.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+41 115 205
+82 82 106

data/field_specials/unk_83F5F90.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+41 115 205
+131 238 255
+0 41 156

data/field_specials/unk_83F5FB0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+41 115 205
+131 238 255
+82 172 230
+0 65 189

data/field_specials/unk_83F5FD0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+41 115 205
+131 238 255
+82 172 230
+41 115 205
+41 115 205

data/field_specials/unk_83F5FF0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+131 238 255
+82 172 230
+41 115 205
+0 65 189
+82 172 230

data/field_specials/unk_83F6010.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+131 238 255
+82 172 230
+41 115 205
+0 65 189
+0 41 156
+131 238 255

data/field_specials/unk_83F6030.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+0 65 189
+0 41 156
+82 82 106
+90 180 238

data/field_specials/unk_83F6050.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+0 65 189
+0 41 156
+82 82 106
+82 82 106
+41 115 205

data/field_specials/unk_83F6070.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 65 189
+0 41 156
+82 82 106
+82 82 106
+82 82 106
+0 65 189

data/field_specials/unk_83F6090.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 41 156
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+0 41 156

data/field_specials/unk_83F60B0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+131 238 255
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+172 172 98
+148 148 74
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F60D0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F60F0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 172 230
+41 115 205

data/field_specials/unk_83F6110.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 82 106
+82 82 106
+82 172 230
+41 115 205
+131 238 255
+82 172 230

data/field_specials/unk_83F6130.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+131 238 255
+82 172 230
+82 172 230
+41 115 205

data/field_specials/unk_83F6150.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+131 238 255
+82 172 230
+82 172 230
+41 115 205
+41 115 205
+0 65 189

data/field_specials/unk_83F6170.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+82 172 230
+41 115 205
+41 115 205
+0 65 189
+0 65 189
+82 82 106

data/field_specials/unk_83F6190.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+41 115 205
+0 65 189
+0 65 189
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F61B0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+255 74 0
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+255 255 180
+189 189 115
+0 65 189
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F61D0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 82 106
+123 123 123
+131 238 255
+255 213 131
+230 164 98
+197 115 74
+164 82 65
+172 172 98
+148 148 74
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106
+82 82 106

data/field_specials/unk_83F6206.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 197
+32 32 32
+82 82 82
+139 139 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6226.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 197
+41 32 32
+82 82 82
+139 139 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6246.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 32 32
+90 82 82
+148 148 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6266.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 32 32
+115 82 82
+156 148 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6286.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 32 32
+123 82 82
+164 156 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F62A6.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+98 32 32
+139 82 82
+172 156 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F62C6.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+98 32 32
+148 82 82
+180 164 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F62E6.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+106 32 32
+156 82 82
+189 164 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6306.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+123 32 32
+172 82 82
+197 172 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6326.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+131 32 32
+180 82 82
+205 172 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/field_specials/unk_83F6346.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 197
+205 32 32
+255 82 82
+255 205 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/layouts/layouts.json

@@ -3884,16 +3884,16 @@
       "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+      "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
-      "name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout",
+      "name": "SevenIsland_SevaultCanyon_TanobyKey_Layout",
       "width": 15,
       "height": 16,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_82D4A94",
       "secondary_tileset": "gTileset_82D4E0C",
-      "border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin",
+      "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin"
+      "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
     },
     {
       "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR",

data/maps/BirthIsland_Exterior/scripts.inc

@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
 	.byte 0
 
 BirthIsland_Exterior_MapScript3_165213:: @ 8165213
-	special sub_80CD008
+	special Special_SetDeoxysTriangleObjectPal
 	end
 
 BirthIsland_Exterior_MapScript1_165217:: @ 8165217
@@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
-	special sub_80CCDFC
+	special Special_DeoxysSound
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_1652BA

data/maps/CeladonCity_Condominiums_3F/scripts.inc

@@ -34,7 +34,7 @@ EventScript_16C418:: @ 816C418
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
-	special sub_80CA618
+	special Special_ShowDiploma
 	waitstate
 	release
 	end

data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc

@@ -7,11 +7,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
 	checkflag FLAG_TEMP_2
 	call_if FALSE, EventScript_1A7AB9
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special sub_80CB580
+	special Special_DrawElevatorCurrentFloorWindow
 	message Text_1A535C
 	waitmessage
 	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, sub_80CB328
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, EventScript_16C1B7
 	case 1, EventScript_16C1C3
@@ -109,15 +109,15 @@ EventScript_16C2E6:: @ 816C2E6
 	end
 
 EventScript_16C30E:: @ 816C30E
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 EventScript_16C313:: @ 816C313
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special sub_80CB498
+	special Special_AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -273,7 +273,7 @@ EventScript_16C96C:: @ 816C96C
 	setfieldeffectarg 2, 14
 	dofieldeffect 64
 	waitfieldeffect 64
-	specialvar VAR_RESULT, sub_80CAABC
+	specialvar VAR_RESULT, Special_GetRandomSlotMachine
 	playslotmachine VAR_RESULT
 	releaseall
 	end

data/maps/CeruleanCity_House1/scripts.inc

@@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
 	message Text_191967
 	waitmessage
 	setvar VAR_0x8004, 0
-	special sub_80CB7C4
+	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_16A8FB
@@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0
 EventScript_16A87D:: @ 816A87D
 	message Text_191967
 	waitmessage
-	special sub_80CBC5C
+	special Special_ReturnToListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_16A8FB

data/maps/CeruleanCity_House5/scripts.inc

@@ -40,7 +40,7 @@ EventScript_16AEC8:: @ 816AEC8
 	message Text_1932F4
 	waitmessage
 	setvar VAR_0x8004, 5
-	special sub_80CB7C4
+	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_16AF6C

data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc

@@ -48,7 +48,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	faceplayer
 	setvar VAR_0x8008, 7
 	copyvar VAR_0x8004, VAR_0x8008
-	specialvar VAR_RESULT, sub_8053A9C
+	specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
 	copyvar VAR_0x8009, VAR_RESULT
 	checkflag FLAG_DID_TANGENY_TRADE
 	goto_if TRUE, EventScript_16E3D4
@@ -61,14 +61,14 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	compare_var_to_value VAR_0x8004, 6
 	goto_if ge, EventScript_16E3BC
 	copyvar VAR_0x8005, VAR_0x800A
-	specialvar VAR_RESULT, sub_8053D2C
+	specialvar VAR_RESULT, GetTradeSpecies
 	copyvar VAR_0x800B, VAR_RESULT
 	compare_var_to_var VAR_RESULT, VAR_0x8009
 	goto_if ne, EventScript_16E3C6
 	copyvar VAR_0x8004, VAR_0x8008
 	copyvar VAR_0x8005, VAR_0x800A
-	special sub_8053D68
+	special CreateInGameTradePokemon
-	special sub_8054440
+	special DoInGameTradeScene
 	waitstate
 	msgbox gUnknown_81A5B4A
 	setflag FLAG_DID_TANGENY_TRADE

data/maps/FiveIsland_ResortGorgeous_House/scripts.inc

@@ -10,16 +10,16 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
 	faceplayer
 	checkflag FLAG_TEMP_2
 	goto_if TRUE, EventScript_172043
-	compare_var_to_value VAR_STORAGE_UNKNOWN, 65535
+	compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
 	goto_if eq, EventScript_171F0B
-	compare_var_to_value VAR_STORAGE_UNKNOWN, 0
+	compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
 	goto_if ne, EventScript_171F19
 	msgbox gUnknown_81A42A0
 	goto EventScript_171EFE
 	end
 
 EventScript_171EFE:: @ 8171EFE
-	special sub_80CB0A8
+	special Special_SampleResortGorgeousMonAndReward
 	msgbox gUnknown_81A4315
 	release
 	end
@@ -30,15 +30,15 @@ EventScript_171F0B:: @ 8171F0B
 	end
 
 EventScript_171F19:: @ 8171F19
-	copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN
+	copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
-	specialvar VAR_RESULT, sub_80CC48C
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_171F34
 	goto EventScript_171EFE
 	end
 
 EventScript_171F34:: @ 8171F34
-	special sub_80CB0A8
+	special Special_SampleResortGorgeousMonAndReward
 	msgbox gUnknown_81A43F7
 	addobject 2
 	applymovement 2, Movement_172060
@@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34
 	call_if eq, EventScript_17201A
 	moveobjectoffscreen 2
 	msgbox gUnknown_81A458E
-	giveitem VAR_0x403B
+	giveitem VAR_RESORT_GORGEOUS_REWARD
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_172025
 	setflag FLAG_TEMP_2
-	setvar VAR_STORAGE_UNKNOWN, 0
+	setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
 	release
 	end
 
@@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025
 	textcolor 1
 	msgbox gUnknown_81A461B
 	setflag FLAG_TEMP_2
-	setvar VAR_STORAGE_UNKNOWN, 0
+	setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
 	release
 	end
 

data/maps/FiveIsland_WaterLabyrinth/scripts.inc

@@ -13,7 +13,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
 	checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
 	goto_if TRUE, EventScript_16892C
 	msgbox gUnknown_818A80D
-	specialvar VAR_RESULT, sub_80CA76C
+	specialvar VAR_RESULT, Special_GetLeadMonFriendship
 	compare_var_to_value VAR_RESULT, 6
 	goto_if eq, EventScript_1688AC
 	msgbox gUnknown_818A88F
@@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA
 EventScript_1688E3:: @ 81688E3
 	getspeciesname 1, SPECIES_TOGEPI
 	setvar VAR_0x8004, SPECIES_TOGEPI
-	specialvar VAR_RESULT, sub_80CD0F4
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_168895
 	getspeciesname 1, SPECIES_TOGETIC
 	setvar VAR_0x8004, SPECIES_TOGETIC
-	specialvar VAR_RESULT, sub_80CD0F4
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_168895
 	msgbox gUnknown_818A9C0

data/maps/FourIsland/scripts.inc

@@ -133,7 +133,7 @@ EventScript_167E19:: @ 8167E19
 	special GetDaycareMonNicknames
 	msgbox gUnknown_81BF789
 	special SetDaycareCompatibilityString
-	special sub_80CA68C
+	special Special_ShowStringVar4AsFieldMessage
 	waitmessage
 	waitbuttonpress
 	release

data/maps/FourIsland_PokemonDayCare/scripts.inc

@@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993
 	msgbox gUnknown_81BF860
 	waitmoncry
 	special StoreSelectedPokemonInDaycare
-	incrementgamestat 47
+	incrementgamestat GAME_STAT_USED_DAYCARE
 	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_171A01

data/maps/FuchsiaCity/scripts.inc

@@ -72,7 +72,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07
 FuchsiaCity_EventScript_166E1F:: @ 8166E1F
 	lockall
 	setvar VAR_0x8004, SPECIES_CHANSEY
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_CHANSEY, 10, 3
 	msgbox gUnknown_81807A9
 	erasemonpic
@@ -82,7 +82,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F
 FuchsiaCity_EventScript_166E38:: @ 8166E38
 	lockall
 	setvar VAR_0x8004, SPECIES_VOLTORB
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_VOLTORB, 10, 3
 	msgbox gUnknown_81807D9
 	erasemonpic
@@ -92,7 +92,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38
 FuchsiaCity_EventScript_166E51:: @ 8166E51
 	lockall
 	setvar VAR_0x8004, SPECIES_KANGASKHAN
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_KANGASKHAN, 10, 3
 	msgbox gUnknown_8180806
 	erasemonpic
@@ -102,7 +102,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51
 FuchsiaCity_EventScript_166E6A:: @ 8166E6A
 	lockall
 	setvar VAR_0x8004, SPECIES_SLOWPOKE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_SLOWPOKE, 10, 3
 	msgbox gUnknown_8180859
 	erasemonpic
@@ -112,7 +112,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A
 FuchsiaCity_EventScript_166E83:: @ 8166E83
 	lockall
 	setvar VAR_0x8004, SPECIES_LAPRAS
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_LAPRAS, 10, 3
 	msgbox gUnknown_8180887
 	erasemonpic
@@ -124,7 +124,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
 	checkflag FLAG_GOT_DOME_FOSSIL
 	goto_if TRUE, EventScript_166EBE
 	setvar VAR_0x8004, SPECIES_KABUTO
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_KABUTO, 10, 3
 	msgbox gUnknown_81808FA
 	erasemonpic
@@ -133,7 +133,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
 
 EventScript_166EBE:: @ 8166EBE
 	setvar VAR_0x8004, SPECIES_OMANYTE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_OMANYTE, 10, 3
 	msgbox gUnknown_81808AE
 	erasemonpic

data/maps/FuchsiaCity_House3/scripts.inc

@@ -16,7 +16,7 @@ EventScript_16D8B0:: @ 816D8B0
 	waitstate
 	compare_var_to_value VAR_0x8004, 6
 	goto_if ge, EventScript_16D941
-	special sub_80BFC14
+	special IsSelectedMonEgg
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16D937
 	special ScrSpecial_CountPokemonMoves
@@ -24,7 +24,7 @@ EventScript_16D8B0:: @ 816D8B0
 	goto_if eq, EventScript_16D92A
 	msgbox gUnknown_8199445
 	fadescreen 1
-	special Special_ChooseMoveToDelete
+	special SelectMove
 	fadescreen 0
 	compare_var_to_value VAR_0x8005, 4
 	goto_if eq, EventScript_16D8B0
@@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0
 	end
 
 EventScript_16D919:: @ 816D919
-	special Special_DeleteSelectedMove
+	special DeleteMonMove
 	playfanfare MUS_ME_WASURE
 	waitfanfare
 	msgbox gUnknown_81994B1

data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc

@@ -157,7 +157,7 @@ EventScript_16D462:: @ 816D462
 	countpokemon
 	compare_var_to_value VAR_RESULT, 6
 	goto_if ne, EventScript_1A77A9
-	specialvar VAR_RESULT, sub_80CABD0
+	specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_1A77A9
 	msgbox gUnknown_81BFEAC

data/maps/LavenderTown_House2/scripts.inc

@@ -27,14 +27,14 @@ EventScript_16B2AA:: @ 816B2AA
 	end
 
 EventScript_16B2B4:: @ 816B2B4
-	specialvar VAR_RESULT, sub_80CAD54
+	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
 	compare_var_to_value VAR_RESULT, SPECIES_EGG
 	goto_if eq, EventScript_16B307
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	special TV_CheckMonOTIDEqualsPlayerID
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16B311
-	specialvar VAR_RESULT, sub_80CAD7C
+	specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16B311
@@ -58,7 +58,7 @@ EventScript_16B311:: @ 816B311
 EventScript_16B31B:: @ 816B31B
 	msgbox gUnknown_8193B36
 	call EventScript_1A74EB
-	specialvar VAR_RESULT, sub_80CBFA0
+	specialvar VAR_RESULT, NameRaterWasNicknameChanged
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16B345

data/maps/MtEmber_RubyPath_B5F/scripts.inc

@@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92C5
 	getbraillestringwidth gUnknown_81A92C5
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92D0
 	getbraillestringwidth gUnknown_81A92D0
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92DC
 	getbraillestringwidth gUnknown_81A92DC
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92E6
 	getbraillestringwidth gUnknown_81A92E6
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92F2
 	getbraillestringwidth gUnknown_81A92F2
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A92FE
 	getbraillestringwidth gUnknown_81A92FE
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A930A
 	getbraillestringwidth gUnknown_81A930A
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	braillemessage gUnknown_81A9316
 	waitbuttonpress
 	releaseall

data/maps/NavelRock_Base/scripts.inc

@@ -46,14 +46,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 2
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 30
 	playse SE_T_AME_E
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 2
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 30
 	delay 50
 	waitse

data/maps/NavelRock_Summit/scripts.inc

@@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	special SpawnCameraObject
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 35
-	special sub_80CD1B4
+	special Special_LoopWingFlapSound
 	applymovement 1, Movement_1650E0
 	applymovement 127, Movement_1650CD
 	waitmovement 0
@@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	delay 60
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 35
-	special sub_80CD1B4
+	special Special_LoopWingFlapSound
 	applymovement 127, Movement_1650D1
 	applymovement 1, Movement_1650D7
 	waitmovement 0

data/maps/PalletTown_GarysHouse/scripts.inc

@@ -61,7 +61,7 @@ EventScript_168DB9:: @ 8168DB9
 	faceplayer
 	compare_var_to_value VAR_0x8004, 6
 	goto_if ge, EventScript_168E3C
-	specialvar VAR_RESULT, sub_80CAD54
+	specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
 	compare_var_to_value VAR_RESULT, SPECIES_EGG
 	goto_if eq, EventScript_168E32
 	msgbox gUnknown_818D8CC
@@ -88,7 +88,7 @@ EventScript_168E3C:: @ 8168E3C
 
 EventScript_168E46:: @ 8168E46
 	msgbox gUnknown_818D9A5
-	specialvar VAR_RESULT, sub_80CA76C
+	specialvar VAR_RESULT, Special_GetLeadMonFriendship
 	switch VAR_RESULT
 	case 0, EventScript_168EA6
 	case 1, EventScript_168EB0

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -38,10 +38,10 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
 	setvar VAR_0x8004, 32
 	special Special_SetSomeVariable
 	setvar VAR_0x8004, 1
-	special sub_80CA86C
+	special Special_AnimatePcTurnOn
 	playse SE_PC_ON
 	msgbox gUnknown_81A5420
-	special sub_80EB6AC
+	special BedroomPC
 	waitstate
 	special sub_812B35C
 	releaseall
@@ -50,7 +50,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
-	special sub_80CA9A8
+	special Special_AnimatePcTurnOff
 	special sub_812B35C
 	releaseall
 	end

data/maps/RocketHideout_Elevator/scripts.inc

@@ -9,11 +9,11 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	checkflag FLAG_TEMP_2
 	call_if FALSE, EventScript_1A7AB9
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special sub_80CB580
+	special Special_DrawElevatorCurrentFloorWindow
 	message Text_1A535C
 	waitmessage
 	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, sub_80CB328
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, EventScript_161530
 	case 1, EventScript_16153C
@@ -87,15 +87,15 @@ EventScript_161608:: @ 8161608
 	end
 
 EventScript_161609:: @ 8161609
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 EventScript_16160E:: @ 816160E
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special sub_80CB498
+	special Special_AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/Route12_FishingHouse/scripts.inc

@@ -36,17 +36,17 @@ EventScript_16FF7F:: @ 816FF7F
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_MAGIKARP
-	specialvar VAR_RESULT, sub_80CC48C
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_16FFF5
-	special sub_80A096C
+	special GetMagikarpSizeRecordInfo
 	msgbox gUnknown_819F2DB
 	special Special_ChooseMonFromParty
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare_var_to_value VAR_RESULT, 6
 	goto_if ge, EventScript_16FFFF
-	special sub_80A0984
+	special CompareMagikarpSize
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_170001
 	compare_var_to_value VAR_RESULT, 2
@@ -110,7 +110,7 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067
 	end
 
 EventScript_17007B:: @ 817007B
-	special sub_80A096C
+	special GetMagikarpSizeRecordInfo
 	msgbox gUnknown_819F4CF
 	releaseall
 	end

data/maps/Route15_WestEntrance_2F/scripts.inc

@@ -9,7 +9,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_ARTICUNO
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	releaseall
 	end
 

data/maps/Route16/scripts.inc

@@ -27,7 +27,7 @@ Route16_MapScript3_168113:: @ 8168113
 	.2byte 0
 
 EventScript_16811D:: @ 816811D
-	special sub_80CA630
+	special Special_ForcePlayerOntoBike
 	end
 
 Route16_EventScript_168121:: @ 8168121

data/maps/Route18/scripts.inc

@@ -17,7 +17,7 @@ Route18_MapScript2_168211:: @ 8168211
 	.2byte 0
 
 EventScript_16821B:: @ 816821B
-	special sub_80CA630
+	special Special_ForcePlayerOntoBike
 	end
 
 Route18_EventScript_16821F:: @ 816821F

data/maps/Route25_SeaCottage/scripts.inc

@@ -263,7 +263,7 @@ EventScript_17082B:: @ 817082B
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_EEVEE
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -272,7 +272,7 @@ EventScript_170840:: @ 8170840
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_FLAREON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -281,7 +281,7 @@ EventScript_170855:: @ 8170855
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_JOLTEON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 
@@ -290,7 +290,7 @@ EventScript_17086A:: @ 817086A
 	waitbuttonpress
 	erasemonpic
 	setvar VAR_0x8004, SPECIES_VAPOREON
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	goto EventScript_1707D8
 	end
 

data/maps/SSAnne_2F_Room1/scripts.inc

@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
 	message Text_173CE3
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
-	special sub_80CBDCC
+	special Special_SetSeenMon
 	drawmonpic SPECIES_SNORLAX, 10, 3
 	waitbuttonpress
 	erasemonpic

data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc

@@ -78,37 +78,37 @@ SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144
 	end
 
 EventScript_16F15B:: @ 816F15B
-	special sub_81132CC
+	special UpdateMovedSaffronFanClubMembers
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F207
 	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F213
 	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F21F
 	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F22B
 	setvar VAR_0x8004, 4
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F237
 	setvar VAR_0x8004, 5
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F243
 	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F24F
 	setvar VAR_0x8004, 7
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_16F25B
 	end
@@ -165,13 +165,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
 	lock
 	faceplayer
 	setvar VAR_0x8004, 0
-	special sub_81133A4
+	special BufferStreakTrainerText
 	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if eq, EventScript_16F2EE
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F2C0
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F2E4
 	msgbox gUnknown_819C420
@@ -179,7 +179,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
 	end
 
 EventScript_16F2C0:: @ 816F2C0
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F2DA
 	msgbox gUnknown_819C390
@@ -205,13 +205,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
 	lock
 	faceplayer
 	setvar VAR_0x8004, 3
-	special sub_81133A4
+	special BufferStreakTrainerText
 	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if eq, EventScript_16F365
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F337
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F35B
 	msgbox gUnknown_819CBD3
@@ -219,7 +219,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
 	end
 
 EventScript_16F337:: @ 816F337
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F351
 	msgbox gUnknown_819CB32
@@ -245,13 +245,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
 	lock
 	faceplayer
 	setvar VAR_0x8004, 1
-	special sub_81133A4
+	special BufferStreakTrainerText
 	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if eq, EventScript_16F3DC
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F3AE
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F3D2
 	msgbox gUnknown_819C6BA
@@ -259,7 +259,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
 	end
 
 EventScript_16F3AE:: @ 816F3AE
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F3C8
 	msgbox gUnknown_819C5A9
@@ -285,13 +285,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
 	lock
 	faceplayer
 	setvar VAR_0x8004, 2
-	special sub_81133A4
+	special BufferStreakTrainerText
 	compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if eq, EventScript_16F453
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F425
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F449
 	msgbox gUnknown_819C986
@@ -299,7 +299,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
 	end
 
 EventScript_16F425:: @ 816F425
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F43F
 	msgbox gUnknown_819C81E
@@ -325,11 +325,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
 	lock
 	faceplayer
 	setvar VAR_0x8004, 5
-	special sub_81133A4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F491
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F4B5
 	msgbox gUnknown_819D01F
@@ -337,7 +337,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
 	end
 
 EventScript_16F491:: @ 816F491
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F4AB
 	msgbox gUnknown_819CEDF
@@ -358,11 +358,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
 	lock
 	faceplayer
 	setvar VAR_0x8004, 4
-	special sub_81133A4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F4F3
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F517
 	msgbox gUnknown_819CDDA
@@ -370,7 +370,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
 	end
 
 EventScript_16F4F3:: @ 816F4F3
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F50D
 	msgbox gUnknown_819CCF3
@@ -391,11 +391,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
 	lock
 	faceplayer
 	setvar VAR_0x8004, 6
-	special sub_81133A4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F555
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F579
 	msgbox gUnknown_819D1AE
@@ -403,7 +403,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
 	end
 
 EventScript_16F555:: @ 816F555
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F56F
 	msgbox gUnknown_819D0E3
@@ -424,11 +424,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
 	lock
 	faceplayer
 	setvar VAR_0x8004, 7
-	special sub_81133A4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_8113364
+	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F5B7
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 7
 	goto_if eq, EventScript_16F5DB
 	msgbox gUnknown_819D3D2
@@ -436,7 +436,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
 	end
 
 EventScript_16F5B7:: @ 816F5B7
-	specialvar VAR_RESULT, sub_8113288
+	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_16F5D1
 	msgbox gUnknown_819D2B4

data/maps/SeafoamIslands_B4F/scripts.inc

@@ -70,7 +70,7 @@ SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7
 
 EventScript_1630F1:: @ 81630F1
 	turnobject 255, 2
-	special sub_80CBD80
+	special Special_ForcePlayerToStartSurfing
 	end
 
 SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9

data/maps/SevenIsland_House_Room1/scripts.inc

@@ -90,7 +90,7 @@ EventScript_17097D:: @ 817097D
 
 EventScript_170987:: @ 8170987
 	special SavePlayerParty
-	special sub_80CAAAC
+	special Special_BufferEReaderTrainerName5
 	msgbox gUnknown_81A0598, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_170A11
@@ -105,7 +105,7 @@ EventScript_170987:: @ 8170987
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_170A11
 	special SavePlayerParty
-	special sub_80A03D8
+	special ReducePlayerPartyToThree
 	msgbox gUnknown_81A07C4
 	closemessage
 	compare_var_to_value VAR_FACING, 2

data/maps/SevenIsland_House_Room2/scripts.inc

@@ -4,7 +4,7 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E
 	.byte 0
 
 SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89
-	special sub_80E5E70
+	special SetEReaderTrainerGfxId
 	end
 
 SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D
@@ -15,12 +15,12 @@ EventScript_170A97:: @ 8170A97
 	lockall
 	applymovement 255, Movement_170B22
 	waitmovement 0
-	special sub_80E7538
+	special PrintEReaderTrainerGreeting
 	msgbox gStringVar4
 	closemessage
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
-	special sub_80E6900
+	special StartSpecialBattle
 	waitstate
 	compare_var_to_value VAR_RESULT, 3
 	call_if eq, EventScript_170AFE
@@ -46,14 +46,14 @@ EventScript_170AFE:: @ 8170AFE
 
 EventScript_170B0C:: @ 8170B0C
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
-	special sub_80CA68C
+	special Special_ShowStringVar4AsFieldMessage
 	waitmessage
 	waitbuttonpress
 	return
 
 EventScript_170B17:: @ 8170B17
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
-	special sub_80CA68C
+	special Special_ShowStringVar4AsFieldMessage
 	waitmessage
 	waitbuttonpress
 	return

data/maps/SevenIsland_SevaultCanyon/map.json

@@ -290,7 +290,7 @@
       "x": 7,
       "y": 17,
       "elevation": 5,
-      "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+      "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
       "dest_warp_id": 0
     },
     {

data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+  "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
-  "name": "SevenIsland_SeavaultCanyon_TanobyKey",
+  "name": "SevenIsland_SevaultCanyon_TanobyKey",
-  "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY",
+  "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
   "music": "MUS_NANAISEKI",
   "region_map_section": "MAPSEC_TANOBY_KEY",
   "requires_flash": false,
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_0x4001",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_0x4007",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_0x4006",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_0x4005",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_0x4004",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_0x4003",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_0x4002",
       "var_value": 99,
-      "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
     }
   ],
   "bg_events": []

data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc

@@ -1,9 +1,9 @@
-SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
+SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
-	map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2
+	map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2
 	.byte 0
 
-SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
+SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2
-	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY
+	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
 	checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
 	call_if TRUE, EventScript_164E07
 	setvar VAR_0x4001, 0
@@ -26,7 +26,7 @@ EventScript_164E07:: @ 8164E07
 	setobjectxyperm 7, 9, 8
 	return
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
 	lockall
 	compare_var_to_value VAR_0x4001, 100
 	goto_if eq, EventScript_164F8A
@@ -37,7 +37,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
 	lockall
 	compare_var_to_value VAR_0x4002, 100
 	goto_if eq, EventScript_164F8A
@@ -48,7 +48,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
 	lockall
 	compare_var_to_value VAR_0x4003, 100
 	goto_if eq, EventScript_164F8A
@@ -59,7 +59,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
 	lockall
 	compare_var_to_value VAR_0x4004, 100
 	goto_if eq, EventScript_164F8A
@@ -70,7 +70,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
 	lockall
 	compare_var_to_value VAR_0x4005, 100
 	goto_if eq, EventScript_164F8A
@@ -81,7 +81,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
 	lockall
 	compare_var_to_value VAR_0x4006, 100
 	goto_if eq, EventScript_164F8A
@@ -92,7 +92,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
 	releaseall
 	end
 
-SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
 	lockall
 	compare_var_to_value VAR_0x4007, 100
 	goto_if eq, EventScript_164F8A
@@ -110,7 +110,7 @@ EventScript_164F2E:: @ 8164F2E
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 8
 	setvar VAR_0x8007, 3
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 60
 	return
 
@@ -119,13 +119,13 @@ EventScript_164F51:: @ 8164F51
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
 	setvar VAR_0x8007, 3
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 60
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 12
 	setvar VAR_0x8007, 2
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 60
 	playse SE_FU_ZUZUZU
 	waitse

data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc

@@ -9,11 +9,11 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
 	checkflag FLAG_TEMP_2
 	call_if FALSE, EventScript_1A7AB9
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special sub_80CB580
+	special Special_DrawElevatorCurrentFloorWindow
 	message Text_1A535C
 	waitmessage
 	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, sub_80CB328
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
 	case 0, EventScript_164B46
 	case 1, EventScript_164B52
@@ -44,7 +44,7 @@ EventScript_164B90:: @ 8164B90
 	goto_if eq, EventScript_164BD3
 	call EventScript_164BD8
 	setvar VAR_ELEVATOR_FLOOR, 3
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	delay 25
 	applymovement 255, Movement_164BE5
 	waitmovement 0
@@ -58,15 +58,15 @@ EventScript_164BCD:: @ 8164BCD
 	end
 
 EventScript_164BD3:: @ 8164BD3
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 EventScript_164BD8:: @ 8164BD8
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special sub_80CB498
+	special Special_AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/SilphCo_Elevator/scripts.inc

@@ -7,12 +7,12 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
 	checkflag FLAG_TEMP_2
 	call_if FALSE, EventScript_1A7AB9
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special sub_80CB580
+	special Special_DrawElevatorCurrentFloorWindow
 	message Text_1A535C
 	waitmessage
 	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, sub_80CB328
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
-	special sub_80CB7C4
+	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
 	case 0, EventScript_1621BF
@@ -163,15 +163,15 @@ EventScript_1621E6:: @ 81621E6
 	end
 
 EventScript_1621E7:: @ 81621E7
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
 EventScript_1621EC:: @ 81621EC
-	special sub_80CB63C
+	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
-	special sub_80CB498
+	special Special_AnimateElevator
 	waitstate
 	setflag FLAG_TEMP_2
 	return

data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc

@@ -28,7 +28,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 12
 	setvar VAR_0x8007, 3
-	special sub_80CAC28
+	special Special_ShakeScreen
 	delay 60
 	compare_var_to_value VAR_FACING, 2
 	call_if eq, EventScript_164325
@@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9321
 	getbraillestringwidth gUnknown_81A9321
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A932D
 	getbraillestringwidth gUnknown_81A932D
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9338
 	getbraillestringwidth gUnknown_81A9338
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A933F
 	getbraillestringwidth gUnknown_81A933F
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A934A
 	getbraillestringwidth gUnknown_81A934A
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9356
 	getbraillestringwidth gUnknown_81A9356
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9362
 	getbraillestringwidth gUnknown_81A9362
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9368
 	getbraillestringwidth gUnknown_81A9368
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9374
 	getbraillestringwidth gUnknown_81A9374
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A937C
 	getbraillestringwidth gUnknown_81A937C
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9387
 	getbraillestringwidth gUnknown_81A9387
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A9393
 	getbraillestringwidth gUnknown_81A9393
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A939F
 	getbraillestringwidth gUnknown_81A939F
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A93AB
 	getbraillestringwidth gUnknown_81A93AB
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	setvar VAR_0x8006, 0
 	braillemessage gUnknown_81A93B4
 	getbraillestringwidth gUnknown_81A93B4
-	call EventScript_1A926C
+	call EventScript_BrailleCursorWaitButton
 	braillemessage gUnknown_81A93C0
 	waitbuttonpress
 	releaseall

data/maps/SixIsland_WaterPath_House1/scripts.inc

@@ -9,17 +9,17 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_HERACROSS
-	specialvar VAR_RESULT, sub_80CC48C
+	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1720E5
-	special sub_80A0918
+	special GetHeracrossSizeRecordInfo
 	msgbox gUnknown_81A4A3F
 	special Special_ChooseMonFromParty
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare_var_to_value VAR_RESULT, 6
 	goto_if ge, EventScript_1720EF
-	special sub_80A0930
+	special CompareHeracrossSize
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_1720F1
 	compare_var_to_value VAR_RESULT, 2
@@ -83,7 +83,7 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
 	end
 
 EventScript_17216B:: @ 817216B
-	special sub_80A0918
+	special GetHeracrossSizeRecordInfo
 	msgbox gUnknown_81A4C6E
 	releaseall
 	end

data/maps/ThreeIsland_BerryForest/scripts.inc

@@ -32,7 +32,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
 	giveitem ITEM_IAPAPA_BERRY
 	compare_var_to_value VAR_RESULT, 0
 	call_if eq, EventScript_163D19
-	special sub_80CA6DC
+	special Special_BufferBigGuyOrBigGirlString
 	msgbox gUnknown_817AF3B
 	closemessage
 	setflag FLAG_RESCUED_LOSTELLE

data/maps/ThreeIsland_House1/scripts.inc

@@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819
 ThreeIsland_House1_EventScript_17181A:: @ 817181A
 	lock
 	faceplayer
-	special sub_80CA6DC
+	special Special_BufferBigGuyOrBigGirlString
 	msgbox gUnknown_81A2F3E
 	release
 	end

data/maps/TwoIsland_House/scripts.inc

@@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5
 
 EventScript_1716BE:: @ 81716BE
 	msgbox gUnknown_81A2CC3
-	special sub_80BF93C
+	special SelectMoveTutorMon
 	waitstate
 	compare_var_to_value VAR_0x8004, 6
 	goto_if ge, EventScript_17179E
-	special sub_80BFC14
+	special IsSelectedMonEgg
 	compare_var_to_value VAR_RESULT, 1
 	goto_if eq, EventScript_171790
 	compare_var_to_value VAR_0x8005, 0
@@ -67,7 +67,7 @@ EventScript_1716BE:: @ 81716BE
 
 EventScript_1716F4:: @ 81716F4
 	msgbox gUnknown_81A2CE1
-	special sub_80E4634
+	special DisplayMoveTutorMenu
 	waitstate
 	compare_var_to_value VAR_0x8004, 0
 	goto_if eq, EventScript_1716BE

data/maps/TwoIsland_JoyfulGameCorner/scripts.inc

@@ -37,7 +37,7 @@ EventScript_171435:: @ 8171435
 	textcolor 0
 	msgbox gUnknown_81A28B2
 	textcolor 1
-	special sub_80CA6DC
+	special Special_BufferBigGuyOrBigGirlString
 	msgbox gUnknown_81A2931
 	closemessage
 	applymovement 3, Movement_1A75ED

data/maps/map_groups.json

@@ -212,7 +212,7 @@
     "SevenIsland_TanobyRuins_RixyChamber",
     "SevenIsland_TanobyRuins_ViapoisChamber",
     "ThreeIsland_DunsparceTunnel",
-    "SevenIsland_SeavaultCanyon_TanobyKey",
+    "SevenIsland_SevaultCanyon_TanobyKey",
     "NavelRock_1F",
     "NavelRock_Summit",
     "NavelRock_Base",