1890 files changed, 20117 insertions, 20542 deletions

diff --git a/Makefile b/Makefile
index 8a739ccf4..37c3d936a 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,9 @@ $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
 $(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
 $(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
 
+$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm
+$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
+
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=
 else
diff --git a/asm/battle_bg.s b/asm/battle_bg.s
index 96f33cb3c..e21617e70 100644
--- a/asm/battle_bg.s
+++ b/asm/battle_bg.s
@@ -1270,7 +1270,7 @@ _0800FBF8:
 _0800FC00: .4byte gTrainers
 _0800FC04: .4byte gTrainerBattleOpponent_A
 _0800FC08:
-	bl sav1_map_get_battletype
+	bl GetCurrentMapBattleScene
 	lsls r0, 24
 	cmp r0, 0
 	bne _0800FC20
@@ -1341,7 +1341,7 @@ _0800FC88:
 	movs r0, 0x13
 	b _0800FCAA
 _0800FC90:
-	bl sav1_map_get_battletype
+	bl GetCurrentMapBattleScene
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 6502fc916..728e87128 100644
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -45,7 +45,7 @@ _0814B716:
 	ldr r0, _0814B74C @ =0x0000012f
 	bl PlayNewMapMusic
 	ldr r0, _0814B750 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 _0814B73E:
 	movs r0, 0
 _0814B740:
@@ -58,8 +58,8 @@ _0814B74C: .4byte 0x0000012f
 _0814B750: .4byte sub_8056534
 	thumb_func_end sub_814B6FC
 
-	thumb_func_start sub_814B754
-sub_814B754: @ 814B754
+	thumb_func_start StartBerryCrush
+StartBerryCrush: @ 814B754
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -183,7 +183,7 @@ _0814B84C:
 	.align 2, 0
 _0814B858: .4byte sub_814BA80
 _0814B85C: .4byte sub_814BA98
-	thumb_func_end sub_814B754
+	thumb_func_end StartBerryCrush
 
 	thumb_func_start sub_814B860
 sub_814B860: @ 814B860
diff --git a/asm/berry_crush_2.s b/asm/berry_crush_2.s
index 7495c8519..e5079a5a9 100644
--- a/asm/berry_crush_2.s
+++ b/asm/berry_crush_2.s
@@ -143,7 +143,7 @@ _0814BC30:
 	movs r0, 0x3
 	b _0814BC6A
 _0814BC44:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814BC66
 _0814BC4A:
 	bl IsLinkTaskFinished
@@ -359,7 +359,7 @@ sub_814BDBC: @ 814BDBC
 	beq _0814BDD2
 	b _0814BDFC
 _0814BDCC:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814BDFC
 _0814BDD2:
 	bl IsLinkTaskFinished
@@ -494,7 +494,7 @@ _0814BEB4:
 	bl sub_814BB4C
 	b _0814BFC6
 _0814BED4:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814BFC0
 _0814BEDA:
 	bl IsLinkTaskFinished
@@ -650,7 +650,7 @@ _0814C008:
 	adds r1, r4, r0
 	adds r0, r4, 0
 	bl sub_814DA24
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814C108
 _0814C01A:
 	bl IsLinkTaskFinished
@@ -720,7 +720,7 @@ _0814C080:
 	ldrb r0, [r2]
 	adds r0, 0x1
 	strb r0, [r2]
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814C108
 	.align 2, 0
 _0814C0AC: .4byte sub_814DB84
@@ -748,7 +748,7 @@ _0814C0D2:
 	adds r1, r4, r3
 	adds r0, r4, 0
 	bl sub_814DC24
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814C108
 _0814C0E4:
 	bl IsLinkTaskFinished
@@ -904,7 +904,7 @@ _0814C1FC:
 	movs r0, 0x1E
 	movs r1, 0
 	bl SetGpuReg
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814C23C
 _0814C21E:
 	bl IsLinkTaskFinished
@@ -962,14 +962,14 @@ _0814C26C:
 	adds r0, r1, 0
 	movs r2, 0x78
 	movs r3, 0x50
-	bl sub_815F138
+	bl StartMinigameCountdown
 	b _0814C2EC
 _0814C28A:
-	bl sub_815F198
+	bl IsMinigameCountdownRunning
 	cmp r0, 0
 	bne _0814C2F2
 _0814C292:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814C2EC
 _0814C298:
 	bl IsLinkTaskFinished
@@ -1655,7 +1655,7 @@ _0814C77A:
 	movs r2, 0xC
 	bl memcpy
 	adds r0, r4, 0
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 _0814C7AC:
 	pop {r3}
 	mov r8, r3
@@ -2065,7 +2065,7 @@ _0814CADA:
 	bl sub_814DE50
 	cmp r0, 0
 	beq _0814CB18
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	movs r0, 0
 	strh r0, [r4, 0x10]
 	b _0814CB12
@@ -2158,7 +2158,7 @@ _0814CB8A:
 	bl sub_814DE50
 	cmp r0, 0
 	beq _0814CC02
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	movs r0, 0
 	strh r0, [r5, 0x10]
 	movs r0, 0x12
@@ -2846,7 +2846,7 @@ _0814D0D6:
 	.align 2, 0
 _0814D0FC: .4byte 0x00008c9f
 _0814D100:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814D178
 _0814D106:
 	bl IsLinkTaskFinished
@@ -3028,7 +3028,7 @@ _0814D256:
 	beq _0814D296
 	b _0814D30C
 _0814D260:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814D30C
 _0814D266:
 	bl IsLinkTaskFinished
@@ -3316,14 +3316,14 @@ _0814D47C:
 	beq _0814D498
 	b _0814D4B8
 _0814D482:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814D4B8
 _0814D488:
 	bl IsLinkTaskFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814D4BE
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _0814D4B8
 _0814D498:
 	ldr r0, _0814D4B4 @ =gReceivedRemoteLinkPlayers
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s
index 9e3334a7f..dfed93396 100644
--- a/asm/berry_crush_3.s
+++ b/asm/berry_crush_3.s
@@ -63,7 +63,7 @@ _0814D63A:
 	ldr r0, _0814D65C @ =gReservedSpritePaletteCount
 	strb r4, [r0]
 	movs r0, 0x3
-	bl sub_815C980
+	bl DigitObjUtil_Init
 	b _0814D878
 	.align 2, 0
 _0814D658: .4byte 0x01000200
@@ -338,7 +338,7 @@ _0814D8B4:
 	.4byte _0814D9A2
 	.4byte _0814D9B2
 _0814D8D4:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _0814D9BA
 _0814D8DA:
 	bl IsLinkTaskFinished
@@ -427,7 +427,7 @@ _0814D9A2:
 	bl DestroyWirelessStatusIndicatorSprite
 	adds r0, r5, 0
 	bl sub_814EF10
-	bl sub_815C9F4
+	bl DigitObjUtil_Teardown
 	b _0814D9BA
 _0814D9B2:
 	movs r0, 0
@@ -2578,15 +2578,15 @@ sub_814EAD4: @ 814EAD4
 	movs r0, 0x4
 	ldrsh r1, [r4, r0]
 	movs r0, 0
-	bl sub_815CD70
+	bl DigitObjUtil_PrintNumOn
 	movs r0, 0x6
 	ldrsh r1, [r4, r0]
 	movs r0, 0x1
-	bl sub_815CD70
+	bl DigitObjUtil_PrintNumOn
 	movs r0, 0x8
 	ldrsh r1, [r4, r0]
 	movs r0, 0x2
-	bl sub_815CD70
+	bl DigitObjUtil_PrintNumOn
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -2608,13 +2608,13 @@ sub_814EB04: @ 814EB04
 	strb r0, [r1]
 	movs r0, 0x2
 	movs r1, 0x1
-	bl sub_815D1A8
+	bl DigitObjUtil_HideOrShow
 	movs r0, 0x1
 	movs r1, 0x1
-	bl sub_815D1A8
+	bl DigitObjUtil_HideOrShow
 	movs r0, 0
 	movs r1, 0x1
-	bl sub_815D1A8
+	bl DigitObjUtil_HideOrShow
 	pop {r0}
 	bx r0
 	thumb_func_end sub_814EB04
@@ -3060,17 +3060,17 @@ _0814EE3E:
 	movs r0, 0
 	movs r1, 0
 	adds r2, r4, 0
-	bl sub_815CA40
+	bl DigitObjUtil_CreatePrinter
 	adds r2, r4, 0
 	adds r2, 0x10
 	movs r0, 0x1
 	movs r1, 0
-	bl sub_815CA40
+	bl DigitObjUtil_CreatePrinter
 	adds r4, 0x20
 	movs r0, 0x2
 	movs r1, 0
 	adds r2, r4, 0
-	bl sub_815CA40
+	bl DigitObjUtil_CreatePrinter
 	ldrh r0, [r6, 0x12]
 	cmp r0, 0x1
 	bne _0814EED8
@@ -3130,11 +3130,11 @@ _0814EF46:
 	cmp r4, 0x1
 	bls _0814EF46
 	movs r0, 0x2
-	bl sub_815D108
+	bl DigitObjUtil_DeletePrinter
 	movs r0, 0x1
-	bl sub_815D108
+	bl DigitObjUtil_DeletePrinter
 	movs r0, 0
-	bl sub_815D108
+	bl DigitObjUtil_DeletePrinter
 	movs r4, 0
 	movs r1, 0xC2
 	lsls r1, 1
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 27a3d93f4..92f14461a 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -751,7 +751,7 @@ sub_8080CDC: @ 8080CDC
 	lsrs r0, 16
 	cmp r0, 0x1
 	bhi _08080D3C
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	bl HideFieldMessageBox
 	ldr r0, _08080D38 @ =sub_8080F78
 	b _08080D72
@@ -845,14 +845,14 @@ sub_8080DC0: @ 8080DC0
 	bl sub_8080D8C
 	cmp r0, 0x1
 	beq _08080DFE
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _08080E02
 	.align 2, 0
 _08080DE8: .4byte gSpecialVar_Result
 _08080DEC:
 	cmp r0, 0x3
 	bne _08080DF6
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _08080E02
 _08080DF6:
 	cmp r0, 0x7
@@ -1010,7 +1010,7 @@ _08080F48: .4byte gLinkType
 _08080F4C: .4byte 0x00004411
 _08080F50: .4byte gTasks
 _08080F54:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldr r0, _08080F70 @ =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -1564,7 +1564,7 @@ _0808138C:
 	ble _0808143A
 	b _080813AA
 _0808139C:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	b _080813AA
 _080813A2:
 	ldr r0, _080813B4 @ =gReceivedRemoteLinkPlayers
@@ -1756,7 +1756,7 @@ _08081510:
 	ldr r1, [r1]
 	str r1, [r0]
 	adds r0, r5, 0
-	bl sub_800B284
+	bl IntlConvertLinkPlayerName
 	lsls r0, r4, 24
 	lsrs r0, 24
 	bl ResetBlockReceivedFlag
@@ -1785,7 +1785,7 @@ _0808154C:
 	strh r0, [r6]
 	b _0808160A
 _08081560:
-	bl sub_800AB9C
+	bl PrepareSendLinkCmd2FFE_or_RfuCmd6600
 	movs r0, 0x6
 	strh r0, [r6]
 	b _0808160A
@@ -1895,7 +1895,7 @@ sub_8081624: @ 8081624
 	.align 2, 0
 _0808163C: .4byte gMain
 _08081640:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -1942,9 +1942,9 @@ sub_8081668: @ 8081668
 	beq _0808170A
 	ldr r0, _080816C4 @ =gBattleOutcome
 	ldrb r0, [r0]
-	cmp r0, 0x1
+	cmp r0, 0x1 @ B_OUTCOME_WON
 	beq _080816C8
-	cmp r0, 0x2
+	cmp r0, 0x2 @ B_OUTCOME_LOST
 	beq _080816EC
 	b _0808170A
 	.align 2, 0
@@ -1955,6 +1955,7 @@ _080816BC: .4byte gLocalLinkPlayerId
 _080816C0: .4byte gWirelessCommType
 _080816C4: .4byte gBattleOutcome
 _080816C8:
+	@ MEvent_RecordIdOfWonderCardSenderByEventType(0, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _080816E8 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -1967,11 +1968,12 @@ _080816C8:
 	adds r1, r4
 	ldr r1, [r1]
 	movs r0, 0
-	bl sub_8144714
+	bl MEvent_RecordIdOfWonderCardSenderByEventType
 	b _0808170A
 	.align 2, 0
 _080816E8: .4byte gLinkPlayers
 _080816EC:
+	@ MEvent_RecordIdOfWonderCardSenderByEventType(1, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
 	ldr r4, _08081718 @ =gLinkPlayers
 	bl GetMultiplayerId
 	eors r0, r5
@@ -1984,7 +1986,7 @@ _080816EC:
 	adds r1, r4
 	ldr r1, [r1]
 	movs r0, 0x1
-	bl sub_8144714
+	bl MEvent_RecordIdOfWonderCardSenderByEventType
 _0808170A:
 	bl InUnionRoom
 	cmp r0, 0x1
@@ -2198,7 +2200,7 @@ _080818A8:
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
 	bl m4aMPlayAllStop
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 _080818B8:
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -2274,7 +2276,7 @@ _08081940:
 	strb r0, [r1]
 	strb r0, [r1, 0x1]
 	bl m4aMPlayAllStop
-	bl sub_800AB9C
+	bl PrepareSendLinkCmd2FFE_or_RfuCmd6600
 _08081950:
 	ldrh r0, [r4]
 	adds r0, 0x1
@@ -2287,7 +2289,7 @@ _0808195C:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08081970
-	bl sub_8117118
+	bl UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade
 	adds r0, r5, 0
 	bl DestroyTask
 _08081970:
@@ -2507,7 +2509,7 @@ sub_8081B08: @ 8081B08
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	ldr r1, _08081B28 @ =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 3e9c18491..eca27fd8d 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_81507FC
-sub_81507FC: @ 81507FC
+	thumb_func_start StartDodrioBerryPicking
+StartDodrioBerryPicking: @ 81507FC
 	push {r4-r6,lr}
 	adds r5, r1, 0
 	lsls r0, 16
@@ -97,7 +97,7 @@ _081508D2:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_81507FC
+	thumb_func_end StartDodrioBerryPicking
 
 	thumb_func_start sub_81508D8
 sub_81508D8: @ 81508D8
@@ -382,7 +382,7 @@ _08150B08:
 	bl sub_8155E68
 	cmp r0, 0
 	bne _08150BFC
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 	b _08150BDC
 _08150B16:
 	bl IsLinkTaskFinished
@@ -649,7 +649,7 @@ _08150D28:
 	movs r1, 0x8
 	movs r2, 0x78
 	movs r3, 0x50
-	bl sub_815F138
+	bl StartMinigameCountdown
 	b _08150D52
 _08150D3A:
 	bl IsLinkTaskFinished
@@ -658,11 +658,11 @@ _08150D3A:
 	beq _08150D74
 	b _08150D52
 _08150D46:
-	bl sub_815F198
+	bl IsMinigameCountdownRunning
 	cmp r0, 0
 	bne _08150D74
 _08150D4E:
-	bl sub_80FA42C
+	bl LinkRfu_SetRfuFuncToSend6600
 _08150D52:
 	ldr r0, _08150D60 @ =gUnknown_203F3E0
 	ldr r1, [r0]
@@ -1611,7 +1611,7 @@ _081514A4:
 	beq _081514C0
 	b _081514D6
 _081514AA:
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 	movs r0, 0x7
 	bl sub_81549D4
 	b _081514CC
diff --git a/asm/dodrio_berry_picking_2.s b/asm/dodrio_berry_picking_2.s
index 792dc4b0f..91594c7a8 100644
--- a/asm/dodrio_berry_picking_2.s
+++ b/asm/dodrio_berry_picking_2.s
@@ -407,7 +407,7 @@ sub_815A61C: @ 815A61C
 	ands r5, r7
 	orrs r5, r4
 	strb r5, [r0, 0xB]
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x20
 	pop {r3-r5}
 	mov r8, r3
@@ -637,7 +637,7 @@ sub_815AAD8: @ 815AAD8
 	orrs r1, r0
 	str r1, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -692,7 +692,7 @@ sub_815AB3C: @ 815AB3C
 	str r1, [sp]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0x8
 	pop {r0}
 	bx r0
diff --git a/asm/easy_chat_2.s b/asm/easy_chat_2.s
index c88c5deeb..40b0eeb1f 100644
--- a/asm/easy_chat_2.s
+++ b/asm/easy_chat_2.s
@@ -334,8 +334,8 @@ sub_80FEE24: @ 80FEE24
 	bx r0
 	thumb_func_end sub_80FEE24
 
-	thumb_func_start sub_80FEE44
-sub_80FEE44: @ 80FEE44
+	thumb_func_start ShowEasyChatScreen
+ShowEasyChatScreen: @ 80FEE44
 	push {lr}
 	ldr r0, _080FEE58 @ =gSpecialVar_0x8004
 	ldrh r0, [r0]
@@ -431,7 +431,7 @@ _080FEF1C: .4byte gSpecialVar_0x8005
 _080FEF20: .4byte 0x00002cd0
 _080FEF24: .4byte gSpecialVar_0x8004
 _080FEF28: .4byte sub_80568C4
-	thumb_func_end sub_80FEE44
+	thumb_func_end ShowEasyChatScreen
 
 	thumb_func_start sub_80FEF2C
 sub_80FEF2C: @ 80FEF2C
diff --git a/asm/event_object_80688E4.s b/asm/event_object_80688E4.s
deleted file mode 100644
index 93309a80d..000000000
--- a/asm/event_object_80688E4.s
+++ /dev/null
@@ -1,1503 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start FreezeObjectEvent
-FreezeObjectEvent: @ 80688E4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r1, [r5]
-	movs r0, 0xA0
-	lsls r0, 1
-	ands r0, r1
-	cmp r0, 0
-	bne _0806896C
-	ldrb r0, [r5, 0x1]
-	movs r4, 0x1
-	orrs r0, r4
-	strb r0, [r5, 0x1]
-	ldr r3, _08068968 @ =gSprites
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	lsls r1, 25
-	lsrs r1, 31
-	lsls r1, 7
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x7F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x2]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	lsrs r1, 7
-	ands r1, r4
-	ldrb r2, [r5, 0x3]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x3]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r2, 0x40
-	orrs r1, r2
-	strb r1, [r0]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r2, 0x80
-	orrs r1, r2
-	strb r1, [r0]
-	movs r0, 0
-	b _0806896E
-	.align 2, 0
-_08068968: .4byte gSprites
-_0806896C:
-	movs r0, 0x1
-_0806896E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end FreezeObjectEvent
-
-	thumb_func_start FreezeObjectEvents
-FreezeObjectEvents: @ 8068974
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, _080689A8 @ =gObjectEvents
-_0806897A:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _08068998
-	ldr r0, _080689AC @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _08068998
-	adds r0, r1, 0
-	bl FreezeObjectEvent
-_08068998:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _0806897A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080689A8: .4byte gObjectEvents
-_080689AC: .4byte gPlayerAvatar
-	thumb_func_end FreezeObjectEvents
-
-	thumb_func_start FreezeObjectEventsExceptOne
-FreezeObjectEventsExceptOne: @ 80689B0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r4, 0
-	ldr r6, _080689EC @ =gObjectEvents
-_080689BA:
-	cmp r4, r5
-	beq _080689DC
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080689DC
-	ldr r0, _080689F0 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _080689DC
-	adds r0, r1, 0
-	bl FreezeObjectEvent
-_080689DC:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _080689BA
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080689EC: .4byte gObjectEvents
-_080689F0: .4byte gPlayerAvatar
-	thumb_func_end FreezeObjectEventsExceptOne
-
-	thumb_func_start UnfreezeObjectEvent
-UnfreezeObjectEvent: @ 80689F4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r2, [r5]
-	ldr r1, _08068A54 @ =0x00000101
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, r1
-	bne _08068A4C
-	ldrb r1, [r5, 0x1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r5, 0x1]
-	ldr r4, _08068A58 @ =gSprites
-	ldrb r0, [r5, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r2, [r5, 0x2]
-	adds r1, 0x2C
-	lsrs r2, 7
-	lsls r2, 6
-	ldrb r3, [r1]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1]
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r4
-	ldrb r1, [r5, 0x3]
-	lsls r1, 31
-	lsrs r1, 31
-	adds r2, 0x2C
-	lsls r1, 7
-	ldrb r3, [r2]
-	movs r0, 0x7F
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-_08068A4C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08068A54: .4byte 0x00000101
-_08068A58: .4byte gSprites
-	thumb_func_end UnfreezeObjectEvent
-
-	thumb_func_start UnfreezeObjectEvents
-UnfreezeObjectEvents: @ 8068A5C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, _08068A88 @ =gObjectEvents
-_08068A62:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _08068A78
-	adds r0, r1, 0
-	bl UnfreezeObjectEvent
-_08068A78:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _08068A62
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08068A88: .4byte gObjectEvents
-	thumb_func_end UnfreezeObjectEvents
-
-	thumb_func_start little_step
-little_step: @ 8068A8C
-	lsls r1, 24
-	ldr r2, _08068AA8 @ =gUnknown_83A64C8
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.align 2, 0
-_08068AA8: .4byte gUnknown_83A64C8
-	thumb_func_end little_step
-
-	thumb_func_start double_little_steps
-double_little_steps: @ 8068AAC
-	lsls r1, 24
-	ldr r2, _08068ACC @ =gUnknown_83A64C8
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 1
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 1
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.align 2, 0
-_08068ACC: .4byte gUnknown_83A64C8
-	thumb_func_end double_little_steps
-
-	thumb_func_start triple_little_steps
-triple_little_steps: @ 8068AD0
-	lsls r1, 24
-	ldr r2, _08068AF4 @ =gUnknown_83A64C8
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r3, r2, 1
-	adds r2, r3
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r2, r1, 1
-	adds r1, r2
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.align 2, 0
-_08068AF4: .4byte gUnknown_83A64C8
-	thumb_func_end triple_little_steps
-
-	thumb_func_start quad_little_steps
-quad_little_steps: @ 8068AF8
-	lsls r1, 24
-	ldr r2, _08068B18 @ =gUnknown_83A64C8
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 2
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 2
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.align 2, 0
-_08068B18: .4byte gUnknown_83A64C8
-	thumb_func_end quad_little_steps
-
-	thumb_func_start oct_little_steps
-oct_little_steps: @ 8068B1C
-	lsls r1, 24
-	ldr r2, _08068B3C @ =gUnknown_83A64C8
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 3
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 3
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.align 2, 0
-_08068B3C: .4byte gUnknown_83A64C8
-	thumb_func_end oct_little_steps
-
-	thumb_func_start oamt_npc_ministep_reset
-oamt_npc_ministep_reset: @ 8068B40
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	movs r3, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r3, [r0, 0x38]
-	bx lr
-	thumb_func_end oamt_npc_ministep_reset
-
-	thumb_func_start obj_npc_ministep
-obj_npc_ministep: @ 8068B54
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _08068BAC @ =gUnknown_83A71B0
-	movs r0, 0x36
-	ldrsh r2, [r4, r0]
-	lsls r0, r2, 1
-	adds r0, r5
-	movs r3, 0x38
-	ldrsh r1, [r4, r3]
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	cmp r1, r0
-	bge _08068BB4
-	ldr r1, _08068BB0 @ =gUnknown_83A719C
-	lsls r0, r2, 2
-	adds r0, r1
-	movs r1, 0x38
-	ldrsh r2, [r4, r1]
-	ldr r0, [r0]
-	lsls r2, 2
-	adds r2, r0
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, [r2]
-	adds r0, r4, 0
-	bl _call_via_r2
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-	movs r2, 0x36
-	ldrsh r1, [r4, r2]
-	lsls r1, 1
-	adds r1, r5
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0
-	ldrsh r1, [r1, r3]
-	cmp r0, r1
-	blt _08068BB4
-	movs r0, 0x1
-	b _08068BB6
-	.align 2, 0
-_08068BAC: .4byte gUnknown_83A71B0
-_08068BB0: .4byte gUnknown_83A719C
-_08068BB4:
-	movs r0, 0
-_08068BB6:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end obj_npc_ministep
-
-	thumb_func_start sub_8068BBC
-sub_8068BBC: @ 8068BBC
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_8068BBC
-
-	thumb_func_start sub_8068BCC
-sub_8068BCC: @ 8068BCC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x36]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08068BEC
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-_08068BEC:
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xF
-	bgt _08068BFE
-	movs r0, 0
-	b _08068C00
-_08068BFE:
-	movs r0, 0x1
-_08068C00:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8068BCC
-
-	thumb_func_start sub_8068C08
-sub_8068C08: @ 8068C08
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_8068C08
-
-	thumb_func_start sub_8068C18
-sub_8068C18: @ 8068C18
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	bgt _08068C3E
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-	b _08068C42
-_08068C3E:
-	movs r0, 0
-	strh r0, [r4, 0x36]
-_08068C42:
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xF
-	bgt _08068C4E
-	movs r0, 0
-	b _08068C50
-_08068C4E:
-	movs r0, 0x1
-_08068C50:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8068C18
-
-	thumb_func_start sub_8068C58
-sub_8068C58: @ 8068C58
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_8068C58
-
-	thumb_func_start sub_8068C68
-sub_8068C68: @ 8068C68
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08068C90
-	movs r0, 0
-	strh r0, [r4, 0x36]
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-_08068C90:
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xF
-	bgt _08068C9C
-	movs r0, 0
-	b _08068C9E
-_08068C9C:
-	movs r0, 0x1
-_08068C9E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8068C68
-
-	thumb_func_start sub_8068CA4
-sub_8068CA4: @ 8068CA4
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_8068CA4
-
-	thumb_func_start sub_8068CB4
-sub_8068CB4: @ 8068CB4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08068CD8
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	b _08068CE8
-_08068CD8:
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl double_little_steps
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x2
-_08068CE8:
-	strh r0, [r4, 0x38]
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xF
-	bgt _08068CF6
-	movs r0, 0
-	b _08068CF8
-_08068CF6:
-	movs r0, 0x1
-_08068CF8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8068CB4
-
-	thumb_func_start sub_8068D00
-sub_8068D00: @ 8068D00
-	lsls r1, 24
-	ldr r2, _08068D18 @ =gUnknown_83A71EC
-	lsrs r1, 22
-	adds r1, r2
-	lsls r0, 16
-	asrs r0, 16
-	ldr r1, [r1]
-	adds r1, r0
-	movs r0, 0
-	ldrsb r0, [r1, r0]
-	bx lr
-	.align 2, 0
-_08068D18: .4byte gUnknown_83A71EC
-	thumb_func_end sub_8068D00
-
-	thumb_func_start sub_8068D1C
-sub_8068D1C: @ 8068D1C
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	movs r4, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r3, [r0, 0x38]
-	strh r4, [r0, 0x3A]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8068D1C
-
-	thumb_func_start sub_8068D3C
-sub_8068D3C: @ 8068D3C
-	push {r4-r6,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	ldr r1, _08068DBC @ =gUnknown_83A71F8
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	add r5, sp, 0x8
-	ldr r1, _08068DC0 @ =gUnknown_83A71FE
-	adds r0, r5, 0
-	movs r2, 0x3
-	bl memcpy
-	movs r6, 0
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _08068D6E
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-_08068D6E:
-	movs r2, 0x3A
-	ldrsh r0, [r4, r2]
-	movs r2, 0x36
-	ldrsh r1, [r4, r2]
-	adds r1, r5, r1
-	ldrb r1, [r1]
-	asrs r0, r1
-	ldrh r1, [r4, 0x38]
-	lsls r1, 24
-	lsrs r1, 24
-	bl sub_8068D00
-	strh r0, [r4, 0x26]
-	ldrh r1, [r4, 0x3A]
-	adds r1, 0x1
-	strh r1, [r4, 0x3A]
-	movs r2, 0x36
-	ldrsh r0, [r4, r2]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	lsls r0, 16
-	asrs r2, r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	asrs r0, 17
-	cmp r1, r0
-	bne _08068DA8
-	movs r6, 0x1
-_08068DA8:
-	cmp r1, r2
-	blt _08068DB2
-	movs r0, 0
-	strh r0, [r4, 0x26]
-	movs r6, 0xFF
-_08068DB2:
-	adds r0, r6, 0
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08068DBC: .4byte gUnknown_83A71F8
-_08068DC0: .4byte gUnknown_83A71FE
-	thumb_func_end sub_8068D3C
-
-	thumb_func_start sub_8068DC4
-sub_8068DC4: @ 8068DC4
-	push {r4-r6,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	ldr r1, _08068E50 @ =gUnknown_83A7202
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	add r4, sp, 0x8
-	ldr r1, _08068E54 @ =gUnknown_83A7208
-	adds r0, r4, 0
-	movs r2, 0x3
-	bl memcpy
-	movs r6, 0
-	movs r1, 0x36
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _08068E00
-	ldrh r1, [r5, 0x3A]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08068E00
-	ldrh r1, [r5, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl little_step
-_08068E00:
-	movs r2, 0x3A
-	ldrsh r0, [r5, r2]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	adds r1, r4, r1
-	ldrb r1, [r1]
-	asrs r0, r1
-	ldrh r1, [r5, 0x38]
-	lsls r1, 24
-	lsrs r1, 24
-	bl sub_8068D00
-	strh r0, [r5, 0x26]
-	ldrh r1, [r5, 0x3A]
-	adds r1, 0x1
-	strh r1, [r5, 0x3A]
-	movs r2, 0x36
-	ldrsh r0, [r5, r2]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	lsls r0, 16
-	asrs r2, r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	asrs r0, 17
-	cmp r1, r0
-	bne _08068E3A
-	movs r6, 0x1
-_08068E3A:
-	cmp r1, r2
-	blt _08068E44
-	movs r0, 0
-	strh r0, [r5, 0x26]
-	movs r6, 0xFF
-_08068E44:
-	adds r0, r6, 0
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08068E50: .4byte gUnknown_83A7202
-_08068E54: .4byte gUnknown_83A7208
-	thumb_func_end sub_8068DC4
-
-	thumb_func_start SetObjectEventStepTimer
-SetObjectEventStepTimer: @ 8068E58
-	strh r1, [r0, 0x34]
-	bx lr
-	thumb_func_end SetObjectEventStepTimer
-
-	thumb_func_start RunObjectEventStepTimer
-RunObjectEventStepTimer: @ 8068E5C
-	push {lr}
-	ldrh r1, [r0, 0x34]
-	subs r1, 0x1
-	strh r1, [r0, 0x34]
-	lsls r1, 16
-	cmp r1, 0
-	beq _08068E6E
-	movs r0, 0
-	b _08068E70
-_08068E6E:
-	movs r0, 0x1
-_08068E70:
-	pop {r1}
-	bx r1
-	thumb_func_end RunObjectEventStepTimer
-
-	thumb_func_start obj_anim_image_set_and_seek
-obj_anim_image_set_and_seek: @ 8068E74
-	push {r4,lr}
-	lsls r2, 24
-	lsrs r2, 24
-	adds r3, r0, 0
-	adds r3, 0x2A
-	strb r1, [r3]
-	adds r4, r0, 0
-	adds r4, 0x2C
-	ldrb r3, [r4]
-	movs r1, 0x41
-	negs r1, r1
-	ands r1, r3
-	strb r1, [r4]
-	adds r1, r2, 0
-	bl SeekSpriteAnim
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end obj_anim_image_set_and_seek
-
-	thumb_func_start sub_8068E9C
-sub_8068E9C: @ 8068E9C
-	push {lr}
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _08068EAE
-	movs r0, 0
-	b _08068EB0
-_08068EAE:
-	movs r0, 0x1
-_08068EB0:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8068E9C
-
-	thumb_func_start sub_8068EB4
-sub_8068EB4: @ 8068EB4
-	push {r4-r6,lr}
-	mov r12, r0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r3, r12
-	adds r3, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08068F1C
-	mov r0, r12
-	ldrh r1, [r0, 0x24]
-	ldrh r2, [r0, 0x20]
-	adds r1, r2
-	mov r4, r12
-	adds r4, 0x28
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	ldr r2, _08068F14 @ =gSpriteCoordOffsetX
-	adds r0, r1
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r6, r0, 16
-	mov r0, r12
-	ldrh r1, [r0, 0x26]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	subs r3, 0x15
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	ldr r2, _08068F18 @ =gSpriteCoordOffsetY
-	adds r0, r1
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r2, r3, 0
-	b _08068F4A
-	.align 2, 0
-_08068F14: .4byte gSpriteCoordOffsetX
-_08068F18: .4byte gSpriteCoordOffsetY
-_08068F1C:
-	mov r0, r12
-	ldrh r1, [r0, 0x24]
-	ldrh r2, [r0, 0x20]
-	adds r1, r2
-	mov r3, r12
-	adds r3, 0x28
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	adds r0, r1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	mov r0, r12
-	ldrh r1, [r0, 0x26]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	mov r2, r12
-	adds r2, 0x29
-	movs r0, 0
-	ldrsb r0, [r2, r0]
-	adds r0, r1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r4, r3, 0
-_08068F4A:
-	ldrb r0, [r4]
-	lsls r0, 24
-	asrs r0, 25
-	subs r0, r6, r0
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrb r0, [r2]
-	lsls r0, 24
-	asrs r0, 25
-	subs r0, r5, r0
-	lsls r0, 16
-	lsrs r2, r0, 16
-	lsls r0, r6, 16
-	asrs r0, 16
-	cmp r0, 0xFF
-	bgt _08068F76
-	lsls r0, r3, 16
-	asrs r0, 16
-	movs r1, 0x10
-	negs r1, r1
-	cmp r0, r1
-	bge _08068F82
-_08068F76:
-	mov r4, r12
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-_08068F82:
-	lsls r0, r5, 16
-	asrs r0, 16
-	cmp r0, 0xAF
-	bgt _08068F96
-	lsls r0, r2, 16
-	asrs r0, 16
-	movs r1, 0x10
-	negs r1, r1
-	cmp r0, r1
-	bge _08068FA2
-_08068F96:
-	mov r0, r12
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-_08068FA2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8068EB4
-
-	thumb_func_start sub_8068FA8
-sub_8068FA8: @ 8068FA8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8069248
-	ldrh r0, [r4, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	movs r2, 0x1
-	bl SetObjectSubpriorityByZCoord
-	ldrh r1, [r4, 0x32]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_8068EB4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8068FA8
-
-	thumb_func_start sub_8068FD0
-sub_8068FD0: @ 8068FD0
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0x3F
-_08068FD6:
-	ldr r0, _08069004 @ =gSprites
-	adds r2, r5, r0
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08068FF6
-	ldr r1, [r2, 0x1C]
-	ldr r0, _08069008 @ =sub_8068FA8
-	cmp r1, r0
-	bne _08068FF6
-	adds r0, r2, 0
-	bl DestroySprite
-_08068FF6:
-	adds r5, 0x44
-	subs r4, 0x1
-	cmp r4, 0
-	bge _08068FD6
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069004: .4byte gSprites
-_08069008: .4byte sub_8068FA8
-	thumb_func_end sub_8068FD0
-
-	thumb_func_start sub_806900C
-sub_806900C: @ 806900C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	ldr r6, _08069040 @ =gSprites
-	movs r4, 0
-_08069018:
-	adds r2, r4, r6
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08069048
-	ldr r1, [r2, 0x1C]
-	ldr r0, _08069044 @ =sub_8068FA8
-	cmp r1, r0
-	bne _08069048
-	ldrh r0, [r2, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r5
-	bne _08069048
-	adds r0, r3, 0
-	b _08069052
-	.align 2, 0
-_08069040: .4byte gSprites
-_08069044: .4byte sub_8068FA8
-_08069048:
-	adds r4, 0x44
-	adds r3, 0x1
-	cmp r3, 0x3F
-	ble _08069018
-	movs r0, 0x40
-_08069052:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806900C
-
-	thumb_func_start sub_8069058
-sub_8069058: @ 8069058
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl sub_806900C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _0806908A
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08069090 @ =gSprites
-	adds r4, r0
-	adds r0, r5, 0
-	bl ObjectEventDirectionToImageAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-_0806908A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069090: .4byte gSprites
-	thumb_func_end sub_8069058
-
-	thumb_func_start sub_8069094
-sub_8069094: @ 8069094
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl sub_806900C
-	adds r1, r0, 0
-	cmp r1, 0x40
-	beq _0806911E
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080690F8 @ =gSprites
-	adds r4, r0, r1
-	adds r0, r5, 0
-	bl GetObjectEventGraphicsInfo
-	ldrh r3, [r4, 0x4]
-	lsls r3, 22
-	ldr r1, [r0, 0x10]
-	ldr r2, [r1, 0x4]
-	ldr r1, [r1]
-	str r1, [r4]
-	str r2, [r4, 0x4]
-	lsrs r3, 22
-	ldrh r2, [r4, 0x4]
-	ldr r1, _080690FC @ =0xfffffc00
-	ands r1, r2
-	orrs r1, r3
-	strh r1, [r4, 0x4]
-	ldrb r2, [r0, 0xC]
-	lsls r2, 28
-	lsrs r2, 24
-	ldrb r3, [r4, 0x5]
-	movs r1, 0xF
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r4, 0x5]
-	ldr r1, [r0, 0x1C]
-	str r1, [r4, 0xC]
-	ldr r1, [r0, 0x14]
-	cmp r1, 0
-	bne _08069100
-	str r1, [r4, 0x18]
-	adds r0, r4, 0
-	adds r0, 0x42
-	strb r1, [r0]
-	b _08069116
-	.align 2, 0
-_080690F8: .4byte gSprites
-_080690FC: .4byte 0xfffffc00
-_08069100:
-	adds r0, r4, 0
-	bl SetSubspriteTables
-	adds r2, r4, 0
-	adds r2, 0x42
-	ldrb r0, [r2]
-	movs r1, 0x3F
-	ands r1, r0
-	movs r0, 0x80
-	orrs r1, r0
-	strb r1, [r2]
-_08069116:
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnim
-_0806911E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8069094
-
-	thumb_func_start sub_8069124
-sub_8069124: @ 8069124
-	push {r4,lr}
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_806900C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r3, r2, 0
-	cmp r2, 0x40
-	beq _08069160
-	cmp r4, 0
-	beq _08069154
-	ldr r0, _08069150 @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0x1
-	strh r0, [r1, 0x32]
-	b _08069160
-	.align 2, 0
-_08069150: .4byte gSprites
-_08069154:
-	ldr r1, _08069168 @ =gSprites
-	lsls r0, r3, 4
-	adds r0, r3
-	lsls r0, 2
-	adds r0, r1
-	strh r4, [r0, 0x32]
-_08069160:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069168: .4byte gSprites
-	thumb_func_end sub_8069124
-
-	thumb_func_start sub_806916C
-sub_806916C: @ 806916C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_806900C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	bne _08069182
-	movs r0, 0
-	b _0806919A
-_08069182:
-	movs r3, 0
-	ldr r0, _080691A0 @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r2, 0x32
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	bne _08069198
-	movs r3, 0x1
-_08069198:
-	adds r0, r3, 0
-_0806919A:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080691A0: .4byte gSprites
-	thumb_func_end sub_806916C
-
-	thumb_func_start sub_80691A4
-sub_80691A4: @ 80691A4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl sub_806900C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	beq _080691CA
-	ldr r0, _080691D0 @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0
-	strh r4, [r1, 0x34]
-	strh r0, [r1, 0x36]
-_080691CA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080691D0: .4byte gSprites
-	thumb_func_end sub_80691A4
-
-	thumb_func_start sub_80691D4
-sub_80691D4: @ 80691D4
-	push {lr}
-	adds r2, r0, 0
-	movs r1, 0x36
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	beq _080691E6
-	cmp r0, 0x1
-	beq _080691EE
-	b _0806920C
-_080691E6:
-	strh r0, [r2, 0x26]
-	ldrh r0, [r2, 0x36]
-	adds r0, 0x1
-	strh r0, [r2, 0x36]
-_080691EE:
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x8
-	movs r3, 0
-	strh r0, [r2, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0xA0
-	negs r1, r1
-	cmp r0, r1
-	bne _0806920C
-	strh r3, [r2, 0x26]
-	movs r0, 0x1
-	strh r0, [r2, 0x32]
-	strh r3, [r2, 0x34]
-	strh r3, [r2, 0x36]
-_0806920C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80691D4
-
-	thumb_func_start sub_8069210
-sub_8069210: @ 8069210
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0x36
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _08069222
-	cmp r0, 0x1
-	beq _0806922C
-	b _0806923E
-_08069222:
-	ldr r0, _08069244 @ =0x0000ff60
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x36]
-	adds r0, 0x1
-	strh r0, [r1, 0x36]
-_0806922C:
-	ldrh r0, [r1, 0x26]
-	adds r0, 0x8
-	strh r0, [r1, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0
-	bne _0806923E
-	strh r0, [r1, 0x34]
-	strh r0, [r1, 0x36]
-_0806923E:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069244: .4byte 0x0000ff60
-	thumb_func_end sub_8069210
-
-	thumb_func_start sub_8069248
-sub_8069248: @ 8069248
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0x34
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	beq _08069264
-	cmp r0, 0x1
-	bgt _0806925E
-	cmp r0, 0
-	beq _08069284
-	b _08069274
-_0806925E:
-	cmp r0, 0x2
-	beq _0806926C
-	b _08069274
-_08069264:
-	adds r0, r1, 0
-	bl sub_8069210
-	b _08069284
-_0806926C:
-	adds r0, r1, 0
-	bl sub_80691D4
-	b _08069284
-_08069274:
-	movs r0, 0
-	strh r0, [r1, 0x34]
-	ldr r0, _08069288 @ =gUnknown_83A720C	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c"
-	ldr r1, _0806928C @ =0x00003413
-	ldr r2, _08069290 @ =gUnknown_83A7240	"0"
-	movs r3, 0x1
-	bl AGBAssert
-_08069284:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069288: .4byte gUnknown_83A720C
-_0806928C: .4byte 0x00003413
-_08069290: .4byte gUnknown_83A7240
-	thumb_func_end sub_8069248
-
-	thumb_func_start sub_8069294
-sub_8069294: @ 8069294
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_806900C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	beq _080692B8
-	ldr r0, _080692BC @ =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r2, 0x34
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080692C0
-_080692B8:
-	movs r0, 0
-	b _080692C2
-	.align 2, 0
-_080692BC: .4byte gSprites
-_080692C0:
-	movs r0, 0x1
-_080692C2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8069294
-
-	thumb_func_start oe_exec_and_other_stuff
-oe_exec_and_other_stuff: @ 80692C8
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _080692EC @ =gFieldEffectArguments
-	adds r2, r1, 0x4
-	adds r3, r1, 0
-	adds r3, 0x8
-	bl ObjectEventGetLocalIdAndMap
-	adds r0, r4, 0
-	bl FieldEffectStart
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080692EC: .4byte gFieldEffectArguments
-	thumb_func_end oe_exec_and_other_stuff
-
-	thumb_func_start DoShadowFieldEffect
-DoShadowFieldEffect: @ 80692F0
-	push {lr}
-	adds r1, r0, 0
-	ldrb r2, [r1, 0x2]
-	lsls r0, r2, 25
-	cmp r0, 0
-	blt _08069308
-	movs r0, 0x40
-	orrs r0, r2
-	strb r0, [r1, 0x2]
-	movs r0, 0x3
-	bl oe_exec_and_other_stuff
-_08069308:
-	pop {r0}
-	bx r0
-	thumb_func_end DoShadowFieldEffect
-
-	thumb_func_start DoRippleFieldEffect
-DoRippleFieldEffect: @ 806930C
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x5]
-	bl GetObjectEventGraphicsInfo
-	ldr r2, _08069344 @ =gFieldEffectArguments
-	movs r3, 0x20
-	ldrsh r1, [r4, r3]
-	str r1, [r2]
-	movs r3, 0x22
-	ldrsh r1, [r4, r3]
-	ldrh r0, [r0, 0xA]
-	lsls r0, 16
-	asrs r0, 17
-	adds r1, r0
-	subs r1, 0x2
-	str r1, [r2, 0x4]
-	movs r0, 0x97
-	str r0, [r2, 0x8]
-	movs r0, 0x3
-	str r0, [r2, 0xC]
-	movs r0, 0x5
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08069344: .4byte gFieldEffectArguments
-	thumb_func_end DoRippleFieldEffect
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 30af8949b..f585a60bc 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -1645,7 +1645,7 @@ sprite_new: @ 805E9F8
 	adds r0, r5, 0
 	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
-	ldr r1, _0805EB38 @ =sub_8068FA8
+	ldr r1, _0805EB38 @ =UpdateObjectEventSpriteSubpriorityAndVisibility
 	add r3, sp, 0x1C
 	adds r0, r5, 0
 	mov r2, sp
@@ -1769,7 +1769,7 @@ _0805EB24:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805EB38: .4byte sub_8068FA8
+_0805EB38: .4byte UpdateObjectEventSpriteSubpriorityAndVisibility
 _0805EB3C: .4byte 0x0000ffff
 _0805EB40: .4byte gSprites
 	thumb_func_end sprite_new
@@ -18285,7 +18285,7 @@ sub_8066108: @ 8066108
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl sub_8068E9C
+	bl SpriteAnimEnded
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806611C
@@ -19637,7 +19637,7 @@ sub_8066A54: @ 8066A54
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl sub_8068E9C
+	bl SpriteAnimEnded
 	lsls r0, 24
 	cmp r0, 0
 	beq _08066A70
@@ -19707,7 +19707,7 @@ sub_8066AD0: @ 8066AD0
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl sub_8068E9C
+	bl SpriteAnimEnded
 	lsls r0, 24
 	cmp r0, 0
 	beq _08066AEC
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 83f9a5700..b74e60d1f 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1330,10 +1330,10 @@ _0806D2F0:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D308
-	ldr r0, _0806D304 @ =EventScript_1C549C
+	ldr r0, _0806D304 @ =TrainerTower_EventScript_ShowTime
 	b _0806D53E
 	.align 2, 0
-_0806D304: .4byte EventScript_1C549C
+_0806D304: .4byte TrainerTower_EventScript_ShowTime
 _0806D308:
 	adds r0, r4, 0
 	adds r1, r5, 0
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 2797accf4..db64b77db 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -951,7 +951,7 @@ _080DB4C0:
 _080DB4CE:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldrh r1, [r5, 0x2E]
 	lsls r1, 24
 	lsrs r1, 24
@@ -1294,7 +1294,7 @@ _080DB750:
 _080DB770:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldrh r1, [r5, 0x2E]
 	lsls r1, 24
 	lsrs r1, 24
@@ -1564,7 +1564,7 @@ _080DB94E:
 	lsls r1, 29
 	lsrs r1, 31
 	adds r0, r4, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 _080DB98E:
 	add sp, 0x4
 	pop {r3}
@@ -1781,7 +1781,7 @@ sub_80DBB18: @ 80DBB18
 _080DBB2E:
 	adds r0, r1, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80DBB18
@@ -1810,7 +1810,7 @@ sub_80DBB3C: @ 80DBB3C
 	lsls r1, 29
 	lsrs r1, 31
 	adds r0, r4, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	movs r1, 0x30
 	ldrsh r0, [r4, r1]
 	cmp r0, 0x38
@@ -1966,7 +1966,7 @@ _080DBC66:
 	strh r0, [r4, 0x22]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 _080DBCA6:
 	add sp, 0x4
 	pop {r4}
@@ -2233,7 +2233,7 @@ _080DBE98:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldr r1, [r5, 0x10]
 	ldr r0, [r4, 0x34]
 	cmp r1, r0
@@ -2461,7 +2461,7 @@ _080DC03C:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 _080DC080:
 	add sp, 0x4
 	pop {r4,r5}
@@ -2889,7 +2889,7 @@ sub_80DC3A8: @ 80DC3A8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	adds r0, r4, 0
 	adds r0, 0x3F
 	ldrb r1, [r0]
@@ -3627,7 +3627,7 @@ _080DC8F6:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 _080DC926:
 	add sp, 0x4
 	pop {r4-r6}
@@ -3706,7 +3706,7 @@ sub_80DC99C: @ 80DC99C
 	strh r1, [r4, 0x22]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldrh r1, [r4, 0x3E]
 	ldr r0, _080DC9D8 @ =0x00001004
 	ands r0, r1
@@ -4163,7 +4163,7 @@ sub_80DCCE0: @ 80DCCE0
 _080DCCFE:
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldrh r0, [r4, 0x2E]
 	lsls r0, 24
 	lsrs r0, 24
@@ -4195,7 +4195,7 @@ sub_80DCD1C: @ 80DCD1C
 _080DCD3A:
 	adds r0, r2, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 _080DCD42:
 	pop {r0}
 	bx r0
diff --git a/asm/librfu_intr.s b/asm/librfu_intr.s
deleted file mode 100644
index 2cc761554..000000000
--- a/asm/librfu_intr.s
+++ /dev/null
@@ -1,697 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	arm_func_start IntrSIO32
-IntrSIO32: @ 81DFC50
-	mov r12, sp
-	stmdb sp!, {r11,r12,lr,pc}
-	ldr r3, _081DFCB0 @ =gSTWIStatus
-	ldr r0, [r3]
-	ldr r2, [r0]
-	sub r11, r12, 0x4
-	cmp r2, 0xA
-	bne _081DFC8C
-	ldr r0, [r0, 0x20]
-	cmp r0, 0
-	ldmdbeq r11, {r11,sp,lr}
-	bxeq lr
-	bl Callback_Dummy_ID
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-_081DFC8C:
-	ldrb r3, [r0, 0x14]
-	cmp r3, 0x1
-	bne _081DFCA4
-	bl sio32intr_clock_master
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-_081DFCA4:
-	bl sio32intr_clock_slave
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-	.align 2, 0
-_081DFCB0: .4byte gSTWIStatus
-	arm_func_end IntrSIO32
-
-	arm_func_start sio32intr_clock_master
-sio32intr_clock_master: @ 81DFCB4
-	mov r12, sp
-	stmdb sp!, {r4-r6,r11,r12,lr,pc}
-	mov r0, 0x50
-	sub r11, r12, 0x4
-	bl STWI_set_timer_in_RAM
-	mov r4, 0x120
-	ldr r2, _081DFF28 @ =gSTWIStatus
-	add r4, r4, 0x4000000
-	ldr lr, [r4]
-	ldr r12, [r2]
-	ldr r3, [r12]
-	mov r6, r2
-	cmp r3, 0
-	bne _081DFD34
-	cmp lr, 0x80000000
-	bne _081DFDB4
-	ldrb r2, [r12, 0x5]
-	ldrb r3, [r12, 0x4]
-	cmp r2, r3
-	bhi _081DFD24
-	ldr r3, [r12, 0x24]
-	mov r1, r2
-	ldr r2, [r3, r1, lsl 2]
-	str r2, [r4]
-	ldrb r3, [r12, 0x5]
-	add r3, r3, 0x1
-	strb r3, [r12, 0x5]
-	b _081DFE10
-_081DFD24:
-	mov r3, 0x1
-	str r3, [r12]
-	str lr, [r4]
-	b _081DFE10
-_081DFD34:
-	ldr r3, [r12]
-	cmp r3, 0x1
-	bne _081DFDC4
-	mov r3, 0x99000000
-	add r3, r3, 0x660000
-	mov r5, 0x80000000
-	and r2, lr, r5, asr 15
-	cmp r2, r3
-	bne _081DFDB4
-	mov r3, 0
-	strb r3, [r12, 0x8]
-	ldr r1, [r6]
-	ldrb r0, [r1, 0x8]
-	ldr r2, [r1, 0x28]
-	str lr, [r2, r0, lsl 2]
-	ldrb r3, [r1, 0x8]
-	add r3, r3, 0x1
-	strb r3, [r1, 0x8]
-	ldr r2, [r6]
-	strb lr, [r2, 0x9]
-	ldr r3, [r6]
-	mov r2, lr, lsr 8
-	strb r2, [r3, 0x7]
-	ldr r1, [r6]
-	ldrb r2, [r1, 0x7]
-	ldrb r3, [r1, 0x8]
-	cmp r2, r3
-	bcc _081DFDFC
-	mov r3, 0x2
-	str r3, [r1]
-	str r5, [r4]
-	b _081DFE10
-_081DFDB4:
-	bl STWI_stop_timer_in_RAM
-	mov r0, 0x82
-	bl STWI_set_timer_in_RAM
-	b _081DFF3C
-_081DFDC4:
-	ldr r3, [r12]
-	cmp r3, 0x2
-	bne _081DFE10
-	ldrb r1, [r12, 0x8]
-	ldr r2, [r12, 0x28]
-	str lr, [r2, r1, lsl 2]
-	ldrb r3, [r12, 0x8]
-	add r3, r3, 0x1
-	strb r3, [r12, 0x8]
-	ldr r1, [r6]
-	ldrb r2, [r1, 0x7]
-	ldrb r3, [r1, 0x8]
-	cmp r2, r3
-	bcs _081DFE08
-_081DFDFC:
-	mov r3, 0x3
-	str r3, [r1]
-	b _081DFE10
-_081DFE08:
-	mov r3, 0x80000000
-	str r3, [r4]
-_081DFE10:
-	mov r0, 0x1
-	bl handshake_wait
-	mov r0, r0, lsl 16
-	cmp r0, 0x10000
-	beq _081DFF3C
-	mov r4, 0x128
-	add r4, r4, 0x4000000
-	mov r5, 0x5000
-	add r3, r5, 0xB
-	strh r3, [r4]
-	mov r0, 0
-	bl handshake_wait
-	mov r0, r0, lsl 16
-	cmp r0, 0x10000
-	beq _081DFF3C
-	bl STWI_stop_timer_in_RAM
-	ldr r1, [r6]
-	ldr r0, [r1]
-	cmp r0, 0x3
-	bne _081DFF2C
-	ldrb r3, [r1, 0x9]
-	cmp r3, 0xA5
-	cmpne r3, 0xA7
-	beq _081DFE84
-	and r3, r3, 0xFF
-	cmp r3, 0xB5
-	beq _081DFE84
-	cmp r3, 0xB7
-	bne _081DFECC
-_081DFE84:
-	mov r1, 0x120
-	add r1, r1, 0x4000000
-	mov r12, 0x128
-	add r12, r12, 0x4000000
-	ldr r0, [r6]
-	mov r3, 0
-	strb r3, [r0, 0x14]
-	mov r2, 0x80000000
-	str r2, [r1]
-	add r3, r3, 0x5000
-	add r2, r3, 0x2
-	strh r2, [r12]
-	add r3, r3, 0x82
-	strh r3, [r12]
-	ldr r2, [r6]
-	mov r3, 0x5
-	str r3, [r2]
-	b _081DFEFC
-_081DFECC:
-	cmp r3, 0xEE
-	bne _081DFEEC
-	add r3, r5, 0x3
-	strh r3, [r4]
-	mov r2, 0x4
-	str r2, [r1]
-	strh r0, [r1, 0x12]
-	b _081DFEFC
-_081DFEEC:
-	add r3, r5, 0x3
-	strh r3, [r4]
-	mov r2, 0x4
-	str r2, [r1]
-_081DFEFC:
-	ldr r2, [r6]
-	mov r3, 0
-	strb r3, [r2, 0x2C]
-	ldr r0, [r6]
-	ldr r2, [r0, 0x18]
-	cmp r2, r3
-	beq _081DFF3C
-	ldrh r1, [r0, 0x12]
-	ldrb r0, [r0, 0x6]
-	bl Callback_Dummy_M
-	b _081DFF3C
-	.align 2, 0
-_081DFF28: .4byte gSTWIStatus
-_081DFF2C:
-	add r3, r5, 0x3
-	strh r3, [r4]
-	add r2, r5, 0x83
-	strh r2, [r4]
-_081DFF3C:
-	ldmdb r11, {r4-r6,r11,sp,lr}
-	bx lr
-	arm_func_end sio32intr_clock_master
-
-	arm_func_start sio32intr_clock_slave
-sio32intr_clock_slave: @ 81DFF44
-	mov r12, sp
-	stmdb sp!, {r4-r6,r11,r12,lr,pc}
-	ldr r4, _081E02F0 @ =gSTWIStatus
-	mov r0, 0x64
-	ldr r3, [r4]
-	mov r6, 0
-	strb r6, [r3, 0x10]
-	sub r11, r12, 0x4
-	bl STWI_set_timer_in_RAM
-	mov r0, r6
-	bl handshake_wait
-	mov r0, r0, lsl 16
-	cmp r0, 0x10000
-	mov r5, r4
-	beq _081E0348
-	mov r3, 0x128
-	add r3, r3, 0x4000000
-	mov r2, 0x5000
-	add r2, r2, 0xA
-	strh r2, [r3]
-	mov lr, 0x120
-	ldr r0, [r5]
-	add lr, lr, 0x4000000
-	ldr r12, [lr]
-	ldr r3, [r0]
-	cmp r3, 0x5
-	bne _081E0074
-	ldr r3, [r0, 0x28]
-	mov r4, 0x1
-	mov r0, 0x99000000
-	str r12, [r3]
-	add r0, r0, 0x660000
-	ldr r2, [r5]
-	mov r3, r0, lsr 16
-	strb r4, [r2, 0x5]
-	cmp r3, r12, lsr 16
-	bne _081E01C0
-	ldr r3, [r5]
-	mov r2, r12, lsr 8
-	strb r2, [r3, 0x4]
-	ldr r2, [r5]
-	strb r12, [r2, 0x6]
-	ldr r1, [r5]
-	ldrb r3, [r1, 0x4]
-	cmp r3, r6
-	bne _081E0058
-	ldrb r2, [r1, 0x6]
-	sub r3, r2, 0x27
-	cmp r2, 0x36
-	cmpne r3, 0x2
-	bhi _081E002C
-	add r3, r2, 0x80
-	strb r3, [r1, 0x9]
-	ldr r2, [r5]
-	ldrb r3, [r2, 0x9]
-	ldr r1, [r2, 0x24]
-	add r3, r3, r0
-	b _081E00DC
-_081E002C:
-	ldr r2, [r1, 0x24]
-	ldr r3, _081E02F4 @ =0x996601ee
-	str r3, [r2]
-	ldr r2, [r5]
-	ldrb r3, [r2, 0x6]
-	sub r3, r3, 0x10
-	cmp r3, 0x2D
-	bhi _081E0114
-	ldr r3, [r2, 0x24]
-	str r4, [r3, 0x4]
-	b _081E0120
-_081E0058:
-	mov r3, 0x80000000
-	str r3, [lr]
-	strb r4, [r1, 0x5]
-	ldr r2, [r5]
-	add r3, r3, 0x80000006
-	str r3, [r2]
-	b _081E01D0
-_081E0074:
-	ldr r3, [r0]
-	cmp r3, 0x6
-	bne _081E0174
-	ldrb r1, [r0, 0x5]
-	ldr r2, [r0, 0x28]
-	str r12, [r2, r1, lsl 2]
-	ldrb r3, [r0, 0x5]
-	add r3, r3, 0x1
-	strb r3, [r0, 0x5]
-	ldr r1, [r5]
-	ldrb r2, [r1, 0x4]
-	ldrb r3, [r1, 0x5]
-	cmp r2, r3
-	bcs _081E0168
-	ldrb r2, [r1, 0x6]
-	sub r3, r2, 0x28
-	cmp r2, 0x36
-	cmpne r3, 0x1
-	bhi _081E00EC
-	add r3, r2, 0x80
-	strb r3, [r1, 0x9]
-	ldr r2, [r5]
-	ldrb r3, [r2, 0x9]
-	ldr r1, [r2, 0x24]
-	orr r3, r3, 0x99000000
-	orr r3, r3, 0x660000
-_081E00DC:
-	str r3, [r1]
-	ldr r2, [r5]
-	strb r6, [r2, 0x7]
-	b _081E0138
-_081E00EC:
-	ldr r2, [r1, 0x24]
-	ldr r3, _081E02F4 @ =0x996601ee
-	str r3, [r2]
-	ldr r2, [r5]
-	ldrb r3, [r2, 0x6]
-	sub r3, r3, 0x10
-	cmp r3, 0x2D
-	ldrls r2, [r2, 0x24]
-	movls r3, 0x1
-	bls _081E011C
-_081E0114:
-	ldr r2, [r2, 0x24]
-	mov r3, 0x2
-_081E011C:
-	str r3, [r2, 0x4]
-_081E0120:
-	ldr r2, [r5]
-	mov r3, 0x1
-	strb r3, [r2, 0x7]
-	ldr r1, [r5]
-	add r3, r3, 0x2
-	strh r3, [r1, 0x12]
-_081E0138:
-	ldr r0, [r5]
-	ldr r2, [r0, 0x24]
-	mov r3, 0x120
-	ldr r1, [r2]
-	add r3, r3, 0x4000000
-	str r1, [r3]
-	mov r2, 0x1
-	strb r2, [r0, 0x8]
-	ldr r1, [r5]
-	mov r3, 0x7
-	str r3, [r1]
-	b _081E01D0
-_081E0168:
-	mov r3, 0x80000000
-	str r3, [lr]
-	b _081E01D0
-_081E0174:
-	ldr r3, [r0]
-	cmp r3, 0x7
-	bne _081E01D0
-	cmp r12, 0x80000000
-	bne _081E01C0
-	ldrb r2, [r0, 0x7]
-	ldrb r3, [r0, 0x8]
-	cmp r2, r3
-	movcc r3, 0x8
-	strcc r3, [r0]
-	bcc _081E01D0
-	ldrb r1, [r0, 0x8]
-	ldr r3, [r0, 0x24]
-	ldr r2, [r3, r1, lsl 2]
-	str r2, [lr]
-	ldrb r3, [r0, 0x8]
-	add r3, r3, 0x1
-	strb r3, [r0, 0x8]
-	b _081E01D0
-_081E01C0:
-	bl STWI_stop_timer_in_RAM
-	mov r0, 0x64
-	bl STWI_set_timer_in_RAM
-	b _081E0348
-_081E01D0:
-	mov r0, 0x1
-	bl handshake_wait
-	mov r0, r0, lsl 16
-	cmp r0, 0x10000
-	beq _081E0348
-	mov r6, r5
-	ldr r3, [r6]
-	ldr r2, [r3]
-	cmp r2, 0x8
-	bne _081E0298
-	mov r4, 0x128
-	add r4, r4, 0x4000000
-	mov r3, 0x5000
-	add r3, r3, 0x2
-	strh r3, [r4]
-	bl STWI_stop_timer_in_RAM
-	ldr r0, [r6]
-	ldrh r3, [r0, 0x12]
-	cmp r3, 0x3
-	bne _081E0244
-	bl STWI_init_slave
-	ldr r3, [r6]
-	ldr r1, [r3, 0x1C]
-	cmp r1, 0
-	beq _081E0348
-	mov r0, 0x1EC
-	add r0, r0, 0x2
-	bl Callback_Dummy_S
-	b _081E0348
-_081E0244:
-	mov r3, 0x120
-	add r3, r3, 0x4000000
-	mov r1, 0
-	str r1, [r3]
-	mov r2, 0x5000
-	strh r1, [r4]
-	add r2, r2, 0x3
-	strh r2, [r4]
-	mov r3, 0x1
-	strb r3, [r0, 0x14]
-	ldr r0, [r5]
-	ldr r2, [r0, 0x1C]
-	str r1, [r0]
-	cmp r2, r1
-	beq _081E0348
-	ldrb r3, [r0, 0x4]
-	ldrb r0, [r0, 0x6]
-	mov r1, r2
-	orr r0, r0, r3, lsl 8
-	bl Callback_Dummy_S
-	b _081E0348
-_081E0298:
-	mov r3, 0x208
-	add r3, r3, 0x4000000
-	mov r2, 0
-	strh r2, [r3]
-	mov r1, 0x100
-	add r2, r1, 0x4000002
-	ldrh r3, [r2]
-	tst r3, 0x80
-	beq _081E031C
-	ldrh r3, [r2]
-	tst r3, 0x3
-	bne _081E02F8
-	mov r2, 0xFF00
-	add r1, r1, 0x4000000
-	ldrh r3, [r1]
-	add r2, r2, 0x9B
-	cmp r3, r2
-	bls _081E031C
-_081E02E0:
-	ldrh r3, [r1]
-	cmp r3, r2
-	bhi _081E02E0
-	b _081E031C
-	.align 2, 0
-_081E02F0: .4byte gSTWIStatus
-_081E02F4: .4byte 0x996601ee
-_081E02F8:
-	mov r2, 0xFF00
-	add r1, r1, 0x4000000
-	ldrh r3, [r1]
-	add r2, r2, 0xFE
-	cmp r3, r2
-	bls _081E031C
-_081E0310:
-	ldrh r3, [r1]
-	cmp r3, r2
-	bhi _081E0310
-_081E031C:
-	mov r1, 0x128
-	add r1, r1, 0x4000000
-	mov r0, 0x208
-	add r0, r0, 0x4000000
-	mov r3, 0x5000
-	add r2, r3, 0x2
-	strh r2, [r1]
-	add r3, r3, 0x82
-	strh r3, [r1]
-	mov r2, 0x1
-	strh r2, [r0]
-_081E0348:
-	ldmdb r11, {r4-r6,r11,sp,lr}
-	bx lr
-	arm_func_end sio32intr_clock_slave
-
-	arm_func_start handshake_wait
-handshake_wait: @ 81E0350
-	mov r12, sp
-	stmdb sp!, {r11,r12,lr,pc}
-	mov r1, 0x128
-	add r1, r1, 0x4000000
-	mov r0, r0, lsl 16
-	ldr r2, _081E03B4 @ =gSTWIStatus
-	sub r11, r12, 0x4
-	mov lr, r0, lsr 14
-	ldr r12, [r2]
-_081E0374:
-	ldrb r3, [r12, 0x10]
-	and r0, r3, 0xFF
-	cmp r0, 0x1
-	beq _081E03A0
-	ldrh r3, [r1]
-	and r3, r3, 0x4
-	cmp r3, lr
-	bne _081E0374
-	mov r0, 0
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-_081E03A0:
-	ldr r2, [r2]
-	mov r3, 0
-	strb r3, [r2, 0x10]
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-	.align 2, 0
-_081E03B4: .4byte gSTWIStatus
-	arm_func_end handshake_wait
-
-	arm_func_start STWI_set_timer_in_RAM
-STWI_set_timer_in_RAM: @ 81E03B8
-	mov r12, sp
-	stmdb sp!, {r4,r5,r11,r12,lr,pc}
-	mov r1, 0x208
-	add r1, r1, 0x4000000
-	mov r3, 0
-	sub r11, r12, 0x4
-	ldr r12, _081E0470 @ =gSTWIStatus
-	and lr, r0, 0xFF
-	ldr r2, [r12]
-	cmp lr, 0x50
-	ldrb r0, [r2, 0xA]
-	mov r4, r12
-	mov r2, lr
-	strh r3, [r1]
-	mov r0, r0, lsl 2
-	add r3, r3, 0x100
-	add r1, r3, 0x4000000
-	add r3, r3, 0x4000002
-	add r5, r0, r3
-	beq _081E0440
-	bgt _081E0418
-	cmp lr, 0x32
-	beq _081E042C
-	b _081E048C
-_081E0418:
-	cmp r2, 0x64
-	beq _081E0458
-	cmp r2, 0x82
-	beq _081E0474
-	b _081E048C
-_081E042C:
-	mvn r3, 0x334
-	strh r3, [r0, r1]
-	ldr r2, [r4]
-	mov r3, 0x1
-	b _081E0488
-_081E0440:
-	mov r3, 0xAE000000
-	mov r3, r3, asr 20
-	strh r3, [r0, r1]
-	ldr r2, [r4]
-	mov r3, 0x2
-	b _081E0488
-_081E0458:
-	mvn r3, 0x660
-	sub r3, r3, 0x9
-	strh r3, [r0, r1]
-	ldr r2, [r4]
-	mov r3, 0x3
-	b _081E0488
-	.align 2, 0
-_081E0470: .4byte gSTWIStatus
-_081E0474:
-	mvn r3, 0x850
-	sub r3, r3, 0x2
-	strh r3, [r0, r1]
-	ldr r2, [r4]
-	mov r3, 0x4
-_081E0488:
-	str r3, [r2, 0xC]
-_081E048C:
-	mov r12, 0x200
-	add r12, r12, 0x4000002
-	mov r3, 0xC3
-	strh r3, [r5]
-	mov r1, 0x208
-	ldr r2, [r4]
-	add r1, r1, 0x4000000
-	ldrb r0, [r2, 0xA]
-	sub r3, r3, 0xBB
-	mov r3, r3, lsl r0
-	strh r3, [r12]
-	mov r2, 0x1
-	strh r2, [r1]
-	ldmdb r11, {r4,r5,r11,sp,lr}
-	bx lr
-	arm_func_end STWI_set_timer_in_RAM
-
-	arm_func_start STWI_stop_timer_in_RAM
-STWI_stop_timer_in_RAM: @ 81E04C8
-	mov r12, sp
-	stmdb sp!, {r11,r12,lr,pc}
-	mov r1, 0x100
-	ldr lr, _081E0514 @ =gSTWIStatus
-	add r0, r1, 0x4000000
-	ldr r2, [lr]
-	sub r11, r12, 0x4
-	ldrb r3, [r2, 0xA]
-	mov r12, 0
-	str r12, [r2, 0xC]
-	mov r3, r3, lsl 2
-	strh r12, [r3, r0]
-	ldr r2, [lr]
-	ldrb r3, [r2, 0xA]
-	add r1, r1, 0x4000002
-	mov r3, r3, lsl 2
-	strh r12, [r3, r1]
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-	.align 2, 0
-_081E0514: .4byte gSTWIStatus
-	arm_func_end STWI_stop_timer_in_RAM
-
-	arm_func_start STWI_init_slave
-STWI_init_slave: @ 81E0518
-	mov r12, sp
-	stmdb sp!, {r11,r12,lr,pc}
-	ldr r0, _081E05A0 @ =gSTWIStatus
-	ldr r2, [r0]
-	mov r3, 0x5
-	str r3, [r2]
-	mov r1, 0
-	strb r1, [r2, 0x14]
-	ldr r3, [r0]
-	strb r1, [r3, 0x4]
-	ldr r2, [r0]
-	strb r1, [r2, 0x5]
-	ldr r3, [r0]
-	strb r1, [r3, 0x6]
-	ldr r2, [r0]
-	strb r1, [r2, 0x7]
-	ldr r3, [r0]
-	strb r1, [r3, 0x8]
-	ldr r2, [r0]
-	strb r1, [r2, 0x9]
-	ldr r3, [r0]
-	str r1, [r3, 0xC]
-	sub r11, r12, 0x4
-	strb r1, [r3, 0x10]
-	mov r2, 0x128
-	ldr r12, [r0]
-	add r2, r2, 0x4000000
-	strh r1, [r12, 0x12]
-	mov r3, 0x5000
-	strb r1, [r12, 0x15]
-	add r3, r3, 0x82
-	strh r3, [r2]
-	ldmdb r11, {r11,sp,lr}
-	bx lr
-	.align 2, 0
-_081E05A0: .4byte gSTWIStatus
-	arm_func_end STWI_init_slave
-
-	arm_func_start Callback_Dummy_M
-Callback_Dummy_M: @ 81E05A4
-	bx r2
-	arm_func_end Callback_Dummy_M
-
-	arm_func_start Callback_Dummy_S
-Callback_Dummy_S: @ 81E05A8
-	bx r1
-	arm_func_end Callback_Dummy_S
-
-	arm_func_start Callback_Dummy_ID
-Callback_Dummy_ID: @ 81E05AC
-	bx r0
-	arm_func_end Callback_Dummy_ID
diff --git a/asm/macros.inc b/asm/macros.inc
index ffbe3db29..0e53dc2a2 100644
--- a/asm/macros.inc
+++ b/asm/macros.inc
@@ -5,6 +5,7 @@
 	.include "asm/macros/ec.inc"
 	.include "asm/macros/map.inc"
 	.include "asm/macros/m4a.inc"
+	.include "asm/macros/trainer_tower.inc"
 
 	.macro region_map_location x, y, width, height, name
 	.byte \x
diff --git a/asm/macros/trainer_tower.inc b/asm/macros/trainer_tower.inc
new file mode 100644
index 000000000..8e5f606ee
--- /dev/null
+++ b/asm/macros/trainer_tower.inc
@@ -0,0 +1,133 @@
+	@ Sets NPC gfx and the floor layout depending on current challenge and floor
+	.macro ttower_initfloor
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_INIT_FLOOR
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Buffers the opponents battle speech to gStringVar4. speech is any TRAINER_TOWER_TEXT_*.
+	.macro ttower_getspeech speech:req, trainer=0xFF
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
+	setvar VAR_0x8005, \speech
+	.if \trainer >= VARS_START && \trainer != 0xFF
+	copyvar VAR_0x8006, \trainer
+	.elseif \trainer != 0xFF
+	setvar VAR_0x8006, \trainer
+	.endif
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Starts a trainer tower battle. VAR_0x8005 is unused
+	.macro ttower_dobattle
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_DO_BATTLE
+	setvar VAR_0x8005, 0
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the current challenge type (CHALLENGE_TYPE_*). Mixed challenges use different types for each floor. If VAR_0x8005 is != FALSE, does nothing
+	.macro ttower_getchallengetype
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE
+	setvar VAR_0x8005, FALSE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Adds 1 to the number of floors cleared (all trainers on floor defeated)
+	.macro ttower_clearedfloor
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLEARED_FLOOR
+	special CallTrainerTowerFunc
+	.endm
+
+	@ TRUE if the trainers on this floor were already beaten, FALSE otherwise
+	.macro ttower_isfloorcleared
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Initializes the Trainer Tower challenge and starts the timer
+	.macro ttower_startchallenge
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_START_CHALLENGE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ 0 if not spoken to yet, 1 if spoken to but not received prize, 2 if received prize
+	.macro ttower_getownerstate
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_OWNER_STATE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Tries to give prize. 0 if given successfully, 1 if no room for prize, 2 if giving prize should be skipped
+	.macro ttower_giveprize
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GIVE_PRIZE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Checks the final challenge time. 0 if new record, 1 if not, 2 if time has already been checked
+	.macro ttower_checkfinaltime
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_FINAL_TIME
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Resumes the challenge timer (or starts, if the timer is 0)
+	.macro ttower_resumetimer
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_RESUME_TIMER
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Sets that the player lost the challenge
+	.macro ttower_setlost
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SET_LOST
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the status of the current Trainer Tower challenge (CHALLENGE_STATUS_*)
+	.macro ttower_getchallengestatus
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Buffers the current challenge time (min in gStringVar1, sec in gStringVar2, fraction sec in gStringVar3)
+	.macro ttower_gettime
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_TIME
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead
+	.macro ttower_showresults
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Unused. See above
+	.macro ttower_closeresults
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLOSE_RESULTS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the eligibility of the players party for a double battle (using GetMonsStateToDoubles)
+	.macro ttower_checkdoubles
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_DOUBLES
+	special CallTrainerTowerFunc
+	.endm
+
+	@ For the unused E-Reader challenges, gets the number of floors used. Otherwise returns FALSE (all floors used)
+	.macro ttower_getnumfloors
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_NUM_FLOORS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Dummied, always returns FALSE
+	.macro ttower_shouldexit
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Plays the encounter music for the trainer number in VAR_TEMP_1
+	.macro ttower_encountermusic
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC
+	special CallTrainerTowerFunc
+	.endm
+
+	@ TRUE if the player reached the Battle Tower owner, FALSE otherwise
+	.macro ttower_getbeatchallenge
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE
+	special CallTrainerTowerFunc
+	.endm
diff --git a/asm/overworld.s b/asm/overworld.s
index 5c904c607..5b3c01652 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -1718,7 +1718,7 @@ sub_8055864: @ 8055864
 	bl sav1_reset_battle_music_maybe
 	bl mapheader_run_script_with_tag_x3
 	bl TryRegenerateRenewableHiddenItems
-	bl not_trainer_hill_battle_pyramid
+	bl InitMap
 	ldr r4, _0805591C @ =gMapHeader
 	ldr r0, [r4]
 	bl copy_map_tileset2_to_vram_2
@@ -1798,7 +1798,7 @@ _08055974:
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
 	bl sub_8110920
-	bl not_trainer_hill_battle_pyramid
+	bl InitMap
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8
 	bl sub_8110920
 	bl sub_8111708
 	bl set_current_map_header_from_sav1
-	bl not_trainer_hill_battle_pyramid
+	bl InitMap
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -2597,7 +2597,7 @@ GetMapMusicFadeoutSpeed: @ 8055F68
 	push {lr}
 	bl warp1_get_mapheader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_8_or_9
+	bl IsMapTypeIndoors
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2981,8 +2981,8 @@ _08056218:
 	bx r1
 	thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
 
-	thumb_func_start is_light_level_8_or_9
-is_light_level_8_or_9: @ 805621C
+	thumb_func_start IsMapTypeIndoors
+IsMapTypeIndoors: @ 805621C
 	push {lr}
 	lsls r0, 24
 	movs r1, 0xF8
@@ -2998,10 +2998,10 @@ _08056230:
 _08056232:
 	pop {r1}
 	bx r1
-	thumb_func_end is_light_level_8_or_9
+	thumb_func_end IsMapTypeIndoors
 
-	thumb_func_start sav1_saved_warp2_map_get_name
-sav1_saved_warp2_map_get_name: @ 8056238
+	thumb_func_start GetSavedWarpRegionMapSectionId
+GetSavedWarpRegionMapSectionId: @ 8056238
 	push {lr}
 	ldr r0, _0805625C @ =gSaveBlock1Ptr
 	ldr r1, [r0]
@@ -3020,7 +3020,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
 	bx r1
 	.align 2, 0
 _0805625C: .4byte gSaveBlock1Ptr
-	thumb_func_end sav1_saved_warp2_map_get_name
+	thumb_func_end GetSavedWarpRegionMapSectionId
 
 	thumb_func_start GetCurrentRegionMapSectionId
 GetCurrentRegionMapSectionId: @ 8056260
@@ -3044,8 +3044,8 @@ GetCurrentRegionMapSectionId: @ 8056260
 _08056284: .4byte gSaveBlock1Ptr
 	thumb_func_end GetCurrentRegionMapSectionId
 
-	thumb_func_start sav1_map_get_battletype
-sav1_map_get_battletype: @ 8056288
+	thumb_func_start GetCurrentMapBattleScene
+GetCurrentMapBattleScene: @ 8056288
 	push {lr}
 	ldr r0, _080562AC @ =gSaveBlock1Ptr
 	ldr r1, [r0]
@@ -3064,10 +3064,10 @@ sav1_map_get_battletype: @ 8056288
 	bx r1
 	.align 2, 0
 _080562AC: .4byte gSaveBlock1Ptr
-	thumb_func_end sav1_map_get_battletype
+	thumb_func_end GetCurrentMapBattleScene
 
-	thumb_func_start sub_80562B0
-sub_80562B0: @ 80562B0
+	thumb_func_start InitOverworldBgs
+InitOverworldBgs: @ 80562B0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -3130,7 +3130,7 @@ _08056344: .4byte gUnknown_826D320
 _08056348: .4byte gUnknown_3005018
 _0805634C: .4byte gUnknown_3005014
 _08056350: .4byte gUnknown_300501C
-	thumb_func_end sub_80562B0
+	thumb_func_end InitOverworldBgs
 
 	thumb_func_start sub_8056354
 sub_8056354: @ 8056354
@@ -3430,14 +3430,14 @@ _080565D4:
 _080565DC: .4byte gPaletteFade
 	thumb_func_end sub_80565B4
 
-	thumb_func_start sub_80565E0
-sub_80565E0: @ 80565E0
+	thumb_func_start SetMainCallback1
+SetMainCallback1: @ 80565E0
 	ldr r1, _080565E8 @ =gMain
 	str r0, [r1]
 	bx lr
 	.align 2, 0
 _080565E8: .4byte gMain
-	thumb_func_end sub_80565E0
+	thumb_func_end SetMainCallback1
 
 	thumb_func_start map_post_load_hook_exec
 map_post_load_hook_exec: @ 80565EC
@@ -3490,7 +3490,7 @@ _08056640: .4byte gFieldCallback
 	thumb_func_start CB2_NewGame
 CB2_NewGame: @ 8056644
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl StopMapMusic
 	bl sub_8056420
 	bl NewGameInitData
@@ -3508,7 +3508,7 @@ CB2_NewGame: @ 8056644
 	bl do_load_map_stuff_loop
 	bl SetFieldVBlankCallback
 	ldr r0, _0805669C @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _080566A0 @ =sub_80565B4
 	bl SetMainCallback2
 	pop {r0}
@@ -3537,7 +3537,7 @@ CB2_WhiteOut: @ 80566A4
 	lsrs r0, 24
 	cmp r0, 0x77
 	bls _08056702
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl StopMapMusic
 	bl sub_8056420
 	bl sub_8054BC8
@@ -3556,7 +3556,7 @@ CB2_WhiteOut: @ 80566A4
 	bl sub_8112364
 	bl SetFieldVBlankCallback
 	ldr r0, _08056714 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _08056718 @ =sub_80565B4
 	bl SetMainCallback2
 _08056702:
@@ -3574,11 +3574,11 @@ _08056718: .4byte sub_80565B4
 	thumb_func_start CB2_LoadMap
 CB2_LoadMap: @ 805671C
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
 	movs r0, 0
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _08056740 @ =sub_80C9BFC
 	bl SetMainCallback2
 	ldr r1, _08056744 @ =gMain
@@ -3609,7 +3609,7 @@ _08056768: .4byte gMain + 0x438
 _0805676C:
 	bl SetFieldVBlankCallback
 	ldr r0, _08056780 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _08056784 @ =sub_80565B4
 	bl SetMainCallback2
 _0805677C:
@@ -3620,12 +3620,12 @@ _08056780: .4byte sub_8056534
 _08056784: .4byte sub_80565B4
 	thumb_func_end sub_805674C
 
-	thumb_func_start sub_8056788
-sub_8056788: @ 8056788
+	thumb_func_start CB2_ReturnToFieldCableClub
+CB2_ReturnToFieldCableClub: @ 8056788
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r0, _080567A0 @ =gFieldCallback
-	ldr r1, _080567A4 @ =sub_807DE58
+	ldr r1, _080567A4 @ =FieldCB_ReturnToFieldWirelessLink
 	str r1, [r0]
 	ldr r0, _080567A8 @ =c2_80567AC
 	bl SetMainCallback2
@@ -3633,20 +3633,20 @@ sub_8056788: @ 8056788
 	bx r0
 	.align 2, 0
 _080567A0: .4byte gFieldCallback
-_080567A4: .4byte sub_807DE58
+_080567A4: .4byte FieldCB_ReturnToFieldWirelessLink
 _080567A8: .4byte c2_80567AC
-	thumb_func_end sub_8056788
+	thumb_func_end CB2_ReturnToFieldCableClub
 
 	thumb_func_start c2_80567AC
 c2_80567AC: @ 80567AC
 	push {lr}
 	ldr r0, _080567D0 @ =gMain + 0x438
-	bl sub_8056A5C
+	bl map_loading_iteration_3
 	cmp r0, 0
 	beq _080567CC
 	bl SetFieldVBlankCallback
 	ldr r0, _080567D4 @ =c1_link_related
-	bl sub_80565E0
+	bl SetMainCallback1
 	bl sub_80578D8
 	ldr r0, _080567D8 @ =sub_80565B4
 	bl SetMainCallback2
@@ -3671,7 +3671,7 @@ CB2_ReturnToField: @ 80567DC
 	.align 2, 0
 _080567F0: .4byte c2_exit_to_overworld_2_link
 _080567F4:
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r0, _08056804 @ =c2_exit_to_overworld_2_local
 	bl SetMainCallback2
 _080567FE:
@@ -3722,23 +3722,23 @@ _08056850: .4byte sub_80565B4
 	thumb_func_start c2_8056854
 c2_8056854: @ 8056854
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl StopMapMusic
 	ldr r0, _08056878 @ =c1_link_related
-	bl sub_80565E0
+	bl SetMainCallback1
 	bl sub_80578D8
 	ldr r0, _0805687C @ =gWirelessCommType
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08056888
 	ldr r1, _08056880 @ =gFieldCallback
-	ldr r0, _08056884 @ =sub_807DE58
+	ldr r0, _08056884 @ =FieldCB_ReturnToFieldWirelessLink
 	b _0805688C
 	.align 2, 0
 _08056878: .4byte c1_link_related
 _0805687C: .4byte gWirelessCommType
 _08056880: .4byte gFieldCallback
-_08056884: .4byte sub_807DE58
+_08056884: .4byte FieldCB_ReturnToFieldWirelessLink
 _08056888:
 	ldr r1, _080568A0 @ =gFieldCallback
 	ldr r0, _080568A4 @ =sub_807DDD0
@@ -3757,7 +3757,7 @@ _080568A4: .4byte sub_807DDD0
 	thumb_func_start CB2_ReturnToFieldWithOpenMenu
 CB2_ReturnToFieldWithOpenMenu: @ 80568A8
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r1, _080568BC @ =gFieldCallback2
 	ldr r0, _080568C0 @ =FieldCB2_ReturnToStartMenuInit
 	str r0, [r1]
@@ -3772,7 +3772,7 @@ _080568C0: .4byte FieldCB2_ReturnToStartMenuInit
 	thumb_func_start sub_80568C4
 sub_80568C4: @ 80568C4
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r1, _080568D8 @ =gFieldCallback
 	ldr r0, _080568DC @ =sub_807DD44
 	str r0, [r1]
@@ -3787,7 +3787,7 @@ _080568DC: .4byte sub_807DD44
 	thumb_func_start CB2_ReturnToFieldContinueScriptPlayMapMusic
 CB2_ReturnToFieldContinueScriptPlayMapMusic: @ 80568E0
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r1, _080568F4 @ =gFieldCallback
 	ldr r0, _080568F8 @ =FieldCallback_ReturnToEventScript2
 	str r0, [r1]
@@ -3802,7 +3802,7 @@ _080568F8: .4byte FieldCallback_ReturnToEventScript2
 	thumb_func_start CB2_Overworld
 CB2_Overworld: @ 80568FC
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r1, _08056910 @ =gFieldCallback
 	ldr r0, _08056914 @ =sub_807DF7C
 	str r0, [r1]
@@ -3836,14 +3836,14 @@ _08056934: .4byte gMapHeader
 	thumb_func_start CB2_ContinueSavedGame
 CB2_ContinueSavedGame: @ 8056938
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl StopMapMusic
 	bl sub_8056420
 	bl set_current_map_header_from_sav1
 	bl sub_80550A8
 	bl UnfreezeObjectEvents
 	bl sub_8054E40
-	bl sub_80589E8
+	bl InitMapFromSavedGame
 	bl PlayTimeCounter_Start
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
@@ -3871,7 +3871,7 @@ _0805699C:
 	ldr r1, _080569B4 @ =sub_8056918
 	str r1, [r0]
 	ldr r0, _080569B8 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	bl CB2_ReturnToField
 _080569AC:
 	pop {r0}
@@ -3882,8 +3882,8 @@ _080569B4: .4byte sub_8056918
 _080569B8: .4byte sub_8056534
 	thumb_func_end CB2_ContinueSavedGame
 
-	thumb_func_start sub_80569BC
-sub_80569BC: @ 80569BC
+	thumb_func_start FieldClearVBlankHBlankCallbacks
+FieldClearVBlankHBlankCallbacks: @ 80569BC
 	push {lr}
 	bl sub_80CC87C
 	lsls r0, 24
@@ -3915,7 +3915,7 @@ _080569F4:
 	bl SetHBlankCallback
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80569BC
+	thumb_func_end FieldClearVBlankHBlankCallbacks
 
 	thumb_func_start SetFieldVBlankCallback
 SetFieldVBlankCallback: @ 8056A04
@@ -3962,8 +3962,8 @@ _08056A52:
 _08056A58: .4byte gFlashEffectParams
 	thumb_func_end InitCurrentFlashLevelScanlineEffect
 
-	thumb_func_start sub_8056A5C
-sub_8056A5C: @ 8056A5C
+	thumb_func_start map_loading_iteration_3
+map_loading_iteration_3: @ 8056A5C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4]
@@ -3995,7 +3995,7 @@ _08056A78:
 	.4byte _08056B58
 	.4byte _08056B6A
 _08056AB0:
-	bl sub_80562B0
+	bl InitOverworldBgs
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
 	b _08056B62
@@ -4084,7 +4084,7 @@ _08056B70:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8056A5C
+	thumb_func_end map_loading_iteration_3
 
 	thumb_func_start sub_8056B78
 sub_8056B78: @ 8056B78
@@ -4121,8 +4121,8 @@ _08056B94:
 	.4byte _08056CC0
 	.4byte _08056BFA
 _08056BD0:
-	bl sub_80562B0
-	bl sub_80569BC
+	bl InitOverworldBgs
+	bl FieldClearVBlankHBlankCallbacks
 	adds r0, r5, 0
 	bl sub_8055920
 	b _08056CCA
@@ -4266,7 +4266,7 @@ _08056CF0:
 	.4byte _08056D26
 	.4byte _08056D38
 _08056D04:
-	bl sub_80562B0
+	bl InitOverworldBgs
 	bl sub_8111F14
 	movs r0, 0
 	bl sub_8057024
@@ -4331,8 +4331,8 @@ _08056D60:
 	.4byte _08056E34
 	.4byte _08056E46
 _08056D98:
-	bl sub_80562B0
-	bl sub_80569BC
+	bl InitOverworldBgs
+	bl FieldClearVBlankHBlankCallbacks
 	b _08056E3E
 _08056DA2:
 	bl sub_8111F14
@@ -4914,14 +4914,14 @@ _08057268: .4byte gLinkPlayers
 	thumb_func_start sub_805726C
 sub_805726C: @ 805726C
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r1, _08057298 @ =gUnknown_2036E28
 	movs r0, 0x1
 	strb r0, [r1]
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
 	movs r0, 0
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _0805729C @ =sub_80C9BFC
 	bl SetMainCallback2
 	ldr r1, _080572A0 @ =gMain
@@ -4939,7 +4939,7 @@ _080572A4: .4byte sub_80572D8
 	thumb_func_start sub_80572A8
 sub_80572A8: @ 80572A8
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	ldr r0, _080572D0 @ =gUnknown_2036E28
 	movs r1, 0x1
 	strb r1, [r0]
@@ -4947,7 +4947,7 @@ sub_80572A8: @ 80572A8
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
 	movs r0, 0
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _080572D4 @ =sub_80572D8
 	bl SetMainCallback2
 	pop {r0}
@@ -4964,7 +4964,7 @@ sub_80572D8: @ 80572D8
 	bl sub_8057300
 	bl SetFieldVBlankCallback
 	ldr r0, _080572F8 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r0, _080572FC @ =sub_80565B4
 	bl SetMainCallback2
 	pop {r0}
@@ -5019,8 +5019,8 @@ _08057330:
 	.4byte _08057404
 	.4byte _0805740A
 _0805735C:
-	bl sub_80562B0
-	bl sub_80569BC
+	bl InitOverworldBgs
+	bl FieldClearVBlankHBlankCallbacks
 	bl sub_8111F14
 	bl sub_81113E4
 	bl sub_8111438
@@ -5118,7 +5118,7 @@ _0805742A:
 	thumb_func_start sub_8057430
 sub_8057430: @ 8057430
 	push {lr}
-	bl sub_80569BC
+	bl FieldClearVBlankHBlankCallbacks
 	bl StopMapMusic
 	ldr r1, _08057484 @ =gUnknown_2036E28
 	movs r0, 0x3
@@ -5128,7 +5128,7 @@ sub_8057430: @ 8057430
 	bl sub_80550A8
 	bl UnfreezeObjectEvents
 	bl sub_8054E40
-	bl sub_80589E8
+	bl InitMapFromSavedGame
 	bl PlayTimeCounter_Start
 	bl ScriptContext1_Init
 	ldr r1, _08057488 @ =gUnknown_2031DE0
@@ -5149,7 +5149,7 @@ _08057488: .4byte gUnknown_2031DE0
 _0805748C: .4byte CB2_LoadMap
 _08057490:
 	ldr r0, _080574A0 @ =sub_8056534
-	bl sub_80565E0
+	bl SetMainCallback1
 	bl CB2_ReturnToField
 _0805749A:
 	pop {r0}
@@ -5313,7 +5313,7 @@ _08057560:
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
 	movs r0, 0
-	bl sub_80565E0
+	bl SetMainCallback1
 	ldr r1, _08057614 @ =gFieldCallback2
 	ldr r0, _08057618 @ =sub_80574EC
 	str r0, [r1]
@@ -7979,7 +7979,7 @@ _08058978:
 _0805898A:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8068EB4
+	bl UpdateObjectEventSpriteVisibility
 	ldrb r0, [r6]
 	lsls r0, 29
 	cmp r0, 0
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 345f3c83c..9dbbabd6f 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -1839,7 +1839,7 @@ _08106478:
 	bl FillWindowPixelBuffer
 	movs r0, 0xB0
 	movs r1, 0x1
-	bl sub_8107D38
+	bl ListMenuLoadStdPalAt
 	mov r0, r10
 	cmp r0, 0
 	beq _08106504
diff --git a/asm/pokemon_jump.s b/asm/pokemon_jump.s
index d94a5c8db..1644bb3d8 100644
--- a/asm/pokemon_jump.s
+++ b/asm/pokemon_jump.s
@@ -621,7 +621,7 @@ _08147A5C:
 	ldrh r0, [r4, 0x18]
 	strh r0, [r1, 0x2]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	b _08147A9E
 	.align 2, 0
 _08147A88: .4byte gTasks+0x8
diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s
index 5e6327c81..ff6757630 100644
--- a/asm/pokemon_jump_2.s
+++ b/asm/pokemon_jump_2.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8147AA8
-sub_8147AA8: @ 8147AA8
+	thumb_func_start StartPokemonJump
+StartPokemonJump: @ 8147AA8
 	push {r4-r7,lr}
 	adds r6, r1, 0
 	lsls r0, 16
@@ -73,7 +73,7 @@ _08147B42:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8147AA8
+	thumb_func_end StartPokemonJump
 
 	thumb_func_start sub_8147B48
 sub_8147B48: @ 8147B48
@@ -2535,7 +2535,7 @@ _08148DEA:
 	ands r0, r1
 	cmp r0, 0
 	bne _08148E20
-	bl sub_800AAC0
+	bl Link_TryStartSend5FFF
 _08148DFA:
 	ldr r0, _08148E0C @ =gUnknown_203F3D4
 	ldr r1, [r0]
@@ -4302,7 +4302,7 @@ sub_8149A6C: @ 8149A6C
 	ldr r0, [r0, 0x8]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -4363,7 +4363,7 @@ sub_8149AE0: @ 8149AE0
 	strb r1, [r2]
 	str r0, [sp, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -4425,7 +4425,7 @@ sub_8149AF8: @ 8149AF8
 	ldrh r0, [r0, 0xE]
 	strh r0, [r1, 0x4]
 	mov r0, sp
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r3}
 	mov r8, r3
@@ -4520,7 +4520,7 @@ sub_8149BF4: @ 8149BF4
 	mov r0, sp
 	strb r1, [r0, 0x6]
 	strh r2, [r0, 0x8]
-	bl sub_80F9E2C
+	bl RfuPrepareSend0x2f00
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -4665,7 +4665,7 @@ _08149D20: .4byte sub_8149DC8
 sub_8149D24: @ 8149D24
 	push {lr}
 	bl FreeAllWindowBuffers
-	bl sub_815C9F4
+	bl DigitObjUtil_Teardown
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8149D24
@@ -6284,7 +6284,10 @@ sub_814A9C8: @ 814A9C8
 	push {r4,lr}
 	sub sp, 0x10
 	mov r1, sp
-	movs r0, 0x40
+	movs r0, 0x40 @ strConvMode = 0
+	              @ shape = SPRITE_SHAPE(8x8)
+	              @ size = SPRITE_SIZE(8x8)
+	              @ priority = 1
 	strb r0, [r1]
 	movs r0, 0x5
 	strb r0, [r1, 0x1]
@@ -6299,11 +6302,11 @@ sub_814A9C8: @ 814A9C8
 	ldr r0, _0814AA20 @ =gUnknown_846D968
 	str r0, [sp, 0xC]
 	movs r0, 0x2
-	bl sub_815C980
+	bl DigitObjUtil_Init
 	movs r0, 0
 	movs r1, 0
 	mov r2, sp
-	bl sub_815CA40
+	bl DigitObjUtil_CreatePrinter
 	mov r1, sp
 	movs r0, 0x4
 	strb r0, [r1, 0x1]
@@ -6314,7 +6317,7 @@ sub_814A9C8: @ 814A9C8
 	movs r0, 0x1
 	movs r1, 0
 	mov r2, sp
-	bl sub_815CA40
+	bl DigitObjUtil_CreatePrinter
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -6329,7 +6332,7 @@ sub_814AA24: @ 814AA24
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0
-	bl sub_815CD70
+	bl DigitObjUtil_PrintNumOn
 	pop {r0}
 	bx r0
 	thumb_func_end sub_814AA24
@@ -6341,7 +6344,7 @@ sub_814AA34: @ 814AA34
 	lsls r1, 16
 	lsrs r1, 16
 	movs r0, 0x1
-	bl sub_815CD70
+	bl DigitObjUtil_PrintNumOn
 	pop {r0}
 	bx r0
 	thumb_func_end sub_814AA34
@@ -7699,7 +7702,7 @@ sub_814B43C: @ 814B43C
 	movs r1, 0x7
 	movs r2, 0x78
 	movs r3, 0x50
-	bl sub_815F138
+	bl StartMinigameCountdown
 	adds r0, r4, 0
 	bl sub_814B134
 	add sp, 0x4
@@ -7711,7 +7714,7 @@ sub_814B43C: @ 814B43C
 	thumb_func_start sub_814B460
 sub_814B460: @ 814B460
 	push {lr}
-	bl sub_815F198
+	bl IsMinigameCountdownRunning
 	pop {r1}
 	bx r1
 	thumb_func_end sub_814B460
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index d6c3f548f..19b838f47 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -3187,7 +3187,7 @@ _08135FC8: .4byte gUnknown_8E9B310
 _08135FCC:
 	movs r0, 0x60
 	movs r1, 0x1
-	bl sub_8107D38
+	bl ListMenuLoadStdPalAt
 	ldr r0, _08135FE0 @ =gUnknown_84636C0
 	movs r1, 0x70
 _08135FD8:
diff --git a/common_syms/AgbRfu_LinkManager.txt b/common_syms/AgbRfu_LinkManager.txt
new file mode 100644
index 000000000..7ff8cd53d
--- /dev/null
+++ b/common_syms/AgbRfu_LinkManager.txt
@@ -0,0 +1 @@
+lman
diff --git a/common_syms/help_system_812B1E0.txt b/common_syms/help_system_812B1E0.txt
index 5e56cc230..cd404504e 100644
--- a/common_syms/help_system_812B1E0.txt
+++ b/common_syms/help_system_812B1E0.txt
@@ -1,2 +1,2 @@
-gUnknown_3005E9C
+sHelpSystemState
 gSomeVariableBackup
diff --git a/common_syms/link.txt b/common_syms/link.txt
index 32c25d708..82cf757a1 100644
--- a/common_syms/link.txt
+++ b/common_syms/link.txt
@@ -10,11 +10,11 @@ gFiller_3003EC0
 gLinkHeldKeys
 gRecvCmds
 gLinkStatus
-gUnknown_3003F24
+gLinkAllAcked5FFF
 gUnknown_3003F28
-gUnknown_3003F2C
-gUnknown_3003F30
-gUnknown_3003F34
+gLinkCommand2FFEAck
+gLinkCommand5FFFAck
+gLinkCmd5FFFparam
 gSuppressLinkErrorMessage
 gWirelessCommType
 gSavedLinkPlayerCount
diff --git a/common_syms/link_rfu.txt b/common_syms/link_rfu.txt
deleted file mode 100644
index add61fde8..000000000
--- a/common_syms/link_rfu.txt
+++ /dev/null
@@ -1 +0,0 @@
-gUnknown_3005E10
diff --git a/common_syms/mevent.txt b/common_syms/mevent.txt
index cfaf59d33..af4db66e6 100644
--- a/common_syms/mevent.txt
+++ b/common_syms/mevent.txt
@@ -1 +1 @@
-gUnknown_3005ED0
+sMEventSendToEReaderManager
diff --git a/data/berry_crush.s b/data/berry_crush.s
index cc7ae23fd..417347801 100644
--- a/data/berry_crush.s
+++ b/data/berry_crush.s
@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
 gUnknown_846F470:: @ 846F470
 	spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
 
-gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
-	.byte 9, 2, 8
+gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
+	@ strConvMode, shape, size, priority
+	.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0x9c, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0x9c, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xb4, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0xb4, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xcc, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
+	.2byte 0xcc, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
 
 gUnknown_846F4B8:: @ 846F4B8
 	.4byte gUnknown_841D034
diff --git a/data/data_8479668.s b/data/data_8479668.s
index 393a5cc44..6d8a22898 100644
--- a/data/data_8479668.s
+++ b/data/data_8479668.s
@@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9::
 gText_UnionRoomChatKeyboard_Emoji10::
 	.string "{EXTRA 210}{EXTRA 208}ょ: $"
 
-	// trainer_tower (again?)
-
 	@ 847ABAC
 .align 2
 	.include "data/trainer_tower/trainers.inc"
 
-	.align 2
-gUnknown_84827AC:: @ 84827AC
-	.byte 0x08, 0x01
-	.align 2
-	.4byte 0
-
-gUnknown_84827B4:: @ 84827B4
-	.4byte gUnknown_847F16C
-	.4byte gUnknown_847D26C
-	.4byte gUnknown_84808AC
-	.4byte gUnknown_847ABAC
-	.4byte gUnknown_847CAAC
-	.4byte gUnknown_847E9AC
-	.4byte gUnknown_847AF8C
-	.4byte gUnknown_847CE8C
-	.4byte gUnknown_847DA2C
-	.4byte gUnknown_847BF0C
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847DE0C
-	.4byte gUnknown_847B74C
-	.4byte gUnknown_847BB2C
-	.4byte gUnknown_848182C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847C2EC
-	.4byte gUnknown_847C6CC
-	.4byte gUnknown_847E5CC
-	.4byte gUnknown_84804CC
-	.4byte gUnknown_84823CC
-	.4byte gUnknown_8481FEC
-	.4byte gUnknown_84800EC
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847ED8C
-	.4byte gUnknown_848106C
-	.4byte gUnknown_8480C8C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847F54C
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847C6CC
-
 	.include "data/text/move_descriptions.inc"
 
 	.align 2, 0
diff --git a/data/event_object_80688E4.s b/data/event_object_80688E4.s
deleted file mode 100644
index 8d1917825..000000000
--- a/data/event_object_80688E4.s
+++ /dev/null
@@ -1,97 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_83A710C::
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-
-gUnknown_83A714C::
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-
-gUnknown_83A716C::
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-
-gUnknown_83A7184::
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-
-gUnknown_83A7194::
-	.4byte oct_little_steps
-	.4byte oct_little_steps
-
-gUnknown_83A719C:: @ 83A719C
-	.4byte gUnknown_83A710C
-	.4byte gUnknown_83A714C
-	.4byte gUnknown_83A716C
-	.4byte gUnknown_83A7184
-	.4byte gUnknown_83A7194
-
-gUnknown_83A71B0:: @ 83A71B0
-	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
-
-gUnknown_83A71BA::
-	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
-
-gUnknown_83A71CA::
-	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
-
-gUnknown_83A71DA::
-	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
-
-	.align 2
-gUnknown_83A71EC:: @ 83A71EC
-	.4byte gUnknown_83A71BA
-	.4byte gUnknown_83A71CA
-	.4byte gUnknown_83A71DA
-
-	.align 1
-gUnknown_83A71F8:: @ 83A71F8
-	.2byte 0x10, 0x10, 0x20
-
-gUnknown_83A71FE:: @ 83A71FE
-	.byte 0, 0, 1
-
-	.align 1
-gUnknown_83A7202:: @ 83A7202
-	.2byte 0x20, 0x20, 0x40
-
-gUnknown_83A7208:: @ 83A7208
-	.byte 1, 1, 2
-
-	.align 2
-gUnknown_83A720C:: @ 83A720C
-	abspath "evobjmv.c"
-
-	.align 2
-gUnknown_83A7240:: @ 83A7240
-	.asciz "0"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e28093686..b787a52a5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -17,19 +17,24 @@
 #include "constants/spawn_points.h"
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
+#include "constants/trainer_tower.h"
 #include "constants/object_events.h"
 #include "constants/fame_checker.h"
 #include "constants/seagallop.h"
 #include "constants/game_stat.h"
+#include "constants/coins.h"
 #include "constants/menu.h"
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/cable_club.h"
+#include "constants/field_tasks.h"
 #include "constants/field_weather.h"
+#include "constants/weather.h"
 #include "constants/union_room.h"
 #include "constants/trade.h"
 #include "constants/quest_log.h"
 #include "constants/daycare.h"
+#include "constants/easy_chat.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.set FALSE, 0
@@ -208,17 +213,17 @@ gStdScriptsEnd::
 	.include "data/maps/SixIsland_PatternBush/scripts.inc"
 	.include "data/maps/SixIsland_AlteringCave/scripts.inc"
 	.include "data/maps/NavelRock_Exterior/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc"
+	.include "data/maps/TrainerTower_1F/scripts.inc"
+	.include "data/maps/TrainerTower_2F/scripts.inc"
+	.include "data/maps/TrainerTower_3F/scripts.inc"
+	.include "data/maps/TrainerTower_4F/scripts.inc"
+	.include "data/maps/TrainerTower_5F/scripts.inc"
+	.include "data/maps/TrainerTower_6F/scripts.inc"
+	.include "data/maps/TrainerTower_7F/scripts.inc"
+	.include "data/maps/TrainerTower_8F/scripts.inc"
+	.include "data/maps/TrainerTower_Roof/scripts.inc"
+	.include "data/maps/TrainerTower_Lobby/scripts.inc"
+	.include "data/maps/TrainerTower_Elevator/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room2/scripts.inc"
@@ -278,7 +283,7 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland/scripts.inc"
 	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
 	.include "data/maps/SaffronCity/scripts.inc"
-	.include "data/maps/SaffronCity_Classic/scripts.inc"
+	.include "data/maps/SaffronCity_Connection/scripts.inc"
 	.include "data/maps/OneIsland/scripts.inc"
 	.include "data/maps/TwoIsland/scripts.inc"
 	.include "data/maps/ThreeIsland/scripts.inc"
@@ -317,10 +322,10 @@ gStdScriptsEnd::
 	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
 	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
 	.include "data/maps/ThreeIsland_Port/scripts.inc"
-	.include "data/maps/UnknownMap_03_50/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
 	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
 	.include "data/maps/FiveIsland_Meadow/scripts.inc"
@@ -415,15 +420,15 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_Mart/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_1F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_2F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
 	.include "data/maps/SaffronCity_Dojo/scripts.inc"
 	.include "data/maps/SaffronCity_Gym/scripts.inc"
-	.include "data/maps/SaffronCity_House2/scripts.inc"
+	.include "data/maps/SaffronCity_House/scripts.inc"
 	.include "data/maps/SaffronCity_Mart/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House3/scripts.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
 	.include "data/maps/Route2_House/scripts.inc"
@@ -593,7 +598,7 @@ gStdScriptsEnd::
 	.include "data/maps/FiveIsland_RocketWarehouse/text.inc"
 	.include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc"
 	.include "data/maps/SixIsland_PatternBush/text.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc"
+	.include "data/maps/TrainerTower_Lobby/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
@@ -658,6 +663,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TrainerTower/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
+	.include "data/maps/SevenIsland_TanobyRuins/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
 	.include "data/maps/PalletTown_GarysHouse/text.inc"
@@ -730,14 +736,14 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
 	.include "data/maps/CinnabarIsland_Mart/text.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_2F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
 	.include "data/maps/SaffronCity_Dojo/text.inc"
 	.include "data/maps/SaffronCity_Gym/text.inc"
-	.include "data/maps/SaffronCity_House2/text.inc"
+	.include "data/maps/SaffronCity_House/text.inc"
 	.include "data/maps/SaffronCity_Mart/text.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House3/text.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
 	.include "data/maps/Route2_House/text.inc"
@@ -966,7 +972,7 @@ Text_HavePokedexRated:: @ 81A5C03
 Text_ClosedLinkToProfOaksPC:: @ 81A5C2E
 	.string "Closed link to PROF. OAK's PC.$"
 
-Text_1A5C4D:: @ 81A5C4D
+Text_VoiceRangOutDontRunAway:: @ 81A5C4D
 	.string "Someone's voice rang out,\n"
 	.string "“Don't run away!”$"
 
@@ -1169,10 +1175,9 @@ EventScript_ResetEliteFour:: @ 81A6551
 	.include "data/scripts/obtain_item.inc"
 	.include "data/scripts/pc.inc"
 
-@ DoEasyChatScreen?
-EventScript_1A6AC0:: @ 81A6AC0
+Common_ShowEasyChatScreen:: @ 81A6AC0
 	fadescreen FADE_TO_BLACK
-	special sub_80FEE44
+	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
@@ -1258,71 +1263,7 @@ EventScript_1A74F2:: @ 81A74F2
 	removeitem VAR_0x8004, 1
 	return
 
-EventScript_1A7506:: @ 81A7506
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	call EventScript_1A7538
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A751F:: @ 81A751F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
-	waitmovement 0
-	setflag FLAG_TEMP_2
-	playse SE_KI_GASYAN
-	call EventScript_1A759C
-	special DrawWholeMapView
-	return
-
-EventScript_1A7538:: @ 81A7538
-	setmetatile 6, 1, 654, 1
-	setmetatile 6, 2, 662, 0
-	return
-
-EventScript_1A754B:: @ 81A754B
-	lockall
-	textcolor 0
-	msgbox Text_1A5C4D
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3
-	waitmovement 0
-	releaseall
-	end
-
-EventScript_1A7563:: @ 81A7563
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A7589:: @ 81A7589
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	return
-
-EventScript_1A759C:: @ 81A759C
-	setmetatile 5, 11, 669, 1
-	setmetatile 6, 11, 670, 1
-	setmetatile 7, 11, 671, 1
-	setmetatile 5, 12, 677, 1
-	setmetatile 6, 12, 678, 1
-	setmetatile 7, 12, 679, 1
-	return
-
-Movement_1A75D3:: @ 81A75D3
-	walk_up
-	step_end
-
-EventScript_1A75D5:: @ 81A75D5
-	special Special_PokemonLeagueLightingEffect
-	return
-
+	.include "data/scripts/pokemon_league.inc"
 	.include "data/scripts/movement.inc"	
 	.include "data/scripts/flavor_text.inc"
 
@@ -1332,8 +1273,8 @@ gUnknown_81A7702:: @ 81A7702
 	msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1A778A
-	setvar VAR_0x8004, 14
-	call EventScript_1A6AC0
+	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1407,7 +1348,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
 
 	.include "data/scripts/route23.inc"
 
-EventScript_1A7AB9:: @ 81A7AB9
+EventScript_GetElevatorFloor:: @ 81A7AB9
 	special Special_GetElevatorFloor
 	return
 
@@ -1648,9 +1589,9 @@ EventScript_1A8EC0:: @ 81A8EC0
 	.include "data/scripts/seagallop.inc"
 	.include "data/scripts/static_pokemon.inc"
 
-EventScript_1A925E:: @ 81A925E
+EventScript_TryDarkenRuins:: @ 81A925E
 	goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
-	setweather 11
+	setweather WEATHER_SHADE
 	doweather
 	return
 
@@ -1680,419 +1621,35 @@ Text_1ACD45:: @ 81ACD45
 	.include "data/scripts/fame_checker.inc"
 	.include "data/text/fame_checker.inc"
 
-CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
-	lockall
-	showmoneybox 0, 0, 0
-	msgbox gUnknown_81B1D7D, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1B2926
-	checkmoney 50, 0
-	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1B292B
-	playse SE_SHOP
-	removemoney 50, 0
-	updatemoneybox 0, 0, 0
-	waitse
-	message gUnknown_81B1E24
-	waitmessage
-	multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
-	switch VAR_RESULT
-	case 0, EventScript_1B28DB
-	case 1, EventScript_1B28E6
-	case 2, EventScript_1B28F1
-	case 3, EventScript_1B28FC
-	end
-
-EventScript_1B28DB:: @ 81B28DB
-	setvar VAR_0x8004, 0
-	goto EventScript_1B2907
-
-EventScript_1B28E5:: @ 81B28E5
-	end
-
-EventScript_1B28E6:: @ 81B28E6
-	setvar VAR_0x8004, 1
-	goto EventScript_1B2907
-
-EventScript_1B28F0:: @ 81B28F0
-	end
-
-EventScript_1B28F1:: @ 81B28F1
-	setvar VAR_0x8004, 2
-	goto EventScript_1B2907
-
-EventScript_1B28FB:: @ 81B28FB
-	end
-
-EventScript_1B28FC:: @ 81B28FC
-	setvar VAR_0x8004, 3
-	goto EventScript_1B2907
-
-EventScript_1B2906:: @ 81B2906
-	end
-
-EventScript_1B2907:: @ 81B2907
-	message gUnknown_81B1E42
-	waitmessage
-	playse MUS_ME_PHOTO
-	dofieldeffect FLDEFF_UNK_45
-	delay 60
-	special Special_UpdateTrainerCardPhotoIcons
-	msgbox gUnknown_81B1E7D
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B2926:: @ 81B2926
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B292B:: @ 81B292B
-	msgbox gUnknown_81B1E07
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-FourIsland_House2_EventScript_1B2938:: @ 81B2938
-	lock
-	specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
-	goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
-	goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
-	end
-
-EventScript_1B2951:: @ 81B2951
-	setflag FLAG_MET_STICKER_LADY
-	msgbox gUnknown_81B1EB3
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Movement_ExclamationMark
-	waitmovement 0
-	applymovement 1, Movement_Delay48
-	waitmovement 0
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B2B8E
-	message gUnknown_81B1EF8
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B2993:: @ 81B2993
-	end
-
-EventScript_1B2994:: @ 81B2994
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	goto_if_questlog EventScript_ReleaseEnd
-	special sub_8112364
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B29C6
-	message gUnknown_81B2025
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B29C5:: @ 81B29C5
-	end
-
-EventScript_1B29C6:: @ 81B29C6
-	msgbox gUnknown_81B1FEF
-	release
-	end
-
-EventScript_1B29D0:: @ 81B29D0
-	switch VAR_0x8008
-	case 1, EventScript_1B2A23
-	case 2, EventScript_1B2A4F
-	case 4, EventScript_1B2A7B
-	case 3, EventScript_1B2AA7
-	case 5, EventScript_1B2ADE
-	case 6, EventScript_1B2B15
-	case 7, EventScript_1B2B4C
-	end
-
-EventScript_1B2A23:: @ 81B2A23
-	multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A4F:: @ 81B2A4F
-	multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A7B:: @ 81B2A7B
-	multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2D2C
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2AA7:: @ 81B2AA7
-	multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2ADE:: @ 81B2ADE
-	multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B15:: @ 81B2B15
-	multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B4C:: @ 81B2B4C
-	multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2D2C
-	case 3, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B8E:: @ 81B2B8E
-	msgbox gUnknown_81B1EF8
-	release
-	end
-
-EventScript_1B2B98:: @ 81B2B98
-	compare VAR_0x8004, 39
-	goto_if_le EventScript_1B2BC5
-	compare VAR_0x8004, 99
-	goto_if_le EventScript_1B2BE3
-	compare VAR_0x8004, 199
-	goto_if_le EventScript_1B2C01
-	compare VAR_0x8004, 200
-	goto_if_ge EventScript_1B2C1F
-	end
-
-EventScript_1B2BC5:: @ 81B2BC5
-	compare VAR_HOF_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 1
-	msgbox gUnknown_81B206E
-	goto EventScript_1B2C51
-
-EventScript_1B2BE2:: @ 81B2BE2
-	end
-
-EventScript_1B2BE3:: @ 81B2BE3
-	compare VAR_HOF_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 2
-	msgbox gUnknown_81B20CF
-	goto EventScript_1B2C51
-
-EventScript_1B2C00:: @ 81B2C00
-	end
-
-EventScript_1B2C01:: @ 81B2C01
-	compare VAR_HOF_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 3
-	msgbox gUnknown_81B2133
-	goto EventScript_1B2C51
-
-EventScript_1B2C1E:: @ 81B2C1E
-	end
-
-EventScript_1B2C1F:: @ 81B2C1F
-	compare VAR_HOF_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2C47
-	setvar VAR_HOF_BRAG_STATE, 4
-	msgbox gUnknown_81B21C4
-	goto EventScript_1B2C51
-
-EventScript_1B2C3C:: @ 81B2C3C
-	end
-
-EventScript_1B2C3D:: @ 81B2C3D
-	msgbox gUnknown_81B227C
-	release
-	end
-
-EventScript_1B2C47:: @ 81B2C47
-	msgbox gUnknown_81B22B0
-	release
-	end
-
-EventScript_1B2C51:: @ 81B2C51
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B2242
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2C62:: @ 81B2C62
-	compare VAR_0x8005, 99
-	goto_if_le EventScript_1B2C8F
-	compare VAR_0x8005, 199
-	goto_if_le EventScript_1B2CAD
-	compare VAR_0x8005, 299
-	goto_if_le EventScript_1B2CCB
-	compare VAR_0x8005, 300
-	goto_if_ge EventScript_1B2CE9
-	end
-
-EventScript_1B2C8F:: @ 81B2C8F
-	compare VAR_EGG_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 1
-	msgbox gUnknown_81B2308
-	goto EventScript_1B2D1B
-
-EventScript_1B2CAC:: @ 81B2CAC
-	end
-
-EventScript_1B2CAD:: @ 81B2CAD
-	compare VAR_EGG_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 2
-	msgbox gUnknown_81B2372
-	goto EventScript_1B2D1B
-
-EventScript_1B2CCA:: @ 81B2CCA
-	end
-
-EventScript_1B2CCB:: @ 81B2CCB
-	compare VAR_EGG_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 3
-	msgbox gUnknown_81B23E0
-	goto EventScript_1B2D1B
-
-EventScript_1B2CE8:: @ 81B2CE8
-	end
-
-EventScript_1B2CE9:: @ 81B2CE9
-	compare VAR_EGG_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2D11
-	setvar VAR_EGG_BRAG_STATE, 4
-	msgbox gUnknown_81B2448
-	goto EventScript_1B2D1B
-
-EventScript_1B2D06:: @ 81B2D06
-	end
-
-EventScript_1B2D07:: @ 81B2D07
-	msgbox gUnknown_81B251B
-	release
-	end
-
-EventScript_1B2D11:: @ 81B2D11
-	msgbox gUnknown_81B254F
-	release
-	end
-
-EventScript_1B2D1B:: @ 81B2D1B
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B24EA
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2D2C:: @ 81B2D2C
-	compare VAR_0x8006, 19
-	goto_if_le EventScript_1B2D59
-	compare VAR_0x8006, 49
-	goto_if_le EventScript_1B2D77
-	compare VAR_0x8006, 99
-	goto_if_le EventScript_1B2D95
-	compare VAR_0x8006, 100
-	goto_if_ge EventScript_1B2DB3
-	end
-
-EventScript_1B2D59:: @ 81B2D59
-	compare VAR_LINK_WIN_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 1
-	msgbox gUnknown_81B25A7
-	goto EventScript_1B2DE5
-
-EventScript_1B2D76:: @ 81B2D76
-	end
-
-EventScript_1B2D77:: @ 81B2D77
-	compare VAR_LINK_WIN_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 2
-	msgbox gUnknown_81B2609
-	goto EventScript_1B2DE5
+gUnknown_81B1C8B:: @ 81B1C8B
+	.string "Hmm…\n"
+	.string "Is that right…$"
 
-EventScript_1B2D94:: @ 81B2D94
-	end
+gUnknown_81B1C9F:: @ 81B1C9F
+	.string "Oh!\n"
+	.string "Look, look!$"
 
-EventScript_1B2D95:: @ 81B2D95
-	compare VAR_LINK_WIN_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 3
-	msgbox gUnknown_81B267B
-	goto EventScript_1B2DE5
-
-EventScript_1B2DB2:: @ 81B2DB2
-	end
-
-EventScript_1B2DB3:: @ 81B2DB3
-	compare VAR_LINK_WIN_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2DDB
-	setvar VAR_LINK_WIN_BRAG_STATE, 4
-	msgbox gUnknown_81B26F6
-	goto EventScript_1B2DE5
-
-EventScript_1B2DD0:: @ 81B2DD0
-	end
+gUnknown_81B1CAF:: @ 81B1CAF
+	.string "Read it, read it!$"
 
-EventScript_1B2DD1:: @ 81B2DD1
-	msgbox gUnknown_81B27DB
-	release
-	end
+gUnknown_81B1CC1:: @ 81B1CC1
+	.string "TRAINER TIPS\p"
+	.string "Press START to open the MENU!$"
 
-EventScript_1B2DDB:: @ 81B2DDB
-	msgbox gUnknown_81B280F
-	release
-	end
+gUnknown_81B1CEC:: @ 81B1CEC
+	.string "Signs are useful, aren't they?$"
 
-EventScript_1B2DE5:: @ 81B2DE5
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B27A6
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
+gUnknown_81B1D0B:: @ 81B1D0B
+	.string "Look, look!\p"
+	.string "I copied what it said on one of\n"
+	.string "those TRAINER TIPS signs!$"
 
-EventScript_1B2DF6:: @ 81B2DF6
-	release
-	end
+gUnknown_81B1D51:: @ 81B1D51
+	.string "TRAINER TIPS!\p"
+	.string "Press START to open the MENU!$"
 
+	.include "data/text/trainer_card.inc"
+	.include "data/scripts/trainer_card.inc"
 	.include "data/text/help_system.inc"
 	.include "data/scripts/cable_club.inc"
 	.include "data/scripts/field_moves.inc"
diff --git a/data/graphics.s b/data/graphics.s
index 247a5d230..3ae4f8e8a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
-
-gTilesetTiles_8EA1D68:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+gTilesetPalettes_General:: @ 8EA1B68
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
+
+gTilesetTiles_General:: @ 8EA1D68
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
 
 gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"
 
 	.align 2
-gTilesetPalettes_8EA97F4:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
-
-
-gTilesetTiles_8EA9F88:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
+
+
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
 
 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
diff --git a/data/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SaffronCity_House1_1F/border.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_833902C/map.bin b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
index 4573c1444..4573c1444 100644
--- a/data/layouts/UnusedLayout_833902C/map.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SaffronCity_House1_2F/border.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_8338E90/map.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
index a5391187c..a5391187c 100644
--- a/data/layouts/UnusedLayout_8338E90/map.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
diff --git a/data/layouts/UnusedLayout_82D6144/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D6144/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/layouts/UnusedLayout_82DCA70/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/layouts/UnusedLayout_82D6654/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D6654/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/layouts/UnusedLayout_82DB4F0/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D672C/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D672C/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D7674/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/layouts/UnusedLayout_82D7674/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D75F0/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/layouts/UnusedLayout_82D7CC8/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D88C8/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/UnusedLayout_82D6144/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/layouts/UnusedLayout_82D6144/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/layouts/UnusedLayout_82D54D8/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index b51210332..b51210332 100644
--- a/data/layouts/UnusedLayout_82D54D8/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCA70/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
index bad63f412..bad63f412 100644
--- a/data/layouts/UnusedLayout_82DCB44/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCB44/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
index 399d05705..399d05705 100644
--- a/data/layouts/UnusedLayout_82DCC40/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82D7674/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7674/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6654/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/layouts/UnusedLayout_82D6654/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7CC8/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D672C/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/layouts/UnusedLayout_82D672C/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/layouts/UnknownMap_03_50/border.bin b/data/layouts/Prototype_SeviiIsle_22/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_50/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/border.bin
diff --git a/data/layouts/UnusedLayout_833614C/map.bin b/data/layouts/Prototype_SeviiIsle_22/map.bin
index a4b5b8b85..a4b5b8b85 100644
--- a/data/layouts/UnusedLayout_833614C/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/map.bin
diff --git a/data/layouts/UnknownMap_03_51/border.bin b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_51/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
diff --git a/data/layouts/UnusedLayout_83377F0/map.bin b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
index 5bc807eea..5bc807eea 100644
--- a/data/layouts/UnusedLayout_83377F0/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
diff --git a/data/layouts/UnknownMap_03_52/border.bin b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_52/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
diff --git a/data/layouts/UnusedLayout_8338354/map.bin b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
index 667f4a779..667f4a779 100644
--- a/data/layouts/UnusedLayout_8338354/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
diff --git a/data/layouts/UnknownMap_03_53/border.bin b/data/layouts/Prototype_SeviiIsle_24/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_53/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/border.bin
diff --git a/data/layouts/UnusedLayout_8338738/map.bin b/data/layouts/Prototype_SeviiIsle_24/map.bin
index ce93426c5..ce93426c5 100644
--- a/data/layouts/UnusedLayout_8338738/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/map.bin
diff --git a/data/layouts/UnusedLayout_833614C/border.bin b/data/layouts/Prototype_SeviiIsle_6/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_833614C/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/border.bin
diff --git a/data/layouts/UnknownMap_03_50/map.bin b/data/layouts/Prototype_SeviiIsle_6/map.bin
index cbd97e361..cbd97e361 100644
--- a/data/layouts/UnknownMap_03_50/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/map.bin
diff --git a/data/layouts/UnusedLayout_83377F0/border.bin b/data/layouts/Prototype_SeviiIsle_7/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_83377F0/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/border.bin
diff --git a/data/layouts/UnknownMap_03_51/map.bin b/data/layouts/Prototype_SeviiIsle_7/map.bin
index e6859e745..e6859e745 100644
--- a/data/layouts/UnknownMap_03_51/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/map.bin
diff --git a/data/layouts/UnusedLayout_8338354/border.bin b/data/layouts/Prototype_SeviiIsle_8/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338354/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/border.bin
diff --git a/data/layouts/UnknownMap_03_52/map.bin b/data/layouts/Prototype_SeviiIsle_8/map.bin
index 7f730c596..7f730c596 100644
--- a/data/layouts/UnknownMap_03_52/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/map.bin
diff --git a/data/layouts/UnusedLayout_8338738/border.bin b/data/layouts/Prototype_SeviiIsle_9/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338738/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/border.bin
diff --git a/data/layouts/UnknownMap_03_53/map.bin b/data/layouts/Prototype_SeviiIsle_9/map.bin
index 616f50967..616f50967 100644
--- a/data/layouts/UnknownMap_03_53/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/map.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/border.bin b/data/layouts/RS_BattleTower/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnusedLayout_82DBBE0/border.bin
+++ b/data/layouts/RS_BattleTower/border.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/map.bin b/data/layouts/RS_BattleTower/map.bin
index 6e9f6adb6..6e9f6adb6 100644
--- a/data/layouts/UnusedLayout_82DBBE0/map.bin
+++ b/data/layouts/RS_BattleTower/map.bin
diff --git a/data/layouts/UnusedLayout_82D6490/border.bin b/data/layouts/RS_PokemonCenter_1F/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/UnusedLayout_82D6490/border.bin
+++ b/data/layouts/RS_PokemonCenter_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82D6490/map.bin b/data/layouts/RS_PokemonCenter_1F/map.bin
index f84061f08..f84061f08 100644
--- a/data/layouts/UnusedLayout_82D6490/map.bin
+++ b/data/layouts/RS_PokemonCenter_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/border.bin b/data/layouts/RS_SafariZone_Entrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCC40/border.bin
+++ b/data/layouts/RS_SafariZone_Entrance/border.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/map.bin b/data/layouts/RS_SafariZone_Entrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/layouts/UnusedLayout_82D88C8/map.bin
+++ b/data/layouts/RS_SafariZone_Entrance/map.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/border.bin b/data/layouts/RS_SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82D9B24/border.bin
+++ b/data/layouts/RS_SafariZone_Northeast/border.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/map.bin b/data/layouts/RS_SafariZone_Northeast/map.bin
index d5e7fd825..d5e7fd825 100644
--- a/data/layouts/UnusedLayout_82D9B24/map.bin
+++ b/data/layouts/RS_SafariZone_Northeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/border.bin b/data/layouts/RS_SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DD0DC/border.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/map.bin b/data/layouts/RS_SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/layouts/UnusedLayout_82DD0DC/map.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/border.bin b/data/layouts/RS_SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DA7C8/border.bin
+++ b/data/layouts/RS_SafariZone_Southeast/border.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/map.bin b/data/layouts/RS_SafariZone_Southeast/map.bin
index 540798144..540798144 100644
--- a/data/layouts/UnusedLayout_82DB46C/map.bin
+++ b/data/layouts/RS_SafariZone_Southeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/border.bin b/data/layouts/RS_SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DB46C/border.bin
+++ b/data/layouts/RS_SafariZone_Southwest/border.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/map.bin b/data/layouts/RS_SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/layouts/UnusedLayout_82DA7C8/map.bin
+++ b/data/layouts/RS_SafariZone_Southwest/map.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DB4F0/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/layouts/UnusedLayout_82D75F0/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBDD8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/layouts/UnusedLayout_82DCF00/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBFB8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DD004/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 17a611343..17a611343 100644
--- a/data/layouts/UnusedLayout_82DD004/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC4EC/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/layouts/UnusedLayout_82DC60C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC60C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/layouts/UnusedLayout_82DC72C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC72C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/layouts/UnusedLayout_82DC84C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/border.bin b/data/layouts/SSTidal_Corridor/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC84C/border.bin
+++ b/data/layouts/SSTidal_Corridor/border.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/map.bin b/data/layouts/SSTidal_Corridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/layouts/UnusedLayout_82DBDD8/map.bin
+++ b/data/layouts/SSTidal_Corridor/map.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/border.bin b/data/layouts/SSTidal_LowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCCD4/border.bin
+++ b/data/layouts/SSTidal_LowerDeck/border.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/map.bin b/data/layouts/SSTidal_LowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/layouts/UnusedLayout_82DBFB8/map.bin
+++ b/data/layouts/SSTidal_LowerDeck/map.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/border.bin b/data/layouts/SSTidal_Rooms/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCD68/border.bin
+++ b/data/layouts/SSTidal_Rooms/border.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/map.bin b/data/layouts/SSTidal_Rooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/layouts/UnusedLayout_82DC4EC/map.bin
+++ b/data/layouts/SSTidal_Rooms/map.bin
diff --git a/data/layouts/SaffronCity_Classic/border.bin b/data/layouts/SaffronCity_Connection/border.bin
index a701312cf..a701312cf 100644
--- a/data/layouts/SaffronCity_Classic/border.bin
+++ b/data/layouts/SaffronCity_Connection/border.bin
diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Connection/map.bin
index dd7aea1cf..dd7aea1cf 100644
--- a/data/layouts/SaffronCity_Classic/map.bin
+++ b/data/layouts/SaffronCity_Connection/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_1F/border.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin
diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin
index 6db070ab7..6db070ab7 100644
--- a/data/layouts/SaffronCity_House1_1F/map.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_2F/border.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin
diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin
index c3090f485..c3090f485 100644
--- a/data/layouts/SaffronCity_House1_2F/map.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/border.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_3F/border.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/map.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
index b9381326f..b9381326f 100644
--- a/data/layouts/UnusedLayout_8338B4C/map.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCDFC/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/layouts/UnusedLayout_82DCCD4/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCF00/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/layouts/UnusedLayout_82DCD68/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82DD004/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DD004/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/layouts/UnusedLayout_82DCDFC/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin
index a021ddd4e..a021ddd4e 100644
--- a/data/layouts/UnusedLayout_83453C0/border.bin
+++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin
diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin
index ffc668ba5..ffc668ba5 100644
--- a/data/layouts/UnusedLayout_83453C0/map.bin
+++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/border.bin b/data/layouts/TrainerTower_1F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_4F/border.bin
+++ b/data/layouts/TrainerTower_1F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/map.bin b/data/layouts/TrainerTower_1F/map.bin
index 812cea451..812cea451 100644
--- a/data/layouts/SevenIsland_TrainerTower_1F/map.bin
+++ b/data/layouts/TrainerTower_1F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/border.bin b/data/layouts/TrainerTower_1F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_5F/border.bin
+++ b/data/layouts/TrainerTower_1F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834BC2C/map.bin b/data/layouts/TrainerTower_1F_Doubles/map.bin
index 891ae066e..891ae066e 100644
--- a/data/layouts/UnusedLayout_834BC2C/map.bin
+++ b/data/layouts/TrainerTower_1F_Doubles/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/border.bin b/data/layouts/TrainerTower_1F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_6F/border.bin
+++ b/data/layouts/TrainerTower_1F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D06C/map.bin b/data/layouts/TrainerTower_1F_Knockout/map.bin
index 3e3ebcc94..3e3ebcc94 100644
--- a/data/layouts/UnusedLayout_834D06C/map.bin
+++ b/data/layouts/TrainerTower_1F_Knockout/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/border.bin b/data/layouts/TrainerTower_2F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_7F/border.bin
+++ b/data/layouts/TrainerTower_2F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/map.bin b/data/layouts/TrainerTower_2F/map.bin
index 7ae889af1..7ae889af1 100644
--- a/data/layouts/SevenIsland_TrainerTower_2F/map.bin
+++ b/data/layouts/TrainerTower_2F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/TrainerTower_2F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_8F/border.bin
+++ b/data/layouts/TrainerTower_2F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/map.bin b/data/layouts/TrainerTower_2F_Doubles/map.bin
index ab44abb18..ab44abb18 100644
--- a/data/layouts/UnusedLayout_834BEB4/map.bin
+++ b/data/layouts/TrainerTower_2F_Doubles/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/TrainerTower_2F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin
+++ b/data/layouts/TrainerTower_2F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/map.bin b/data/layouts/TrainerTower_2F_Knockout/map.bin
index cfc96995c..cfc96995c 100644
--- a/data/layouts/UnusedLayout_834D2F4/map.bin
+++ b/data/layouts/TrainerTower_2F_Knockout/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/TrainerTower_3F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin
+++ b/data/layouts/TrainerTower_3F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/map.bin b/data/layouts/TrainerTower_3F/map.bin
index c01e70c2f..c01e70c2f 100644
--- a/data/layouts/SevenIsland_TrainerTower_3F/map.bin
+++ b/data/layouts/TrainerTower_3F/map.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/border.bin b/data/layouts/TrainerTower_3F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_82D6C34/border.bin
+++ b/data/layouts/TrainerTower_3F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C13C/map.bin b/data/layouts/TrainerTower_3F_Doubles/map.bin
index 514cb7239..514cb7239 100644
--- a/data/layouts/UnusedLayout_834C13C/map.bin
+++ b/data/layouts/TrainerTower_3F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/border.bin b/data/layouts/TrainerTower_3F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338B4C/border.bin
+++ b/data/layouts/TrainerTower_3F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D57C/map.bin b/data/layouts/TrainerTower_3F_Knockout/map.bin
index da9cc3f75..da9cc3f75 100644
--- a/data/layouts/UnusedLayout_834D57C/map.bin
+++ b/data/layouts/TrainerTower_3F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_8338E90/border.bin b/data/layouts/TrainerTower_4F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338E90/border.bin
+++ b/data/layouts/TrainerTower_4F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/map.bin b/data/layouts/TrainerTower_4F/map.bin
index 057d7f955..057d7f955 100644
--- a/data/layouts/SevenIsland_TrainerTower_4F/map.bin
+++ b/data/layouts/TrainerTower_4F/map.bin
diff --git a/data/layouts/UnusedLayout_833902C/border.bin b/data/layouts/TrainerTower_4F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_833902C/border.bin
+++ b/data/layouts/TrainerTower_4F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/map.bin b/data/layouts/TrainerTower_4F_Doubles/map.bin
index d9a50b7a1..d9a50b7a1 100644
--- a/data/layouts/UnusedLayout_834C3C4/map.bin
+++ b/data/layouts/TrainerTower_4F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834BC2C/border.bin b/data/layouts/TrainerTower_4F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BC2C/border.bin
+++ b/data/layouts/TrainerTower_4F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D804/map.bin b/data/layouts/TrainerTower_4F_Knockout/map.bin
index cf5e1e94e..cf5e1e94e 100644
--- a/data/layouts/UnusedLayout_834D804/map.bin
+++ b/data/layouts/TrainerTower_4F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/border.bin b/data/layouts/TrainerTower_5F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BEB4/border.bin
+++ b/data/layouts/TrainerTower_5F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/map.bin b/data/layouts/TrainerTower_5F/map.bin
index d580e7d2d..d580e7d2d 100644
--- a/data/layouts/SevenIsland_TrainerTower_5F/map.bin
+++ b/data/layouts/TrainerTower_5F/map.bin
diff --git a/data/layouts/UnusedLayout_834C13C/border.bin b/data/layouts/TrainerTower_5F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C13C/border.bin
+++ b/data/layouts/TrainerTower_5F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C64C/map.bin b/data/layouts/TrainerTower_5F_Doubles/map.bin
index 37b4aba85..37b4aba85 100644
--- a/data/layouts/UnusedLayout_834C64C/map.bin
+++ b/data/layouts/TrainerTower_5F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/border.bin b/data/layouts/TrainerTower_5F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C3C4/border.bin
+++ b/data/layouts/TrainerTower_5F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/map.bin b/data/layouts/TrainerTower_5F_Knockout/map.bin
index 1f10bfff1..1f10bfff1 100644
--- a/data/layouts/UnusedLayout_834DA8C/map.bin
+++ b/data/layouts/TrainerTower_5F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834C64C/border.bin b/data/layouts/TrainerTower_6F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C64C/border.bin
+++ b/data/layouts/TrainerTower_6F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/map.bin b/data/layouts/TrainerTower_6F/map.bin
index 3c2c3165c..3c2c3165c 100644
--- a/data/layouts/SevenIsland_TrainerTower_6F/map.bin
+++ b/data/layouts/TrainerTower_6F/map.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/border.bin b/data/layouts/TrainerTower_6F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C8D4/border.bin
+++ b/data/layouts/TrainerTower_6F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/map.bin b/data/layouts/TrainerTower_6F_Doubles/map.bin
index 2df5cd891..2df5cd891 100644
--- a/data/layouts/UnusedLayout_834C8D4/map.bin
+++ b/data/layouts/TrainerTower_6F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/border.bin b/data/layouts/TrainerTower_6F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CB5C/border.bin
+++ b/data/layouts/TrainerTower_6F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DD14/map.bin b/data/layouts/TrainerTower_6F_Knockout/map.bin
index fe3d6f908..fe3d6f908 100644
--- a/data/layouts/UnusedLayout_834DD14/map.bin
+++ b/data/layouts/TrainerTower_6F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/border.bin b/data/layouts/TrainerTower_7F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CDE4/border.bin
+++ b/data/layouts/TrainerTower_7F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/map.bin b/data/layouts/TrainerTower_7F/map.bin
index d9bb110cf..d9bb110cf 100644
--- a/data/layouts/SevenIsland_TrainerTower_7F/map.bin
+++ b/data/layouts/TrainerTower_7F/map.bin
diff --git a/data/layouts/UnusedLayout_834D06C/border.bin b/data/layouts/TrainerTower_7F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D06C/border.bin
+++ b/data/layouts/TrainerTower_7F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/map.bin b/data/layouts/TrainerTower_7F_Doubles/map.bin
index e977b7e26..e977b7e26 100644
--- a/data/layouts/UnusedLayout_834CB5C/map.bin
+++ b/data/layouts/TrainerTower_7F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/border.bin b/data/layouts/TrainerTower_7F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D2F4/border.bin
+++ b/data/layouts/TrainerTower_7F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/map.bin b/data/layouts/TrainerTower_7F_Knockout/map.bin
index 241077797..241077797 100644
--- a/data/layouts/UnusedLayout_834DF9C/map.bin
+++ b/data/layouts/TrainerTower_7F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834D57C/border.bin b/data/layouts/TrainerTower_8F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D57C/border.bin
+++ b/data/layouts/TrainerTower_8F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/map.bin b/data/layouts/TrainerTower_8F/map.bin
index 6ba6588be..6ba6588be 100644
--- a/data/layouts/SevenIsland_TrainerTower_8F/map.bin
+++ b/data/layouts/TrainerTower_8F/map.bin
diff --git a/data/layouts/UnusedLayout_834D804/border.bin b/data/layouts/TrainerTower_8F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D804/border.bin
+++ b/data/layouts/TrainerTower_8F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/map.bin b/data/layouts/TrainerTower_8F_Doubles/map.bin
index e358d2f3d..e358d2f3d 100644
--- a/data/layouts/UnusedLayout_834CDE4/map.bin
+++ b/data/layouts/TrainerTower_8F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/border.bin b/data/layouts/TrainerTower_8F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DA8C/border.bin
+++ b/data/layouts/TrainerTower_8F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834E224/map.bin b/data/layouts/TrainerTower_8F_Knockout/map.bin
index bb5ccf05c..bb5ccf05c 100644
--- a/data/layouts/UnusedLayout_834E224/map.bin
+++ b/data/layouts/TrainerTower_8F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834DD14/border.bin b/data/layouts/TrainerTower_Elevator/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DD14/border.bin
+++ b/data/layouts/TrainerTower_Elevator/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin b/data/layouts/TrainerTower_Elevator/map.bin
index 42e08c38d..42e08c38d 100644
--- a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin
+++ b/data/layouts/TrainerTower_Elevator/map.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/border.bin b/data/layouts/TrainerTower_Lobby/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DF9C/border.bin
+++ b/data/layouts/TrainerTower_Lobby/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin b/data/layouts/TrainerTower_Lobby/map.bin
index b98077279..b98077279 100644
--- a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin
+++ b/data/layouts/TrainerTower_Lobby/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin b/data/layouts/TrainerTower_Roof/border.bin
index f94adee61..f94adee61 100644
--- a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin
+++ b/data/layouts/TrainerTower_Roof/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin b/data/layouts/TrainerTower_Roof/map.bin
index 37d57f3fe..37d57f3fe 100644
--- a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin
+++ b/data/layouts/TrainerTower_Roof/map.bin
diff --git a/data/layouts/UnusedLayout_834E224/border.bin b/data/layouts/Unused1/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834E224/border.bin
+++ b/data/layouts/Unused1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/map.bin b/data/layouts/Unused1/map.bin
index 35968a7fd..35968a7fd 100644
--- a/data/layouts/UnusedLayout_82D6C34/map.bin
+++ b/data/layouts/Unused1/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 63fc06562..a9911aed4 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -8,8 +8,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin"
     },
@@ -20,8 +20,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
     },
@@ -32,22 +32,22 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D54D8",
-      "name": "UnusedLayout_82D54D8_Layout",
+      "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+      "name": "LittlerootTown_MaysHouse_2F_Layout",
       "width": 9,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB",
@@ -56,8 +56,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin"
     },
@@ -68,8 +68,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House1/border.bin",
       "blockdata_filepath": "data/layouts/House1/map.bin"
     },
@@ -80,8 +80,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House2/border.bin",
       "blockdata_filepath": "data/layouts/House2/map.bin"
     },
@@ -92,8 +92,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin"
     },
@@ -104,8 +104,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin"
     },
@@ -116,8 +116,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
       "border_filepath": "data/layouts/Mart/border.bin",
       "blockdata_filepath": "data/layouts/Mart/map.bin"
     },
@@ -128,8 +128,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House3/border.bin",
       "blockdata_filepath": "data/layouts/House3/map.bin"
     },
@@ -140,8 +140,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D1C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeruleanGym",
       "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin"
     },
@@ -152,22 +152,22 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House4/border.bin",
       "blockdata_filepath": "data/layouts/House4/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6144",
-      "name": "UnusedLayout_82D6144_Layout",
+      "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
+      "name": "LavaridgeTown_HerbShop_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin"
     },
     {
       "id": "LAYOUT_CELADON_CITY_GYM",
@@ -176,22 +176,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D4C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeladonGym",
       "border_filepath": "data/layouts/CeladonCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6490",
-      "name": "UnusedLayout_82D6490_Layout",
+      "id": "LAYOUT_RS_POKEMON_CENTER_1F",
+      "name": "RS_PokemonCenter_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/RS_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RS_PokemonCenter_1F/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
@@ -200,34 +200,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6654",
-      "name": "UnusedLayout_82D6654_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+      "name": "PacifidlogTown_House1_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D672C",
-      "name": "UnusedLayout_82D672C_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+      "name": "PacifidlogTown_House2_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin"
     },
     {
       "id": "LAYOUT_FUCHSIA_CITY_GYM",
@@ -236,8 +236,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FuchsiaGym",
       "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin"
     },
@@ -248,24 +248,24 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House5/border.bin",
       "blockdata_filepath": "data/layouts/House5/map.bin"
     },
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6C34",
-      "name": "UnusedLayout_82D6C34_Layout",
+      "id": "LAYOUT_UNUSED1",
+      "name": "Unused1_Layout",
       "width": 12,
       "height": 12,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "NULL",
-      "secondary_tileset": "gTileset_82D4C14",
-      "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin"
+      "secondary_tileset": "gTileset_Dummy1",
+      "border_filepath": "data/layouts/Unused1/border.bin",
+      "blockdata_filepath": "data/layouts/Unused1/map.bin"
     },
     {
       "id": "LAYOUT_VERMILION_CITY_GYM",
@@ -274,8 +274,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D34",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_VermilionGym",
       "border_filepath": "data/layouts/VermilionCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin"
     },
@@ -286,8 +286,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BikeShop",
       "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin"
     },
@@ -298,8 +298,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin"
     },
@@ -310,8 +310,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/PewterCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin"
     },
@@ -323,8 +323,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin"
     },
@@ -335,34 +335,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/ThreeIsland_House1/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D75F0",
-      "name": "UnusedLayout_82D75F0_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
+      "name": "RustboroCity_CuttersHouse_Layout",
       "width": 11,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7674",
-      "name": "UnusedLayout_82D7674_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE1",
+      "name": "FortreeCity_House1_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_GYM",
@@ -371,22 +371,22 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D64",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SaffronGym",
       "border_filepath": "data/layouts/SaffronCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8",
-      "name": "UnusedLayout_82D7CC8_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE2",
+      "name": "FortreeCity_House2_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin"
     },
     {
       "id": "LAYOUT_CINNABAR_ISLAND_GYM",
@@ -395,8 +395,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D7C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CinnabarGym",
       "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin"
     },
@@ -407,8 +407,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CBC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_ViridianGym",
       "border_filepath": "data/layouts/ViridianCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin"
     },
@@ -421,16 +421,16 @@
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D88C8",
-      "name": "UnusedLayout_82D88C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_ENTRANCE",
+      "name": "RS_SafariZone_Entrance_Layout",
       "width": 18,
       "height": 14,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/RS_SafariZone_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Entrance/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
@@ -439,8 +439,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
     },
@@ -451,8 +451,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/TradeCenter/border.bin",
       "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
     },
@@ -463,8 +463,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/RecordCenter/border.bin",
       "blockdata_filepath": "data/layouts/RecordCenter/map.bin"
     },
@@ -475,8 +475,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
     },
@@ -487,256 +487,256 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D9B24",
-      "name": "UnusedLayout_82D9B24_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_NORTHEAST",
+      "name": "RS_SafariZone_Northeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Northeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Northeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8",
-      "name": "UnusedLayout_82DA7C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHWEST",
+      "name": "RS_SafariZone_Southwest_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southwest/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southwest/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB46C",
-      "name": "UnusedLayout_82DB46C_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHEAST",
+      "name": "RS_SafariZone_Southeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0",
-      "name": "UnusedLayout_82DB4F0_Layout",
+      "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
+      "name": "FortreeCity_DecorationShop_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0",
-      "name": "UnusedLayout_82DBBE0_Layout",
+      "id": "LAYOUT_RS_BATTLE_TOWER",
+      "name": "RS_BattleTower_Layout",
       "width": 29,
       "height": 30,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
-      "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
+      "border_filepath": "data/layouts/RS_BattleTower/border.bin",
+      "blockdata_filepath": "data/layouts/RS_BattleTower/map.bin"
     },
     {},
     {},
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8",
-      "name": "UnusedLayout_82DBDD8_Layout",
+      "id": "LAYOUT_SS_TIDAL_CORRIDOR",
+      "name": "SSTidal_Corridor_Layout",
       "width": 18,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Corridor/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8",
-      "name": "UnusedLayout_82DBFB8_Layout",
+      "id": "LAYOUT_SS_TIDAL_LOWER_DECK",
+      "name": "SSTidal_LowerDeck_Layout",
       "width": 17,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_LowerDeck/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_LowerDeck/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC",
-      "name": "UnusedLayout_82DC4EC_Layout",
+      "id": "LAYOUT_SS_TIDAL_ROOMS",
+      "name": "SSTidal_Rooms_Layout",
       "width": 36,
       "height": 18,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Rooms/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Rooms/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC60C",
-      "name": "UnusedLayout_82DC60C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
+      "name": "RustboroCity_Flat2_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC72C",
-      "name": "UnusedLayout_82DC72C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
+      "name": "RustboroCity_Flat2_2F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC84C",
-      "name": "UnusedLayout_82DC84C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+      "name": "RustboroCity_Flat2_3F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCA70",
-      "name": "UnusedLayout_82DCA70_Layout",
+      "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
+      "name": "EverGrandeCity_HallOfFame_Layout",
       "width": 15,
       "height": 17,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCB44",
-      "name": "UnusedLayout_82DCB44_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F",
+      "name": "MossdeepCity_EReaderTrainerHouse_1F_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCC40",
-      "name": "UnusedLayout_82DCC40_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F",
+      "name": "MossdeepCity_EReaderTrainerHouse_2F_Layout",
       "width": 12,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4",
-      "name": "UnusedLayout_82DCCD4_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+      "name": "SootopolisCity_House1_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCD68",
-      "name": "UnusedLayout_82DCD68_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+      "name": "SootopolisCity_House2_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC",
-      "name": "UnusedLayout_82DCDFC_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+      "name": "SootopolisCity_House3_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House3/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCF00",
-      "name": "UnusedLayout_82DCF00_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
+      "name": "RustboroCity_Flat1_1F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD004",
-      "name": "UnusedLayout_82DD004_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
+      "name": "RustboroCity_Flat1_2F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC",
-      "name": "UnusedLayout_82DD0DC_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_REST_HOUSE",
+      "name": "RS_SafariZone_RestHouse_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RS_SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_RestHouse/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN",
@@ -745,8 +745,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/PalletTown/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown/map.bin"
     },
@@ -757,8 +757,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/ViridianCity/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity/map.bin"
     },
@@ -769,8 +769,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/PewterCity/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity/map.bin"
     },
@@ -781,8 +781,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/CeruleanCity/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity/map.bin"
     },
@@ -793,8 +793,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/LavenderTown/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown/map.bin"
     },
@@ -805,8 +805,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/VermilionCity/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity/map.bin"
     },
@@ -817,8 +817,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/CeladonCity/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity/map.bin"
     },
@@ -829,8 +829,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/FuchsiaCity/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin"
     },
@@ -841,8 +841,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/CinnabarIsland/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin"
     },
@@ -853,22 +853,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_CLASSIC",
-      "name": "SaffronCity_Classic_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_CONNECTION",
+      "name": "SaffronCity_Connection_Layout",
       "width": 48,
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
-      "border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
+      "border_filepath": "data/layouts/SaffronCity_Connection/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Connection/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE1",
@@ -877,8 +877,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route1/border.bin",
       "blockdata_filepath": "data/layouts/Route1/map.bin"
     },
@@ -889,8 +889,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route2/border.bin",
       "blockdata_filepath": "data/layouts/Route2/map.bin"
     },
@@ -901,8 +901,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/Route3/border.bin",
       "blockdata_filepath": "data/layouts/Route3/map.bin"
     },
@@ -913,8 +913,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route4/border.bin",
       "blockdata_filepath": "data/layouts/Route4/map.bin"
     },
@@ -925,8 +925,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route5/border.bin",
       "blockdata_filepath": "data/layouts/Route5/map.bin"
     },
@@ -937,8 +937,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route6/border.bin",
       "blockdata_filepath": "data/layouts/Route6/map.bin"
     },
@@ -949,8 +949,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route7/border.bin",
       "blockdata_filepath": "data/layouts/Route7/map.bin"
     },
@@ -961,8 +961,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route8/border.bin",
       "blockdata_filepath": "data/layouts/Route8/map.bin"
     },
@@ -973,8 +973,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route9/border.bin",
       "blockdata_filepath": "data/layouts/Route9/map.bin"
     },
@@ -985,8 +985,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route10/border.bin",
       "blockdata_filepath": "data/layouts/Route10/map.bin"
     },
@@ -997,8 +997,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route11/border.bin",
       "blockdata_filepath": "data/layouts/Route11/map.bin"
     },
@@ -1009,8 +1009,8 @@
       "height": 120,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route12/border.bin",
       "blockdata_filepath": "data/layouts/Route12/map.bin"
     },
@@ -1021,8 +1021,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route13/border.bin",
       "blockdata_filepath": "data/layouts/Route13/map.bin"
     },
@@ -1033,8 +1033,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route14/border.bin",
       "blockdata_filepath": "data/layouts/Route14/map.bin"
     },
@@ -1045,8 +1045,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route15/border.bin",
       "blockdata_filepath": "data/layouts/Route15/map.bin"
     },
@@ -1057,8 +1057,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route16/border.bin",
       "blockdata_filepath": "data/layouts/Route16/map.bin"
     },
@@ -1069,8 +1069,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route17/border.bin",
       "blockdata_filepath": "data/layouts/Route17/map.bin"
     },
@@ -1081,8 +1081,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route18/border.bin",
       "blockdata_filepath": "data/layouts/Route18/map.bin"
     },
@@ -1093,8 +1093,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route19/border.bin",
       "blockdata_filepath": "data/layouts/Route19/map.bin"
     },
@@ -1105,8 +1105,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route20/border.bin",
       "blockdata_filepath": "data/layouts/Route20/map.bin"
     },
@@ -1117,8 +1117,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route21_North/border.bin",
       "blockdata_filepath": "data/layouts/Route21_North/map.bin"
     },
@@ -1129,8 +1129,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route22/border.bin",
       "blockdata_filepath": "data/layouts/Route22/map.bin"
     },
@@ -1141,8 +1141,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/Route23/border.bin",
       "blockdata_filepath": "data/layouts/Route23/map.bin"
     },
@@ -1153,8 +1153,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route24/border.bin",
       "blockdata_filepath": "data/layouts/Route24/map.bin"
     },
@@ -1165,8 +1165,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route25/border.bin",
       "blockdata_filepath": "data/layouts/Route25/map.bin"
     },
@@ -1177,8 +1177,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin"
     },
@@ -1189,8 +1189,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin"
     },
@@ -1201,8 +1201,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin"
     },
@@ -1213,8 +1213,8 @@
       "height": 69,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/ViridianForest/border.bin",
       "blockdata_filepath": "data/layouts/ViridianForest/map.bin"
     },
@@ -1225,8 +1225,8 @@
       "height": 32,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/SSAnne_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin"
     },
@@ -1237,8 +1237,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin"
     },
@@ -1249,8 +1249,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin"
     },
@@ -1261,8 +1261,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin"
     },
@@ -1273,8 +1273,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin"
     },
@@ -1285,8 +1285,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Deck/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin"
     },
@@ -1297,8 +1297,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin"
     },
@@ -1309,8 +1309,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_1F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin"
     },
@@ -1321,8 +1321,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_2F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin"
     },
@@ -1333,8 +1333,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_3F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin"
     },
@@ -1345,8 +1345,8 @@
       "height": 34,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin"
     },
@@ -1357,8 +1357,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B2F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin"
     },
@@ -1369,8 +1369,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B3F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin"
     },
@@ -1381,8 +1381,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B4F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin"
     },
@@ -1393,8 +1393,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_1F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin"
     },
@@ -1405,8 +1405,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_2F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin"
     },
@@ -1417,8 +1417,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_3F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin"
     },
@@ -1429,8 +1429,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_4F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin"
     },
@@ -1441,8 +1441,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_5F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin"
     },
@@ -1453,8 +1453,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_6F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin"
     },
@@ -1465,8 +1465,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_7F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin"
     },
@@ -1477,8 +1477,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_8F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin"
     },
@@ -1489,8 +1489,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_9F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin"
     },
@@ -1501,8 +1501,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_10F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin"
     },
@@ -1513,8 +1513,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_11F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin"
     },
@@ -1525,8 +1525,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin"
     },
@@ -1537,8 +1537,8 @@
       "height": 38,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin"
     },
@@ -1549,8 +1549,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin"
     },
@@ -1561,8 +1561,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin"
     },
@@ -1573,8 +1573,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_Center/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin"
     },
@@ -1585,8 +1585,8 @@
       "height": 35,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_East/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_East/map.bin"
     },
@@ -1597,8 +1597,8 @@
       "height": 40,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_North/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_North/map.bin"
     },
@@ -1609,8 +1609,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_West/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_West/map.bin"
     },
@@ -1621,8 +1621,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin"
     },
@@ -1633,8 +1633,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin"
     },
@@ -1645,8 +1645,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin"
     },
@@ -1657,8 +1657,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin"
     },
@@ -1669,8 +1669,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin"
     },
@@ -1681,8 +1681,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin"
     },
@@ -1693,8 +1693,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin"
     },
@@ -1705,8 +1705,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin"
     },
@@ -1717,8 +1717,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin"
     },
@@ -1729,8 +1729,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin"
     },
@@ -1741,8 +1741,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin"
     },
@@ -1753,8 +1753,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin"
     },
@@ -1765,8 +1765,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin"
     },
@@ -1777,8 +1777,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_4F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin"
     },
@@ -1789,8 +1789,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_5F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin"
     },
@@ -1801,8 +1801,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_6F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin"
     },
@@ -1813,8 +1813,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_7F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin"
     },
@@ -1825,8 +1825,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E9C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PowerPlant",
       "border_filepath": "data/layouts/PowerPlant/border.bin",
       "blockdata_filepath": "data/layouts/PowerPlant/map.bin"
     },
@@ -1837,8 +1837,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EB4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeaCottage",
       "border_filepath": "data/layouts/Route25_SeaCottage/border.bin",
       "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin"
     },
@@ -1849,8 +1849,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin"
     },
@@ -1861,8 +1861,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin"
     },
@@ -1873,8 +1873,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin"
     },
@@ -1885,8 +1885,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin"
     },
@@ -1897,8 +1897,8 @@
       "height": 63,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin"
     },
@@ -1910,8 +1910,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin"
     },
@@ -1922,8 +1922,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin"
     },
@@ -1934,8 +1934,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin"
     },
@@ -1946,8 +1946,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin"
     },
@@ -1958,8 +1958,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin"
     },
@@ -1970,8 +1970,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin"
     },
@@ -1982,8 +1982,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4FA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BurgledHouse",
       "border_filepath": "data/layouts/CeruleanCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin"
     },
@@ -1994,8 +1994,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin"
     },
@@ -2006,8 +2006,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin"
     },
@@ -2018,8 +2018,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin"
     },
@@ -2030,8 +2030,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin"
     },
@@ -2042,8 +2042,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin"
     },
@@ -2054,8 +2054,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin"
     },
@@ -2066,8 +2066,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin"
     },
@@ -2078,8 +2078,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin"
     },
@@ -2090,8 +2090,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin"
     },
@@ -2102,8 +2102,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin"
     },
@@ -2114,8 +2114,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin"
     },
@@ -2126,8 +2126,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin"
     },
@@ -2138,8 +2138,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin"
     },
@@ -2150,8 +2150,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin"
     },
@@ -2162,8 +2162,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
     },
@@ -2174,8 +2174,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
     },
@@ -2186,8 +2186,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin"
     },
@@ -2198,8 +2198,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/map.bin"
     },
@@ -2210,8 +2210,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_WardensHouse/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_WardensHouse/map.bin"
     },
@@ -2222,8 +2222,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin"
     },
@@ -2234,8 +2234,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin"
     },
@@ -2246,8 +2246,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin"
     },
@@ -2258,8 +2258,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin"
     },
@@ -2270,8 +2270,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
     },
@@ -2282,8 +2282,8 @@
       "height": 55,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
       "border_filepath": "data/layouts/SaffronCity/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
     },
@@ -2294,8 +2294,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin"
     },
@@ -2306,8 +2306,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin"
     },
@@ -2318,8 +2318,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin"
     },
@@ -2330,8 +2330,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin"
     },
@@ -2342,8 +2342,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin"
     },
@@ -2354,8 +2354,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin"
     },
@@ -2366,8 +2366,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin"
     },
@@ -2378,8 +2378,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin"
     },
@@ -2390,8 +2390,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin"
     },
@@ -2402,8 +2402,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin"
     },
@@ -2414,8 +2414,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin"
     },
@@ -2426,8 +2426,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route21_South/border.bin",
       "blockdata_filepath": "data/layouts/Route21_South/map.bin"
     },
@@ -2438,8 +2438,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_2F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_2F/map.bin"
     },
@@ -2450,8 +2450,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route2_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin"
     },
@@ -2462,8 +2462,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin"
     },
@@ -2474,8 +2474,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin"
     },
@@ -2486,8 +2486,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_1F/map.bin"
     },
@@ -2498,34 +2498,34 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
-      "name": "SaffronCity_House1_1F_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
+      "name": "SaffronCity_CopycatsHouse_1F_Layout",
       "width": 13,
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
-      "name": "SaffronCity_House1_2F_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
+      "name": "SaffronCity_CopycatsHouse_2F_Layout",
       "width": 12,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_DOJO",
@@ -2534,8 +2534,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin"
     },
@@ -2546,8 +2546,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin"
     },
@@ -2558,8 +2558,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland/map.bin"
     },
@@ -2570,8 +2570,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland/map.bin"
     },
@@ -2582,8 +2582,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland/map.bin"
     },
@@ -2594,8 +2594,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FourIsland/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland/map.bin"
     },
@@ -2606,8 +2606,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland/map.bin"
     },
@@ -2618,8 +2618,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland/map.bin"
     },
@@ -2630,8 +2630,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland/map.bin"
     },
@@ -2642,8 +2642,8 @@
       "height": 140,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin"
     },
@@ -2654,8 +2654,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin"
     },
@@ -2666,8 +2666,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin"
     },
@@ -2678,8 +2678,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin"
     },
@@ -2690,58 +2690,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_Port/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_50",
-      "name": "UnknownMap_03_50_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
+      "name": "Prototype_SeviiIsle_6_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_50/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_6/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_6/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_51",
-      "name": "UnknownMap_03_51_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
+      "name": "Prototype_SeviiIsle_7_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_51/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_7/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_7/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_52",
-      "name": "UnknownMap_03_52_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
+      "name": "Prototype_SeviiIsle_8_Layout",
       "width": 84,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_52/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_8/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_8/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_53",
-      "name": "UnknownMap_03_53_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
+      "name": "Prototype_SeviiIsle_9_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_53/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_9/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_9/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
@@ -2750,8 +2750,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin"
     },
@@ -2762,8 +2762,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin"
     },
@@ -2774,8 +2774,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin"
     },
@@ -2786,8 +2786,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin"
     },
@@ -2798,8 +2798,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin"
     },
@@ -2810,8 +2810,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin"
     },
@@ -2822,8 +2822,8 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin"
     },
@@ -2834,8 +2834,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin"
     },
@@ -2846,8 +2846,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin"
     },
@@ -2858,8 +2858,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin"
     },
@@ -2870,8 +2870,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin"
     },
@@ -2882,58 +2882,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833614C",
-      "name": "UnusedLayout_833614C_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_22",
+      "name": "Prototype_SeviiIsle_22_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_22/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_22/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_83377F0",
-      "name": "UnusedLayout_83377F0_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST",
+      "name": "Prototype_SeviiIsle_23_East_Layout",
       "width": 144,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_East/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_East/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338354",
-      "name": "UnusedLayout_8338354_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST",
+      "name": "Prototype_SeviiIsle_23_West_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_West/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_West/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338738",
-      "name": "UnusedLayout_8338738_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_24",
+      "name": "Prototype_SeviiIsle_24_Layout",
       "width": 24,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_24/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_24/map.bin"
     },
     {
       "id": "LAYOUT_UNION_ROOM",
@@ -2942,8 +2942,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/UnionRoom/border.bin",
       "blockdata_filepath": "data/layouts/UnionRoom/map.bin"
     },
@@ -2954,22 +2954,22 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338B4C",
-      "name": "UnusedLayout_8338B4C_Layout",
+      "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN",
+      "name": "SevenIsland_House_Room1_DoorOpen_Layout",
       "width": 11,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
-      "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
+      "border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2",
@@ -2978,8 +2978,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin"
     },
@@ -2990,34 +2990,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/ViridianCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338E90",
-      "name": "UnusedLayout_8338E90_Layout",
+      "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE",
+      "name": "CeladonCity_Restaurant_Duplicate_Layout",
       "width": 15,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833902C",
-      "name": "UnusedLayout_833902C_Layout",
+      "id": "LAYOUT_CELADON_CITY_HOTEL_DUPLICATE",
+      "name": "CeladonCity_Hotel_Duplicate_Layout",
       "width": 17,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/map.bin"
     },
     {
       "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F",
@@ -3026,8 +3026,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin"
     },
@@ -3038,8 +3038,8 @@
       "height": 47,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5004",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BerryForest",
       "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin"
     },
@@ -3050,8 +3050,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin"
     },
@@ -3062,8 +3062,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin"
     },
@@ -3074,8 +3074,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin"
     },
@@ -3086,8 +3086,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin"
     },
@@ -3098,8 +3098,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin"
     },
@@ -3110,8 +3110,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/ViridianCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin"
     },
@@ -3122,8 +3122,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin"
     },
@@ -3134,8 +3134,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin"
     },
@@ -3146,8 +3146,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin"
     },
@@ -3158,8 +3158,8 @@
       "height": 54,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin"
     },
@@ -3170,8 +3170,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Summit/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin"
     },
@@ -3182,8 +3182,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin"
     },
@@ -3194,8 +3194,8 @@
       "height": 46,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin"
     },
@@ -3206,8 +3206,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin"
     },
@@ -3218,8 +3218,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin"
     },
@@ -3230,8 +3230,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin"
     },
@@ -3242,8 +3242,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin"
     },
@@ -3254,8 +3254,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin"
     },
@@ -3266,8 +3266,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin"
     },
@@ -3278,8 +3278,8 @@
       "height": 6,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin"
     },
@@ -3290,8 +3290,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin"
     },
@@ -3302,8 +3302,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin"
     },
@@ -3314,8 +3314,8 @@
       "height": 36,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin"
     },
@@ -3326,8 +3326,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin"
     },
@@ -3338,8 +3338,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin"
     },
@@ -3350,142 +3350,142 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
-      "name": "SevenIsland_TrainerTower_Lobby_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_LOBBY",
+      "name": "TrainerTower_Lobby_Layout",
       "width": 19,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_Lobby/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Lobby/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
-      "name": "SevenIsland_TrainerTower_1F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F",
+      "name": "TrainerTower_1F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
-      "name": "SevenIsland_TrainerTower_2F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F",
+      "name": "TrainerTower_2F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
-      "name": "SevenIsland_TrainerTower_3F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F",
+      "name": "TrainerTower_3F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
-      "name": "SevenIsland_TrainerTower_4F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F",
+      "name": "TrainerTower_4F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
-      "name": "SevenIsland_TrainerTower_5F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F",
+      "name": "TrainerTower_5F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
-      "name": "SevenIsland_TrainerTower_6F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F",
+      "name": "TrainerTower_6F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "name": "SevenIsland_TrainerTower_7F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F",
+      "name": "TrainerTower_7F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
-      "name": "SevenIsland_TrainerTower_8F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F",
+      "name": "TrainerTower_8F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-      "name": "SevenIsland_TrainerTower_Roof_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_ROOF",
+      "name": "TrainerTower_Roof_Layout",
       "width": 18,
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Roof/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "name": "SevenIsland_TrainerTower_Elevator_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_ELEVATOR",
+      "name": "TrainerTower_Elevator_Layout",
       "width": 5,
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
+      "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin"
     },
     {
       "id": "LAYOUT_CERULEAN_CITY_HOUSE5",
@@ -3494,8 +3494,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House5/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin"
     },
@@ -3506,8 +3506,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin"
     },
@@ -3518,8 +3518,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin"
     },
@@ -3530,8 +3530,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin"
     },
@@ -3542,8 +3542,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin"
     },
@@ -3554,8 +3554,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin"
     },
@@ -3566,8 +3566,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin"
     },
@@ -3578,8 +3578,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D50AC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IslandHarbor",
       "border_filepath": "data/layouts/Island_Harbor/border.bin",
       "blockdata_filepath": "data/layouts/Island_Harbor/map.bin"
     },
@@ -3590,8 +3590,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin"
     },
@@ -3602,8 +3602,8 @@
       "height": 32,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin"
     },
@@ -3614,22 +3614,22 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
     },
     {
-      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2",
-      "name": "UnusedLayout_83453C0_Layout",
+      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT",
+      "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout",
       "width": 30,
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
-      "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
@@ -3638,8 +3638,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin"
     },
@@ -3650,8 +3650,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin"
     },
@@ -3662,8 +3662,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin"
     },
@@ -3674,8 +3674,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin"
     },
@@ -3686,8 +3686,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin"
     },
@@ -3698,8 +3698,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin"
     },
@@ -3710,8 +3710,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin"
     },
@@ -3722,8 +3722,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin"
     },
@@ -3734,8 +3734,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin"
     },
@@ -3746,8 +3746,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin"
     },
@@ -3758,8 +3758,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin"
     },
@@ -3770,8 +3770,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin"
     },
@@ -3782,8 +3782,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin"
     },
@@ -3794,8 +3794,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin"
     },
@@ -3806,8 +3806,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin"
     },
@@ -3818,8 +3818,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin"
     },
@@ -3830,8 +3830,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin"
     },
@@ -3842,8 +3842,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin"
     },
@@ -3854,8 +3854,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin"
     },
@@ -3866,8 +3866,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin"
     },
@@ -3878,8 +3878,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
     },
@@ -3890,8 +3890,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
     },
@@ -3902,8 +3902,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin"
     },
@@ -3914,8 +3914,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin"
     },
@@ -3926,8 +3926,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin"
     },
@@ -3938,8 +3938,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Summit/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin"
     },
@@ -3950,8 +3950,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Base/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin"
     },
@@ -3962,8 +3962,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin"
     },
@@ -3974,8 +3974,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin"
     },
@@ -3986,8 +3986,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin"
     },
@@ -3998,8 +3998,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin"
     },
@@ -4010,8 +4010,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin"
     },
@@ -4022,8 +4022,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin"
     },
@@ -4034,8 +4034,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin"
     },
@@ -4046,8 +4046,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin"
     },
@@ -4058,8 +4058,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin"
     },
@@ -4070,8 +4070,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin"
     },
@@ -4082,8 +4082,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin"
     },
@@ -4094,8 +4094,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin"
     },
@@ -4106,8 +4106,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin"
     },
@@ -4118,8 +4118,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin"
     },
@@ -4130,8 +4130,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin"
     },
@@ -4142,8 +4142,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin"
     },
@@ -4154,8 +4154,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin"
     },
@@ -4166,8 +4166,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin"
     },
@@ -4178,202 +4178,202 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Fork/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834BC2C",
-      "name": "UnusedLayout_834BC2C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F_DOUBLES",
+      "name": "TrainerTower_1F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834BEB4",
-      "name": "UnusedLayout_834BEB4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F_DOUBLES",
+      "name": "TrainerTower_2F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C13C",
-      "name": "UnusedLayout_834C13C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F_DOUBLES",
+      "name": "TrainerTower_3F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C3C4",
-      "name": "UnusedLayout_834C3C4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F_DOUBLES",
+      "name": "TrainerTower_4F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C64C",
-      "name": "UnusedLayout_834C64C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F_DOUBLES",
+      "name": "TrainerTower_5F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C8D4",
-      "name": "UnusedLayout_834C8D4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F_DOUBLES",
+      "name": "TrainerTower_6F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834CB5C",
-      "name": "UnusedLayout_834CB5C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F_DOUBLES",
+      "name": "TrainerTower_7F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834CDE4",
-      "name": "UnusedLayout_834CDE4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F_DOUBLES",
+      "name": "TrainerTower_8F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D06C",
-      "name": "UnusedLayout_834D06C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F_KNOCKOUT",
+      "name": "TrainerTower_1F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D2F4",
-      "name": "UnusedLayout_834D2F4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F_KNOCKOUT",
+      "name": "TrainerTower_2F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D57C",
-      "name": "UnusedLayout_834D57C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F_KNOCKOUT",
+      "name": "TrainerTower_3F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D804",
-      "name": "UnusedLayout_834D804_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F_KNOCKOUT",
+      "name": "TrainerTower_4F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DA8C",
-      "name": "UnusedLayout_834DA8C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F_KNOCKOUT",
+      "name": "TrainerTower_5F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DD14",
-      "name": "UnusedLayout_834DD14_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F_KNOCKOUT",
+      "name": "TrainerTower_6F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DF9C",
-      "name": "UnusedLayout_834DF9C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F_KNOCKOUT",
+      "name": "TrainerTower_7F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834E224",
-      "name": "UnusedLayout_834E224_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F_KNOCKOUT",
+      "name": "TrainerTower_8F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1",
@@ -4382,8 +4382,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin"
     },
@@ -4394,8 +4394,8 @@
       "height": 39,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
     }
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 5a4644854..706d9fa35 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -34,7 +34,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CFA",
+      "script": "CeladonCity_EventScript_RocketGrunt1",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
@@ -47,7 +47,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CC5",
+      "script": "CeladonCity_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -60,7 +60,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CDC",
+      "script": "CeladonCity_EventScript_Poliwrath",
       "flag": "0"
     },
     {
@@ -73,7 +73,7 @@
       "movement_range_y": 4,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166C99",
+      "script": "CeladonCity_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -86,7 +86,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CAD",
+      "script": "CeladonCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -99,7 +99,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CB6",
+      "script": "CeladonCity_EventScript_OldMan2",
       "flag": "0"
     },
     {
@@ -125,7 +125,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D03",
+      "script": "CeladonCity_EventScript_RocketGrunt2",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
@@ -138,7 +138,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CA2",
+      "script": "CeladonCity_EventScript_OldMan1",
       "flag": "0"
     },
     {
@@ -177,7 +177,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D0C",
+      "script": "CeladonCity_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -216,7 +216,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D15",
+      "script": "CeladonCity_EventScript_SilphCoScientist",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     }
   ],
@@ -320,56 +320,56 @@
       "x": 45,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D5A"
+      "script": "CeladonCity_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 38,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D63"
+      "script": "CeladonCity_EventScript_PrizeExchangeSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 33,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D6C"
+      "script": "CeladonCity_EventScript_GameCornerSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 22,
       "y": 18,
       "elevation": 3,
-      "script": "CeladonCity_EventScript_166D27"
+      "script": "CeladonCity_EventScript_CitySign"
     },
     {
       "type": "bg_event_type_0",
       "x": 26,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D48"
+      "script": "CeladonCity_EventScript_MansionSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 33,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D1E"
+      "script": "CeladonCity_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 18,
       "y": 14,
       "elevation": 3,
-      "script": "CeladonCity_EventScript_166D51"
+      "script": "CeladonCity_EventScript_DeptStoreSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 16,
       "y": 31,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D30"
+      "script": "CeladonCity_EventScript_GymSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
index b27d12178..a7d7eddc4 100644
--- a/data/maps/CeladonCity/scripts.inc
+++ b/data/maps/CeladonCity/scripts.inc
@@ -6,44 +6,44 @@ CeladonCity_OnTransition:: @ 8166C95
 	setworldmapflag FLAG_WORLD_MAP_CELADON_CITY
 	end
 
-CeladonCity_EventScript_166C99:: @ 8166C99
-	msgbox gUnknown_817FEC3, MSGBOX_NPC
+CeladonCity_EventScript_LittleGirl:: @ 8166C99
+	msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166CA2:: @ 8166CA2
+CeladonCity_EventScript_OldMan1:: @ 8166CA2
 	lock
-	msgbox gUnknown_817FF1C
+	msgbox CeladonCity_Text_GymIsGreatFullOfWomen
 	release
 	end
 
-CeladonCity_EventScript_166CAD:: @ 8166CAD
-	msgbox gUnknown_817FF4A, MSGBOX_NPC
+CeladonCity_EventScript_Woman:: @ 8166CAD
+	msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166CB6:: @ 8166CB6
-	msgbox gUnknown_817FFC5, MSGBOX_NPC
+CeladonCity_EventScript_OldMan2:: @ 8166CB6
+	msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF
 	goto EventScript_SoftboiledTutor
 	end
 
-CeladonCity_EventScript_166CC5:: @ 8166CC5
+CeladonCity_EventScript_FatMan:: @ 8166CC5
 	lock
 	faceplayer
-	msgbox gUnknown_818001B
+	msgbox CeladonCity_Text_MyTrustedPalPoliwrath
 	closemessage
 	applymovement 2, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-CeladonCity_EventScript_166CDC:: @ 8166CDC
+CeladonCity_EventScript_Poliwrath:: @ 8166CDC
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_POLIWRATH, 0
-	msgbox gUnknown_8180075
+	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry
 	applymovement 3, Movement_FaceOriginalDirection
@@ -51,53 +51,53 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC
 	release
 	end
 
-CeladonCity_EventScript_166CFA:: @ 8166CFA
-	msgbox gUnknown_81800C2, MSGBOX_NPC
+CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA
+	msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D03:: @ 8166D03
-	msgbox gUnknown_818008C, MSGBOX_NPC
+CeladonCity_EventScript_RocketGrunt2:: @ 8166D03
+	msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D0C:: @ 8166D0C
-	msgbox gUnknown_8180300, MSGBOX_NPC
+CeladonCity_EventScript_Boy:: @ 8166D0C
+	msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D15:: @ 8166D15
-	msgbox gUnknown_81804E1, MSGBOX_NPC
+CeladonCity_EventScript_SilphCoScientist:: @ 8166D15
+	msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D1E:: @ 8166D1E
-	msgbox gUnknown_81800E1, MSGBOX_SIGN
+CeladonCity_EventScript_TrainerTips1:: @ 8166D1E
+	msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D27:: @ 8166D27
-	msgbox gUnknown_818017A, MSGBOX_SIGN
+CeladonCity_EventScript_CitySign:: @ 8166D27
+	msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D30:: @ 8166D30
+CeladonCity_EventScript_GymSign:: @ 8166D30
 	lockall
 	famechecker FAMECHECKER_ERIKA, 0
-	msgbox gUnknown_81801A2
+	msgbox CeladonCity_Text_GymSign
 	releaseall
 	end
 
-CeladonCity_EventScript_166D48:: @ 8166D48
-	msgbox gUnknown_81801E5, MSGBOX_SIGN
+CeladonCity_EventScript_MansionSign:: @ 8166D48
+	msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D51:: @ 8166D51
-	msgbox gUnknown_81801F5, MSGBOX_SIGN
+CeladonCity_EventScript_DeptStoreSign:: @ 8166D51
+	msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D5A:: @ 8166D5A
-	msgbox gUnknown_8180224, MSGBOX_SIGN
+CeladonCity_EventScript_TrainerTips2:: @ 8166D5A
+	msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D63:: @ 8166D63
-	msgbox gUnknown_81802A4, MSGBOX_SIGN
+CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63
+	msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D6C:: @ 8166D6C
-	msgbox gUnknown_81802CF, MSGBOX_SIGN
+CeladonCity_EventScript_GameCornerSign:: @ 8166D6C
+	msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc
index 40f489e3c..a61cdba6d 100644
--- a/data/maps/CeladonCity/text.inc
+++ b/data/maps/CeladonCity/text.inc
@@ -1,40 +1,40 @@
-gUnknown_817FEC3:: @ 817FEC3
+CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3
     .string "I got my KOFFING in CINNABAR.\p"
     .string "It's usually nice, but it breathes\n"
     .string "poison when it's angry.$"
 
-gUnknown_817FF1C:: @ 817FF1C
+CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C
     .string "Heheh! This GYM is great!\n"
     .string "It's full of women!$"
 
-gUnknown_817FF4A:: @ 817FF4A
+CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A
     .string "CELADON takes pride in its efforts\n"
     .string "to keep the city beautiful.\p"
     .string "That's why the new GAME CORNER is\n"
     .string "bad for our city's image.$"
 
-gUnknown_817FFC5:: @ 817FFC5
+CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5
     .string "Moan…\n"
     .string "I blew it all at the slots!\p"
     .string "I knew I should have cashed in my\n"
     .string "COINS for prizes!$"
 
-gUnknown_818001B:: @ 818001B
+CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B
     .string "This is my trusted pal, POLIWRATH.\p"
     .string "It evolved from a POLIWHIRL when\n"
     .string "I used a WATER STONE.$"
 
-gUnknown_8180075:: @ 8180075
+CeladonCity_Text_Poliwrath:: @ 8180075
     .string "POLIWRATH: Ribi ribit!$"
 
-gUnknown_818008C:: @ 818008C
+CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C
     .string "What are you staring at?\n"
     .string "Get lost, or I'll punch you.$"
 
-gUnknown_81800C2:: @ 81800C2
+CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2
     .string "Keep out of TEAM ROCKET's way!$"
 
-gUnknown_81800E1:: @ 81800E1
+CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1
     .string "TRAINER TIPS\p"
     .string "X ACCURACY boosts the accuracy of\n"
     .string "techniques.\p"
@@ -43,23 +43,23 @@ gUnknown_81800E1:: @ 81800E1
     .string "Get your items at the CELADON\n"
     .string "DEPT. STORE!$"
 
-gUnknown_818017A:: @ 818017A
+CeladonCity_Text_CitySign:: @ 818017A
     .string "CELADON CITY\n"
     .string "The City of Rainbow Dreams$"
 
-gUnknown_81801A2:: @ 81801A2
+CeladonCity_Text_GymSign:: @ 81801A2
     .string "CELADON CITY POKéMON GYM\n"
     .string "LEADER: ERIKA\l"
     .string "The Nature-Loving Princess!$"
 
-gUnknown_81801E5:: @ 81801E5
+CeladonCity_Text_MansionSign:: @ 81801E5
     .string "CELADON MANSION$"
 
-gUnknown_81801F5:: @ 81801F5
+CeladonCity_Text_DeptStoreSign:: @ 81801F5
     .string "Find what you need at the\n"
     .string "CELADON DEPT. STORE!$"
 
-gUnknown_8180224:: @ 8180224
+CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224
     .string "TRAINER TIPS\p"
     .string "GUARD SPEC. protects POKéMON\n"
     .string "from status-reduction moves during\l"
@@ -67,15 +67,15 @@ gUnknown_8180224:: @ 8180224
     .string "Get your items at the\n"
     .string "CELADON DEPT. STORE!$"
 
-gUnknown_81802A4:: @ 81802A4
+CeladonCity_Text_PrizeExchangeSign:: @ 81802A4
     .string "COINS exchanged for prizes!\n"
     .string "PRIZE EXCHANGE$"
 
-gUnknown_81802CF:: @ 81802CF
+CeladonCity_Text_GameCornerSign:: @ 81802CF
     .string "ROCKET GAME CORNER\n"
     .string "The playground for grown-ups!$"
 
-gUnknown_8180300:: @ 8180300
+CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300
     .string "Aaaagh, ow…\n"
     .string "I scalded my tongue!\p"
     .string "This nice old lady in the MANSION\n"
@@ -104,7 +104,7 @@ Text_SoftboiledWhichMon:: @ 8180484
 Text_SoftboiledTaught:: @ 81804C4
     .string "I wish you the best of luck!$"
 
-gUnknown_81804E1:: @ 81804E1
+CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1
     .string "Oh, what am I to do…\p"
     .string "Someone stole our SILPH SCOPE.\p"
     .string "The thief came running this way,\n"
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
index a6f29e9d7..bcb4f815c 100644
--- a/data/maps/CeladonCity_Condominiums_1F/map.json
+++ b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C38E",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Meowth",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C321",
+      "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman",
       "flag": "0"
     }
   ],
@@ -117,14 +117,14 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+      "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+      "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index 41912748b..0703d8cc4 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -1,63 +1,63 @@
 CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
 	.byte 0
 
-CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
+CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321
 	lock
 	faceplayer
-	goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A
-	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374
-	goto_if_set FLAG_GOT_TEA, EventScript_16C36A
-	msgbox gUnknown_81960C9
+	goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea
+	goto_if_set FLAG_SYS_GAME_CLEAR, CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy
+	goto_if_set FLAG_GOT_TEA, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea
+	msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead
 	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
-	msgbox gUnknown_8196109
+	msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea
 	release
 	end
 
-EventScript_16C36A:: @ 816C36A
-	msgbox gUnknown_8196148
+CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A
+	msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany
 	release
 	end
 
-EventScript_16C374:: @ 816C374
+CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374
 	famechecker FAMECHECKER_DAISY, 4
 	setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
-	msgbox gUnknown_8196188
+	msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E
+CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_MEOWTH, 0
-	msgbox gUnknown_81960BB
+	msgbox CeladonCity_Condominiums_1F_Text_Meowth
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1
+CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_CLEFAIRY, 0
-	msgbox gUnknown_819625B
+	msgbox CeladonCity_Condominiums_1F_Text_Clefairy
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
+CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_NIDORAN_F, 0
-	msgbox gUnknown_8196272
+	msgbox CeladonCity_Condominiums_1F_Text_Nidoran
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
-	msgbox gUnknown_8196287, MSGBOX_SIGN
+CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7
+	msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc
index 7cfb9c2a1..fa0512f76 100644
--- a/data/maps/CeladonCity_Condominiums_1F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/text.inc
@@ -1,21 +1,21 @@
-gUnknown_81960BB:: @ 81960BB
+CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB
     .string "MEOWTH: Meow!$"
 
-gUnknown_81960C9:: @ 81960C9
+CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9
     .string "You shouldn't spend all your money\n"
     .string "on drinks.\p"
     .string "Try this instead.$"
 
-gUnknown_8196109:: @ 8196109
+CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109
     .string "Nothing beats thirst like some hot\n"
     .string "TEA.\p"
     .string "It really is the best.$"
 
-gUnknown_8196148:: @ 8196148
+CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148
     .string "My dear POKéMON keep me company.\n"
     .string "MEOWTH even brings money home!$"
 
-gUnknown_8196188:: @ 8196188
+CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188
     .string "Oh, hello, dearie.\n"
     .string "Did you enjoy my TEA?\p"
     .string "By the way, dear. Are you, by any\n"
@@ -25,13 +25,13 @@ gUnknown_8196188:: @ 8196188
     .string "She visits the CELADON DEPT. STORE\n"
     .string "to buy some TEA.$"
 
-gUnknown_819625B:: @ 819625B
+CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B
     .string "CLEFAIRY: Pi pippippi!$"
 
-gUnknown_8196272:: @ 8196272
+CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272
     .string "NIDORAN♀: Kya kyaoo!$"
 
-gUnknown_8196287:: @ 8196287
+CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287
     .string "CELADON MANSION\n"
     .string "Manager's Suite$"
 
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
index 33248a953..10e5eb1c6 100644
--- a/data/maps/CeladonCity_Condominiums_2F/map.json
+++ b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika",
       "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika",
       "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
     }
   ],
@@ -77,14 +77,14 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+      "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+      "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
index 53c0a90c0..9d952f2d7 100644
--- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
@@ -1,6 +1,6 @@
 CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
 	.byte 0
 
-CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1
-	msgbox gUnknown_81962A7, MSGBOX_SIGN
+CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1
+	msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc
index 1913e1529..30ab60a1d 100644
--- a/data/maps/CeladonCity_Condominiums_2F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_2F/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81962A7:: @ 81962A7
+CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7
     .string "GAME FREAK Meeting Room$"
 
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
index e491e8112..4a1fb023c 100644
--- a/data/maps/CeladonCity_Condominiums_3F/map.json
+++ b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Programmer",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Designer",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4",
+      "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Writer",
       "flag": "0"
     }
   ],
@@ -103,56 +103,56 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+      "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer1"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer2"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer3"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+      "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer3"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer1"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer2"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
index d7bb14293..878ed63e8 100644
--- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
@@ -1,34 +1,34 @@
 CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA
 	.byte 0
 
-CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
-	msgbox gUnknown_81962BF, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB
+	msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
-	msgbox gUnknown_81962D7, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4
+	msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
-	msgbox gUnknown_81962FB, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED
+	msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
+CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6
 	lock
 	faceplayer
 	specialvar VAR_RESULT, HasAllKantoMons
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16C412
-	msgbox gUnknown_8196356
+	compare VAR_RESULT, TRUE
+	goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex
+	msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex
 	release
 	end
 
-EventScript_16C412:: @ 816C412
-	goto EventScript_16C418
+CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412
+	goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma
 	end
 
-EventScript_16C418:: @ 816C418
-	message Text_1963CD
+CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418
+	message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations
 	waitmessage
 	delay 60
 	goto_if_questlog EventScript_ReleaseEnd
@@ -37,18 +37,18 @@ EventScript_16C418:: @ 816C418
 	release
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
-	msgbox gUnknown_81964A8, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435
+	msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
-	msgbox gUnknown_819640C, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E
+	msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
-	msgbox gUnknown_819644B, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447
+	msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
-	msgbox gUnknown_8196478, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450
+	msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc
index 3f7179dfe..d4f91594a 100644
--- a/data/maps/CeladonCity_Condominiums_3F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_3F/text.inc
@@ -1,42 +1,42 @@
-gUnknown_81962BF:: @ 81962BF
+CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF
     .string "Me?\n"
     .string "I'm the programmer!$"
 
-gUnknown_81962D7:: @ 81962D7
+CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7
     .string "I'm the graphic artist!\n"
     .string "I drew you!$"
 
-gUnknown_81962FB:: @ 81962FB
+CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB
     .string "I wrote the story!\n"
     .string "Isn't ERIKA cute?\p"
     .string "I like MISTY a lot, too!\n"
     .string "Oh, and SABRINA, I like her!$"
 
-gUnknown_8196356:: @ 8196356
+CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356
     .string "Is that right?\p"
     .string "I'm the game designer!\p"
     .string "Filling up your POKéDEX is tough,\n"
     .string "but don't quit!\p"
     .string "When you finish, come tell me!$"
 
-Text_1963CD:: @ 81963CD
+CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD
     .string "Wow! Excellent!\n"
     .string "You completed your POKéDEX!\l"
     .string "Congratulations!\l"
     .string "…$"
 
-gUnknown_819640C:: @ 819640C
+CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C
     .string "It's the game program! Messing with\n"
     .string "it could bug out the game!$"
 
-gUnknown_819644B:: @ 819644B
+CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B
     .string "Someone's playing a game instead of\n"
     .string "working!$"
 
-gUnknown_8196478:: @ 8196478
+CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478
     .string "It's the script!\n"
     .string "Better not look at the ending!$"
 
-gUnknown_81964A8:: @ 81964A8
+CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8
     .string "GAME FREAK Development Room$"
 
diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
index 7680f5f68..c929b62fc 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/map.json
+++ b/data/maps/CeladonCity_Condominiums_Roof/map.json
@@ -43,14 +43,14 @@
       "x": 4,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+      "script": "CeladonCity_Condominiums_Roof_EventScript_Sign"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+      "script": "CeladonCity_Condominiums_Roof_EventScript_Sign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
index 59631d86c..98013e38f 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
@@ -1,6 +1,6 @@
 CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459
 	.byte 0
 
-CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A
-	msgbox gUnknown_81964C4, MSGBOX_SIGN
+CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A
+	msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc
index 02398e70b..f3012fd31 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/text.inc
+++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81964C4:: @ 81964C4
+CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4
     .string "I KNOW EVERYTHING!$"
 
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index 717bfc4a1..d229e7fdd 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464",
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall",
       "flag": "FLAG_HIDE_EEVEE_BALL"
     }
   ],
@@ -70,21 +70,21 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
index 73c55afd8..3f3363674 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
@@ -1,109 +1,109 @@
 CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463
 	.byte 0
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
-	msgbox gUnknown_81964D7, MSGBOX_NPC
+CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
+CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, SPECIES_EEVEE
 	givemon SPECIES_EEVEE, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16C4A6
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16C4DA
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_16C4A6:: @ 816C4A6
+CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
 	removeobject 2
 	playfanfare MUS_FANFA1
-	message Text_196591
+	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C514
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16C514
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	end
 
-EventScript_16C4DA:: @ 816C4DA
+CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA
 	removeobject 2
 	playfanfare MUS_FANFA1
-	message Text_196591
+	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C509
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16C509
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	end
 
-EventScript_16C509:: @ 816C509
+CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509
 	call EventScript_TransferredToPC
-	goto EventScript_16C514
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	end
 
-EventScript_16C514:: @ 816C514
+CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514
 	setflag FLAG_GOT_EEVEE
 	release
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
-	msgbox gUnknown_81967E3, MSGBOX_SIGN
+CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
+CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522
 	lockall
-	msgbox gUnknown_81965C2
-	message Text_1965F4
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture
+	message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading
 	waitmessage
 	setvar VAR_0x8004, 4
 	multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16C5C0
-	case 1, EventScript_16C5CE
-	case 2, EventScript_16C5DC
-	case 3, EventScript_16C5EA
-	case 127, EventScript_16C5EA
+	case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub
+	case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner
+	case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom
+	case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
+	case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
 	end
 
-EventScript_16C578:: @ 816C578
-	message Text_1965F4
+CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578
+	message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading
 	waitmessage
 	multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16C5C0
-	case 1, EventScript_16C5CE
-	case 2, EventScript_16C5DC
-	case 3, EventScript_16C5EA
-	case 127, EventScript_16C5EA
+	case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub
+	case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner
+	case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom
+	case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
+	case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
 	end
 
-EventScript_16C5C0:: @ 816C5C0
-	msgbox gUnknown_8196617
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5CE:: @ 816C5CE
-	msgbox gUnknown_8196695
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5DC:: @ 816C5DC
-	msgbox gUnknown_819673C
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5EA:: @ 816C5EA
+CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
index bb09c8ce3..9e43f06ce 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81964D7:: @ 81964D7
+CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7
     .string "There is nothing that I don't know,\n"
     .string "like I wrote on the blackboard.\p"
     .string "I know about the world of POKéMON\n"
@@ -6,27 +6,27 @@ gUnknown_81964D7:: @ 81964D7
     .string "Get together with your friends and\n"
     .string "enjoy trading POKéMON!$"
 
-Text_196591:: @ 8196591
+CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591
     .string "{PLAYER} obtained an EEVEE!$"
 
-Text_1965A7:: @ 81965A7
+CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7
     .string "ポケモンが　いっぱいだ\n"
     .string "ボックスを　かえて　きなさい$"
 
-gUnknown_81965C2:: @ 81965C2
+CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2
     .string "POKéMON Lecture\p"
     .string "Playing with the Wireless Adapter$"
 
-Text_1965F4:: @ 81965F4
+CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4
     .string "Which heading do you want to read?$"
 
-gUnknown_8196617:: @ 8196617
+CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617
     .string "The POKéMON WIRELESS CLUB is\n"
     .string "upstairs at any POKéMON CENTER.\p"
     .string "Visit one to link up with friend(s)\n"
     .string "using your Wireless Adapter.$"
 
-gUnknown_8196695:: @ 8196695
+CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695
     .string "To link only with a friend, go to\n"
     .string "the DIRECT CORNER.\p"
     .string "It is the right counter at the\n"
@@ -34,7 +34,7 @@ gUnknown_8196695:: @ 8196695
     .string "Go into the TRADE CORNER or the\n"
     .string "COLOSSEUM with your friend.$"
 
-gUnknown_819673C:: @ 819673C
+CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C
     .string "To link and communicate with\n"
     .string "anyone, go to the UNION ROOM.\p"
     .string "It is the left counter at the\n"
@@ -42,7 +42,7 @@ gUnknown_819673C:: @ 819673C
     .string "Go to the UNION ROOM and enjoy\n"
     .string "meeting other TRAINERS.$"
 
-gUnknown_81967E3:: @ 81967E3
+CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3
     .string "It's a pamphlet on TMs.\p"
     .string "… …\p"
     .string "There are fifty TMs in all.\p"
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
index afa57c1aa..d4e20b168 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9",
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist",
       "flag": "0"
     }
   ],
@@ -92,14 +92,14 @@
       "x": 9,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2"
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB"
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
index 4e5bcc05e..08aa687f8 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
@@ -1,14 +1,14 @@
 CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8
 	.byte 0
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9
-	msgbox gUnknown_81954DD, MSGBOX_NPC
+CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9
+	msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2
-	msgbox gUnknown_8195537, MSGBOX_SIGN
+CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2
+	msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB
-	msgbox gUnknown_81955B3, MSGBOX_SIGN
+CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB
+	msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
index e78a8c6d2..f1d1877e4 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81954DD:: @ 81954DD
+CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD
     .string "Hello!\n"
     .string "Welcome to CELADON DEPT. STORE.\p"
     .string "The board on the right describes\n"
     .string "the store layout.$"
 
-gUnknown_8195537:: @ 8195537
+CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537
     .string "1F: SERVICE COUNTER\p"
     .string "2F: TRAINER'S MARKET\p"
     .string "3F: TV GAME SHOP\p"
@@ -12,6 +12,6 @@ gUnknown_8195537:: @ 8195537
     .string "5F: DRUGSTORE\p"
     .string "ROOFTOP SQUARE: VENDING MACHINES$"
 
-gUnknown_81955B3:: @ 81955B3
+CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3
     .string "1F: SERVICE COUNTER$"
 
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index fdb27ab7e..e4e6f2f29 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
@@ -96,7 +96,7 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07"
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
index 24d4771b2..f7e89886d 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
 	.byte 0
 
-CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
-	msgbox gUnknown_81955C7, MSGBOX_NPC
+CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5
+	msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
-	msgbox gUnknown_819560F, MSGBOX_NPC
+CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE
+	msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
-	msgbox gUnknown_8195638, MSGBOX_SIGN
+CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07
+	msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
+CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BB38
+	pokemart CeladonCity_DepartmentStore_2F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BB38:: @ 816BB38
+CeladonCity_DepartmentStore_2F_Items:: @ 816BB38
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_REVIVE
@@ -39,19 +39,19 @@ Items_16BB38:: @ 816BB38
 	release
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
+CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BB74
+	pokemart CeladonCity_DepartmentStore_2F_TMs
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BB74:: @ 816BB74
+CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74
 	.2byte ITEM_TM05
 	.2byte ITEM_TM15
 	.2byte ITEM_TM28
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
index 22bf6b36c..77466521a 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
@@ -1,13 +1,19 @@
-gUnknown_81955C7:: @ 81955C7
+CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7
     .string "SUPER REPEL keeps weak POKéMON at\n"
     .string "bay…\p"
     .string "Hmm, it's a more powerful REPEL.$"
 
-gUnknown_819560F:: @ 819560F
+CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F
     .string "For long outings, you should buy\n"
     .string "REVIVE.$"
 
-gUnknown_8195638:: @ 8195638
+CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638
     .string "Top-Grade Items for TRAINERS!\p"
     .string "2F: TRAINER'S MARKET$"
 
+CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B
+    .string "We have a customer, LANCE, who\n"
+    .string "occasionally comes.\p"
+    .string "He always buys capes.\p"
+    .string "I wonder… Does he have many\n"
+    .string "identical capes at home?$"
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index 76bc95d25..37132845e 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl",
       "flag": "0"
     }
   ],
@@ -109,77 +109,77 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4"
     },
     {
       "type": "bg_event_type_0",
       "x": 1,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 1,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
index f4faca037..e7af53078 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
@@ -5,46 +5,46 @@ CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85
 	goto EventScript_CounterTutor
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
-	msgbox gUnknown_81956E9, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B
+	msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94
-	msgbox gUnknown_8195769, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94
+	msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D
-	msgbox gUnknown_81957B0, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D
+	msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6
-	msgbox gUnknown_8195823, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6
+	msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF
-	msgbox gUnknown_8195863, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF
+	msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8
-	msgbox gUnknown_8195875, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8
+	msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1
-	msgbox gUnknown_8195897, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1
+	msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA
-	msgbox gUnknown_81958B8, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA
+	msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3
-	msgbox gUnknown_81958D8, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3
+	msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC
-	msgbox gUnknown_81958F6, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC
+	msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5
-	msgbox gUnknown_8195907, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5
+	msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
index 7d4db12cc..3533884a5 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
@@ -1,22 +1,15 @@
-Text_19566B:: @ 819566B
-    .string "We have a customer, LANCE, who\n"
-    .string "occasionally comes.\p"
-    .string "He always buys capes.\p"
-    .string "I wonder… Does he have many\n"
-    .string "identical capes at home?$"
-
-gUnknown_81956E9:: @ 81956E9
+CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9
     .string "Captured POKéMON are registered\n"
     .string "with an ID No. and the OT.\p"
     .string "OT stands for “Original TRAINER” -\n"
     .string "the TRAINER that caught it first.$"
 
-gUnknown_8195769:: @ 8195769
+CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769
     .string "All right!\p"
     .string "My buddy's going to trade me his\n"
     .string "KANGASKHAN for my HAUNTER!$"
 
-gUnknown_81957B0:: @ 81957B0
+CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0
     .string "Come on, HAUNTER!\p"
     .string "I love HAUNTER!\n"
     .string "I collect them!\p"
@@ -24,33 +17,54 @@ gUnknown_81957B0:: @ 81957B0
     .string "HAUNTER turned into a different\n"
     .string "POKéMON while being traded!$"
 
-gUnknown_8195823:: @ 8195823
+CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823
     .string "You can identify POKéMON you get\n"
     .string "in trades by their ID Numbers.$"
 
-gUnknown_8195863:: @ 8195863
+CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863
     .string "It's a Super NES.$"
 
-gUnknown_8195875:: @ 8195875
+CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875
     .string "An RPG!\n"
     .string "There's no time for that!$"
 
-gUnknown_8195897:: @ 8195897
+CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897
     .string "A sports game!\n"
     .string "Dad'll like that!$"
 
-gUnknown_81958B8:: @ 81958B8
+CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8
     .string "A puzzle game!\n"
     .string "Looks addictive!$"
 
-gUnknown_81958D8:: @ 81958D8
+CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8
     .string "A fighting game!\n"
     .string "Looks tough!$"
 
-gUnknown_81958F6:: @ 81958F6
+CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6
     .string "3F: TV GAME SHOP$"
 
-gUnknown_8195907:: @ 8195907
+CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907
     .string "Red and Green!\n"
     .string "Both are POKéMON!$"
 
+Text_CounterTeach:: @ 8195928
+    .string "Oh, hi!\n"
+    .string "I finally finished POKéMON.\p"
+    .string "Not done yet? How about I teach\n"
+    .string "you a good move?\p"
+    .string "The move I have in mind is\n"
+    .string "COUNTER.\p"
+    .string "Not like the one I'm leaning on,\n"
+    .string "mind you!$"
+
+Text_CounterDeclined:: @ 81959CC
+    .string "You're not interested? Come see\n"
+    .string "me if you change your mind.$"
+
+Text_CounterWhichMon:: @ 8195A08
+    .string "Which POKéMON should I teach\n"
+    .string "COUNTER to?$"
+
+Text_CounterTaught:: @ 8195A31
+    .string "Are you using that COUNTER move\n"
+    .string "I taught your POKéMON?$"
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
index 059ff30e3..d1130b058 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk",
       "flag": "0"
     }
   ],
@@ -83,7 +83,7 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01"
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
index f04968b1e..e9aba025a 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
 	.byte 0
 
-CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
-	msgbox gUnknown_8195A68, MSGBOX_NPC
+CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF
+	msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
-	msgbox gUnknown_8195AC9, MSGBOX_NPC
+CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8
+	msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
-	msgbox gUnknown_8195B5B, MSGBOX_SIGN
+CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01
+	msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
+CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BC30
+	pokemart CeladonCity_DepartmentStore_4F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BC30:: @ 816BC30
+CeladonCity_DepartmentStore_4F_Items:: @ 816BC30
 	.2byte ITEM_POKE_DOLL
 	.2byte ITEM_RETRO_MAIL
 	.2byte ITEM_FIRE_STONE
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
index 426cc2c82..80121023e 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
@@ -1,41 +1,18 @@
-Text_CounterTeach:: @ 8195928
-    .string "Oh, hi!\n"
-    .string "I finally finished POKéMON.\p"
-    .string "Not done yet? How about I teach\n"
-    .string "you a good move?\p"
-    .string "The move I have in mind is\n"
-    .string "COUNTER.\p"
-    .string "Not like the one I'm leaning on,\n"
-    .string "mind you!$"
-
-Text_CounterDeclined:: @ 81959CC
-    .string "You're not interested? Come see\n"
-    .string "me if you change your mind.$"
-
-Text_CounterWhichMon:: @ 8195A08
-    .string "Which POKéMON should I teach\n"
-    .string "COUNTER to?$"
-
-Text_CounterTaught:: @ 8195A31
-    .string "Are you using that COUNTER move\n"
-    .string "I taught your POKéMON?$"
-
-gUnknown_8195A68:: @ 8195A68
+CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68
     .string "I'm getting a present for my\n"
     .string "girlfriend.\p"
     .string "I guess a POKé DOLL will be it.\n"
     .string "It's the popular thing.$"
 
-gUnknown_8195AC9:: @ 8195AC9
+CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9
     .string "I heard something useful.\p"
     .string "If a wild POKéMON appears, you can\n"
     .string "distract it with a POKé DOLL.\p"
     .string "You can run away while the wild\n"
     .string "POKéMON is distracted.$"
 
-gUnknown_8195B5B:: @ 8195B5B
+CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B
     .string "Express yourself with gifts!\n"
     .string "4F: WISE MAN GIFTS\p"
     .string "Evolution Special!\n"
     .string "Element STONES on sale now!$"
-
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
index 65b0fe9bc..b90f5f8e9 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins",
       "flag": "0"
     }
   ],
@@ -96,7 +96,7 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53"
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
index 9056d2b2d..e854a6a65 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40
 	.byte 0
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41
-	msgbox gUnknown_8195BBA, MSGBOX_NPC
+CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41
+	msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A
-	msgbox gUnknown_8195CA0, MSGBOX_NPC
+CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A
+	msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
-	msgbox gUnknown_8195D14, MSGBOX_SIGN
+CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53
+	msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
+CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BC84
+	pokemart CeladonCity_DepartmentStore_5F_XItems
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BC84:: @ 816BC84
+CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_X_SPEED
@@ -37,19 +37,19 @@ Items_16BC84:: @ 816BC84
 	release
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
+CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BCBC
+	pokemart CeladonCity_DepartmentStore_5F_Vitamins
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BCBC:: @ 816BCBC
+CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC
 	.2byte ITEM_HP_UP
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
index b8cee5afa..638f07320 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8195BBA:: @ 8195BBA
+CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA
     .string "POKéMON stat enhancers can be\n"
     .string "bought only here.\p"
     .string "HP UP increases the base HP of a\n"
@@ -10,7 +10,7 @@ gUnknown_8195BBA:: @ 8195BBA
     .string "CARBOS enhances the base SPEED\n"
     .string "stat.$"
 
-gUnknown_8195CA0:: @ 8195CA0
+CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0
     .string "I'm here for POKéMON stat\n"
     .string "enhancers.\p"
     .string "PROTEIN increases the base ATTACK\n"
@@ -18,6 +18,6 @@ gUnknown_8195CA0:: @ 8195CA0
     .string "IRON increases the base DEFENSE\n"
     .string "stat.$"
 
-gUnknown_8195D14:: @ 8195D14
+CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14
     .string "5F: DRUGSTORE$"
 
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
index a2a7d1b48..5fe6f9885 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
@@ -36,14 +36,14 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
index 14198db2f..9469abce4 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -1,10 +1,10 @@
 CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
 	.byte 0
 
-CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153
 	lockall
 	setvar VAR_0x8004, 3
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -12,107 +12,105 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
 	setvar VAR_0x8004, 3
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
-	case 0, EventScript_16C1B7
-	case 1, EventScript_16C1C3
-	case 2, EventScript_16C1CF
-	case 3, EventScript_16C1DB
-	case 4, EventScript_16C1E7
+	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F
+	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F
+	case 2, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F
+	case 3, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F
+	case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F
 	end
 
-EventScript_16C1B7:: @ 816C1B7
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE
-	goto EventScript_16C1F3
-
-EventScript_16C1C2:: @ 816C1C2
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1C3:: @ 816C1C3
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1CF:: @ 816C1CF
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1DB:: @ 816C1DB
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1E7:: @ 816C1E7
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1F3:: @ 816C1F3
+CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3
 	switch VAR_RESULT
-	case 0, EventScript_16C2E6
-	case 1, EventScript_16C2BE
-	case 2, EventScript_16C296
-	case 3, EventScript_16C26E
-	case 4, EventScript_16C246
-	case 5, EventScript_16C30E
-	case 127, EventScript_16C30E
+	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F
+	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F
+	case 2, CeladonCity_DepartmentStore_Elevator_EventScript_To3F
+	case 3, CeladonCity_DepartmentStore_Elevator_EventScript_To2F
+	case 4, CeladonCity_DepartmentStore_Elevator_EventScript_To1F
+	case 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C246:: @ 816C246
+CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 4
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 4
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C26E:: @ 816C26E
+CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 5
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 5
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C296:: @ 816C296
+CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 6
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 6
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C2BE:: @ 816C2BE
+CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 7
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 7
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C2E6:: @ 816C2E6
+CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 8
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 8
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C30E:: @ 816C30E
+CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_16C313:: @ 816C313
+CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
index 71eea9cee..17077ebbd 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022",
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD",
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl",
       "flag": "0"
     }
   ],
@@ -56,28 +56,28 @@
       "x": 14,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index 48f682567..bd05d824d 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -1,152 +1,152 @@
 CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
 	.byte 0
 
-CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
+CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
-	call EventScript_16BCF6
+	call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
 	compare VAR_TEMP_1, 0
-	goto_if_eq EventScript_16C00E
-	goto EventScript_16BD3E
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
+	goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink
 	end
 
-EventScript_16BCF6:: @ 816BCF6
+CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6
 	setvar VAR_TEMP_1, 0
 	checkitem ITEM_FRESH_WATER, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD2C
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
 	checkitem ITEM_SODA_POP, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD32
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
 	checkitem ITEM_LEMONADE, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD38
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
 	return
 
-EventScript_16BD2C:: @ 816BD2C
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C
 	addvar VAR_TEMP_1, 1
 	return
 
-EventScript_16BD32:: @ 816BD32
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32
 	addvar VAR_TEMP_1, 2
 	return
 
-EventScript_16BD38:: @ 816BD38
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38
 	addvar VAR_TEMP_1, 4
 	return
 
-EventScript_16BD3E:: @ 816BD3E
-	msgbox gUnknown_8195D22, MSGBOX_YESNO
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C00C
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	textcolor 3
-	message Text_195D5F
+	message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink
 	waitmessage
 	textcolor 1
 	switch VAR_TEMP_1
-	case 1, EventScript_16BDAE
-	case 2, EventScript_16BDDA
-	case 3, EventScript_16BE06
-	case 4, EventScript_16BE3D
-	case 5, EventScript_16BE69
-	case 6, EventScript_16BEA0
-	case 7, EventScript_16BED7
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop
+	case 3, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop
+	case 4, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade
+	case 5, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade
+	case 6, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade
+	case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks
 	end
 
-EventScript_16BDAE:: @ 816BDAE
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BDDA:: @ 816BDDA
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF3A
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE06:: @ 816BE06
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF3A
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE3D:: @ 816BE3D
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF5B
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE69:: @ 816BE69
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF5B
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BEA0:: @ 816BEA0
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF3A
-	case 1, EventScript_16BF5B
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BED7:: @ 816BED7
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF3A
-	case 2, EventScript_16BF5B
-	case 3, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 3, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BF19:: @ 816BF19
+CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19
 	setvar VAR_0x8008, ITEM_FRESH_WATER
 	setvar VAR_0x8009, ITEM_TM16
-	goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195D75
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF3A:: @ 816BF3A
+CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A
 	setvar VAR_0x8008, ITEM_SODA_POP
 	setvar VAR_0x8009, ITEM_TM20
-	goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195E33
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF5B:: @ 816BF5B
+CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B
 	setvar VAR_0x8008, ITEM_LEMONADE
 	setvar VAR_0x8009, ITEM_TM33
-	goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195EBF
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF7C:: @ 816BF7C
+CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
 	getitemname 0, VAR_0x8008
 	getitemname 1, VAR_0x8009
 	removeitem VAR_0x8008, 1
 	checkitemspace VAR_0x8009, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C002
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
 	additem VAR_0x8009
 	textcolor 3
 	playfanfare MUS_FANFA1
@@ -156,142 +156,142 @@ EventScript_16BF7C:: @ 816BF7C
 	putitemaway VAR_0x8009
 	call EventScript_1A6675
 	compare VAR_0x8008, ITEM_FRESH_WATER
-	call_if_eq EventScript_16BFDE
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
 	compare VAR_0x8008, ITEM_SODA_POP
-	call_if_eq EventScript_16BFEA
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
 	compare VAR_0x8008, ITEM_LEMONADE
-	call_if_eq EventScript_16BFF6
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
 	release
 	end
 
-EventScript_16BFDE:: @ 816BFDE
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE
 	setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195DD4
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16
 	return
 
-EventScript_16BFEA:: @ 816BFEA
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA
 	setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195E68
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20
 	return
 
-EventScript_16BFF6:: @ 816BFF6
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6
 	setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195EF4
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33
 	return
 
-EventScript_16C002:: @ 816C002
-	msgbox gUnknown_8195F4F
+CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002
+	msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis
 	release
 	end
 
-EventScript_16C00C:: @ 816C00C
+CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C
 	release
 	end
 
-EventScript_16C00E:: @ 816C00E
-	msgbox gUnknown_8195FEF
+CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink
 	release
 	end
 
-EventScript_16C018:: @ 816C018
-	msgbox gUnknown_8195F6E
+CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll
 	release
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
-	msgbox gUnknown_8195F98, MSGBOX_NPC
+CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022
+	msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
-	msgbox gUnknown_8196017, MSGBOX_SIGN
+CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B
+	msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
+CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034
 	lockall
-	message Text_196038
+	message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
 	waitmessage
 	showmoneybox 0, 0, 0
-	goto EventScript_16C045
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
 	end
 
-EventScript_16C045:: @ 816C045
+CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045
 	multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
-	case 0, EventScript_16C083
-	case 1, EventScript_16C094
-	case 2, EventScript_16C0A5
-	msgbox gUnknown_81960AE
-	goto EventScript_16C14D
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NotThirsty
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C083:: @ 816C083
+CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	checkmoney 200, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C094:: @ 816C094
+CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094
 	setvar VAR_TEMP_0, ITEM_SODA_POP
 	checkmoney 300, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C0A5:: @ 816C0A5
+CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5
 	setvar VAR_TEMP_0, ITEM_LEMONADE
 	checkmoney 350, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C0B6:: @ 816C0B6
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6
 	removemoney 200, 0
 	return
 
-EventScript_16C0BD:: @ 816C0BD
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD
 	removemoney 300, 0
 	return
 
-EventScript_16C0C4:: @ 816C0C4
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4
 	removemoney 350, 0
 	return
 
-EventScript_16C0CB:: @ 816C0CB
+CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C131
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C13F
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16C0B6
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16C0BD
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16C0C4
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
 	updatemoneybox 0, 0, 0
 	getitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
-	msgbox gUnknown_8196076
+	msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
 	additem VAR_TEMP_0
-	goto EventScript_16C125
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink
 	end
 
-EventScript_16C125:: @ 816C125
-	message Text_196038
+CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125
+	message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
 	waitmessage
-	goto EventScript_16C045
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
 	end
 
-EventScript_16C131:: @ 816C131
-	msgbox gUnknown_819605E
-	goto EventScript_16C14D
+CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C13F:: @ 816C13F
-	msgbox gUnknown_819608E
-	goto EventScript_16C14D
+CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C14D:: @ 816C14D
+CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D
 	hidemoneybox 0, 0
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
index 65b9a3162..2c6944373 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
@@ -1,12 +1,12 @@
-gUnknown_8195D22:: @ 8195D22
+CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22
     .string "I'm thirsty!\n"
     .string "I want something to drink!\p"
     .string "{SIZE}ÁGive her a drink?$"
 
-Text_195D5F:: @ 8195D5F
+CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F
     .string "Give her which drink?$"
 
-gUnknown_8195D75:: @ 8195D75
+CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75
     .string "Yay!\p"
     .string "FRESH WATER!\p"
     .string "Thank you!\n"
@@ -16,67 +16,67 @@ Text_ReceivedItemFromLittleGirl:: @ 8195DAD
     .string "{PLAYER} received a {STR_VAR_2}\n"
     .string "from the little girl.$"
 
-gUnknown_8195DD4:: @ 8195DD4
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4
     .string "TM16 contains LIGHT SCREEN.\p"
     .string "It's a move that weakens the power\n"
     .string "of special attacks by your foe.$"
 
-gUnknown_8195E33:: @ 8195E33
+CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33
     .string "Yay!\p"
     .string "SODA POP!\p"
     .string "Thank you!\n"
     .string "You can have this from me!$"
 
-gUnknown_8195E68:: @ 8195E68
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68
     .string "TM20 contains SAFEGUARD.\p"
     .string "It's a move that prevents status\n"
     .string "problems among your POKéMON.$"
 
-gUnknown_8195EBF:: @ 8195EBF
+CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF
     .string "Yay!\p"
     .string "LEMONADE!\p"
     .string "Thank you!\n"
     .string "You can have this from me!$"
 
-gUnknown_8195EF4:: @ 8195EF4
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4
     .string "TM33 contains REFLECT.\p"
     .string "It's a move that weakens the power\n"
     .string "of physical attacks by your foe.$"
 
-gUnknown_8195F4F:: @ 8195F4F
+CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F
     .string "You don't have space for this!$"
 
-gUnknown_8195F6E:: @ 8195F6E
+CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E
     .string "No, thank you!\n"
     .string "I'm not thirsty after all!$"
 
-gUnknown_8195F98:: @ 8195F98
+CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98
     .string "My sister is a TRAINER, believe it\n"
     .string "or not.\p"
     .string "But, she's so immature, she drives\n"
     .string "me nuts!$"
 
-gUnknown_8195FEF:: @ 8195FEF
+CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF
     .string "I'm thirsty!\n"
     .string "I want something to drink!$"
 
-gUnknown_8196017:: @ 8196017
+CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017
     .string "ROOFTOP SQUARE:\n"
     .string "VENDING MACHINES$"
 
-Text_196038:: @ 8196038
+CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038
     .string "A vending machine!\n"
     .string "What does it have?$"
 
-gUnknown_819605E:: @ 819605E
+CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E
     .string "Oops, not enough money!$"
 
-gUnknown_8196076:: @ 8196076
+CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076
     .string "A can of {STR_VAR_1} popped out!$"
 
-gUnknown_819608E:: @ 819608E
+CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E
     .string "There's no more room for stuff!$"
 
-gUnknown_81960AE:: @ 81960AE
+CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE
     .string "Not thirsty!$"
 
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index 081d3fac9..79ba87c7f 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C684",
+      "script": "CeladonCity_GameCorner_EventScript_InfoClerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C68D",
+      "script": "CeladonCity_GameCorner_EventScript_CoinsClerk",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7BA",
+      "script": "CeladonCity_GameCorner_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7D7",
+      "script": "CeladonCity_GameCorner_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7E7",
+      "script": "CeladonCity_GameCorner_EventScript_Fisher",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C857",
+      "script": "CeladonCity_GameCorner_EventScript_GymGuy",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C87E",
+      "script": "CeladonCity_GameCorner_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C88E",
+      "script": "CeladonCity_GameCorner_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C89E",
+      "script": "CeladonCity_GameCorner_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C8FE",
+      "script": "CeladonCity_GameCorner_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CAF5",
+      "script": "CeladonCity_GameCorner_EventScript_RocketGrunt",
       "flag": "FLAG_HIDE_GAME_CORNER_ROCKET"
     }
   ],
@@ -314,168 +314,168 @@
       "x": 0,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C95E"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine0"
     },
     {
       "type": "bg_event_type_4",
       "x": 0,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9A4"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine1"
     },
     {
       "type": "bg_event_type_4",
       "x": 0,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9B0"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine2"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9BC"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine3"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB5A"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9D4"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine5"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9E0"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine6"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9EC"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine7"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9F8"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine8"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA04"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine9"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA10"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine10"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA1C"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine11"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA28"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine12"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA34"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine13"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA40"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine14"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB63"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA58"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine16"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA64"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine17"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB6C"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA7C"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine19"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA88"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine20"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA94"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine21"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CAAA"
+      "script": "CeladonCity_GameCorner_EventScript_Poster"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 13,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_1B2867"
+      "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 20b2ba04c..c206f38b4 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -3,443 +3,443 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
 	.byte 0
 
 CeladonCity_GameCorner_OnLoad:: @ 816C64C
-	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout
 	end
 
-EventScript_16C656:: @ 816C656
-	setmetatile 15, 2, 658, 0
-	setmetatile 16, 2, 658, 0
-	setmetatile 17, 2, 658, 0
-	setmetatile 16, 3, 719, 1
-	setmetatile 17, 3, 719, 1
+CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656
+	setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 16, 3, METATILE_GameCorner_PurpleWall_Floor, 1
+	setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1
 	return
 
-CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
-	msgbox gUnknown_8196940, MSGBOX_NPC
+CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684
+	msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
+CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
 	showcoinsbox 0, 5
-	message Text_196984
+	message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins
 	waitmessage
 	multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE
 	copyvar VAR_0x8009, VAR_RESULT
 	switch VAR_RESULT
-	case 0, EventScript_16C6E6
-	case 1, EventScript_16C6E6
-	case 2, EventScript_16C782
-	case 127, EventScript_16C782
+	case 0, CeladonCity_GameCorner_EventScript_BuyCoins
+	case 1, CeladonCity_GameCorner_EventScript_BuyCoins
+	case 2, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy
+	case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy
 	end
 
-EventScript_16C6E6:: @ 816C6E6
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790
+CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase
 	compare VAR_0x8009, 0
-	goto_if_eq EventScript_16C734
+	goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins
 	compare VAR_0x8009, 1
-	goto_if_eq EventScript_16C706
+	goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins
 	end
 
-EventScript_16C706:: @ 816C706
+CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9500
-	goto_if_ge EventScript_16C79E
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 500
+	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
 	checkmoney 10000, 0
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C7AC
+	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 500
 	removemoney 10000, 0
-	goto EventScript_16C762
+	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
-EventScript_16C734:: @ 816C734
+CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9950
-	goto_if_ge EventScript_16C79E
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 50
+	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
 	checkmoney 1000, 0
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C7AC
+	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 50
 	removemoney 1000, 0
-	goto EventScript_16C762
+	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
-EventScript_16C762:: @ 816C762
+CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762
 	updatemoneybox 0, 0, 0
 	updatecoinsbox 0, 5
 	playse SE_SHOP
-	msgbox gUnknown_8196A62
-	goto EventScript_16C77A
+	msgbox CeladonCity_GameCorner_Text_HereAreYourCoins
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C77A:: @ 816C77A
+CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
 
-EventScript_16C782:: @ 816C782
-	msgbox gUnknown_81969DC
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782
+	msgbox CeladonCity_GameCorner_Text_ComePlaySometime
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C790:: @ 816C790
-	msgbox gUnknown_81969FB
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790
+	msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C79E:: @ 816C79E
-	msgbox gUnknown_8196A26
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E
+	msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C7AC:: @ 816C7AC
-	msgbox gUnknown_8196A46
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC
+	msgbox CeladonCity_GameCorner_Text_CantAffordCoins
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA
+CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA
 	lock
 	faceplayer
-	msgbox gUnknown_8196A82
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C7CA:: @ 816C7CA
+CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA
 	closemessage
 	applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
+CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7
 	lock
 	faceplayer
-	msgbox gUnknown_8196AC7
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
+CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849
-	msgbox gUnknown_8196AF3
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9990
-	goto_if_ge EventScript_16C82B
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 10
+	goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
 	addcoins 10
 	textcolor 3
-	msgbox gUnknown_8196B0D
+	msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_10_COINS_FROM_GAMBLER
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C82B:: @ 816C82B
-	msgbox gUnknown_8196B30
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B
+	msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C839:: @ 816C839
+CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839
 	textcolor 3
-	msgbox gUnknown_8196F26
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C849:: @ 816C849
-	msgbox gUnknown_8196B49
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849
+	msgbox CeladonCity_GameCorner_Text_WinsComeAndGo
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
+CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870
-	msgbox gUnknown_8196BAD
-	goto EventScript_16C7CA
+	goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory
+	msgbox CeladonCity_GameCorner_Text_GymGuyAdvice
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C870:: @ 816C870
-	msgbox gUnknown_8196CA1
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870
+	msgbox CeladonCity_GameCorner_Text_RareMonsForCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E
+CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E
 	lock
 	faceplayer
-	msgbox gUnknown_8196B7B
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
+CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E
 	lock
 	faceplayer
-	msgbox gUnknown_8196CFE
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
+CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0
-	msgbox gUnknown_8196D2B
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_WantSomeCoins
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9980
-	goto_if_ge EventScript_16C8E2
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
 	addcoins 20
 	textcolor 3
-	msgbox gUnknown_8196D47
+	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_20_COINS_FROM_GAMBLER
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C8E2:: @ 816C8E2
-	msgbox gUnknown_8196D6F
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2
+	msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C8F0:: @ 816C8F0
-	msgbox gUnknown_8196D87
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0
+	msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
+CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950
-	msgbox gUnknown_8196DB7
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9980
-	goto_if_ge EventScript_16C942
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
 	addcoins 20
 	textcolor 3
-	msgbox gUnknown_8196DF8
+	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C942:: @ 816C942
-	msgbox gUnknown_8196E1B
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942
+	msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C950:: @ 816C950
-	msgbox gUnknown_8196E40
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950
+	msgbox CeladonCity_GameCorner_Text_WatchReelsClosely
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E
+CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E
 	lockall
 	setvar VAR_0x8004, 0
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16C96A:: @ 816C96A
+CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A
 	releaseall
 	end
 
-EventScript_16C96C:: @ 816C96C
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0
-	msgbox gUnknown_8196F46, MSGBOX_YESNO
+CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
+	msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C96A
+	goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
-	dofieldeffect 64
-	waitfieldeffect 64
+	dofieldeffect FLDEFF_UNK_40
+	waitfieldeffect FLDEFF_UNK_40  @ Smile icon?
 	specialvar VAR_RESULT, Special_GetRandomSlotMachine
 	playslotmachine VAR_RESULT
 	releaseall
 	end
 
-CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4
+CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4
 	lockall
 	setvar VAR_0x8004, 1
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0
+CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0
 	lockall
 	setvar VAR_0x8004, 2
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC
+CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC
 	lockall
 	setvar VAR_0x8004, 3
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16C9C8:: @ 816C9C8
+CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8
 	lockall
 	setvar VAR_0x8004, 4
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4
+CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4
 	lockall
 	setvar VAR_0x8004, 5
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0
+CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0
 	lockall
 	setvar VAR_0x8004, 6
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC
+CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC
 	lockall
 	setvar VAR_0x8004, 7
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8
+CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8
 	lockall
 	setvar VAR_0x8004, 8
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04
+CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04
 	lockall
 	setvar VAR_0x8004, 9
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10
+CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10
 	lockall
 	setvar VAR_0x8004, 10
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C
+CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C
 	lockall
 	setvar VAR_0x8004, 11
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28
+CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28
 	lockall
 	setvar VAR_0x8004, 12
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34
+CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34
 	lockall
 	setvar VAR_0x8004, 13
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40
+CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40
 	lockall
 	setvar VAR_0x8004, 14
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CA4C:: @ 816CA4C
+CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C
 	lockall
 	setvar VAR_0x8004, 15
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58
+CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58
 	lockall
 	setvar VAR_0x8004, 16
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64
+CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64
 	lockall
 	setvar VAR_0x8004, 17
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CA70:: @ 816CA70
+CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70
 	lockall
 	setvar VAR_0x8004, 18
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C
+CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C
 	lockall
 	setvar VAR_0x8004, 19
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88
+CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88
 	lockall
 	setvar VAR_0x8004, 20
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94
+CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94
 	lockall
 	setvar VAR_0x8004, 21
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CAA0:: @ 816CAA0
-	msgbox gUnknown_8196F0D
+CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0
+	msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired
 	releaseall
 	end
 
-CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
+CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA
 	lockall
-	msgbox gUnknown_8196EDC
-	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE
+	msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout
 	releaseall
 	end
 
-EventScript_16CABE:: @ 816CABE
+CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
 	playse SE_KI_GASYAN
-	setmetatile 15, 2, 669, 0
-	setmetatile 16, 2, 670, 1
-	setmetatile 17, 2, 671, 1
-	setmetatile 16, 3, 678, 1
-	setmetatile 17, 3, 679, 1
+	setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0
+	setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1
+	setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1
+	setmetatile 16, 3, METATILE_GameCorner_PurpleWall_StairsTop, 1
+	setmetatile 17, 3, METATILE_GameCorner_PurpleWall_stairsBottom, 1
 	special DrawWholeMapView
 	setflag FLAG_OPENED_ROCKET_HIDEOUT
 	return
 
-CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10
-	msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE
+CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt
+	msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16CB10:: @ 816CB10
-	msgbox gUnknown_8196E9B
+CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10
+	msgbox CeladonCity_GameCorner_Text_GruntPostBattle
 	closemessage
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_16CB34
+	call_if_eq CeladonCity_GameCorner_Text_GruntExitWest
 	compare VAR_FACING, DIR_WEST
-	call_if_ne EventScript_16CB3F
+	call_if_ne CeladonCity_GameCorner_Text_GruntExit
 	removeobject 11
 	release
 	end
 
-EventScript_16CB34:: @ 816CB34
-	applymovement 11, Movement_16CB4A
+CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34
+	applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest
 	waitmovement 0
 	return
 
-EventScript_16CB3F:: @ 816CB3F
-	applymovement 11, Movement_16CB53
+CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F
+	applymovement 11, CeladonCity_GameCorner_Movement_GruntExit
 	waitmovement 0
 	return
 
-Movement_16CB4A:: @ 816CB4A
+CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A
 	walk_down
 	walk_right
 	walk_right
@@ -450,7 +450,7 @@ Movement_16CB4A:: @ 816CB4A
 	walk_right
 	step_end
 
-Movement_16CB53:: @ 816CB53
+CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53
 	walk_right
 	walk_right
 	walk_right
@@ -459,14 +459,14 @@ Movement_16CB53:: @ 816CB53
 	walk_right
 	step_end
 
-CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
-	msgbox gUnknown_8196F64, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A
+	msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN
 	end
 
-CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63
-	msgbox gUnknown_8196F81, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63
+	msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN
 	end
 
-CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C
-	msgbox gUnknown_8196FA0, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C
+	msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc
index a388a736f..6813330ab 100644
--- a/data/maps/CeladonCity_GameCorner/text.inc
+++ b/data/maps/CeladonCity_GameCorner/text.inc
@@ -1,60 +1,60 @@
-gUnknown_8196940:: @ 8196940
+CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940
     .string "Welcome!\p"
     .string "You can exchange your COINS for\n"
     .string "fabulous prizes next door.$"
 
-Text_196984:: @ 8196984
+CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984
     .string "Welcome to ROCKET GAME CORNER!\p"
     .string "Do you need some game COINS?\n"
     .string "Would you like to buy some?$"
 
-gUnknown_81969DC:: @ 81969DC
+CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC
     .string "No?\n"
     .string "Please come play sometime!$"
 
-gUnknown_81969FB:: @ 81969FB
+CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB
     .string "Oh, I'm sorry.\n"
     .string "You don't have a COIN CASE.$"
 
-gUnknown_8196A26:: @ 8196A26
+CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26
     .string "Whoops!\n"
     .string "Your COIN CASE is full.$"
 
-gUnknown_8196A46:: @ 8196A46
+CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46
     .string "You can't afford the COINS.$"
 
-gUnknown_8196A62:: @ 8196A62
+CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62
     .string "Thank you.\n"
     .string "Here are your COINS!$"
 
-gUnknown_8196A82:: @ 8196A82
+CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82
     .string "Keep this quiet.\p"
     .string "It's rumored that this place is run\n"
     .string "by TEAM ROCKET.$"
 
-gUnknown_8196AC7:: @ 8196AC7
+CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7
     .string "I think these machines have\n"
     .string "different odds.$"
 
-gUnknown_8196AF3:: @ 8196AF3
+CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3
     .string "Kid, do you want to play?$"
 
-gUnknown_8196B0D:: @ 8196B0D
+CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D
     .string "{PLAYER} received 10 COINS\n"
     .string "from the man.$"
 
-gUnknown_8196B30:: @ 8196B30
+CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30
     .string "You don't need my COINS!$"
 
-gUnknown_8196B49:: @ 8196B49
+CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49
     .string "Wins seem to come and go.\n"
     .string "Nothing's a sure thing.$"
 
-gUnknown_8196B7B:: @ 8196B7B
+CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B
     .string "These slot games…\n"
     .string "Win or lose, it's only by luck.$"
 
-gUnknown_8196BAD:: @ 8196BAD
+CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD
     .string "Hey!\p"
     .string "You have better things to do,\n"
     .string "champ in the making!\p"
@@ -66,83 +66,83 @@ gUnknown_8196BAD:: @ 8196BAD
     .string "But she's not one to be taken\n"
     .string "lightly!$"
 
-gUnknown_8196CA1:: @ 8196CA1
+CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1
     .string "They offer rare POKéMON that can\n"
     .string "be exchanged for your COINS.\p"
     .string "But, I just can't seem to win!$"
 
-gUnknown_8196CFE:: @ 8196CFE
+CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE
     .string "Games are scary!\n"
     .string "It's so easy to get hooked!$"
 
-gUnknown_8196D2B:: @ 8196D2B
+CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B
     .string "What's up?\n"
     .string "Want some COINS?$"
 
-gUnknown_8196D47:: @ 8196D47
+CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47
     .string "{PLAYER} received 20 COINS\n"
     .string "from the nice guy.$"
 
-gUnknown_8196D6F:: @ 8196D6F
+CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F
     .string "You have lots of COINS!$"
 
-gUnknown_8196D87:: @ 8196D87
+CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87
     .string "Darn! I need more COINS for the\n"
     .string "POKéMON I want!$"
 
-gUnknown_8196DB7:: @ 8196DB7
+CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7
     .string "Hey, what? You're throwing me off!\n"
     .string "Here are some COINS, so shoo!$"
 
-gUnknown_8196DF8:: @ 8196DF8
+CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8
     .string "{PLAYER} received 20 COINS\n"
     .string "from the man.$"
 
-gUnknown_8196E1B:: @ 8196E1B
+CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B
     .string "You've got plenty of your own\n"
     .string "COINS!$"
 
-gUnknown_8196E40:: @ 8196E40
+CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40
     .string "The trick is to watch the reels\n"
     .string "closely.$"
 
-Text_196E69:: @ 8196E69
+CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69
     .string "I'm guarding this poster!\n"
     .string "Go away, or else!$"
 
-Text_196E95:: @ 8196E95
+CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95
     .string "Dang!$"
 
-gUnknown_8196E9B:: @ 8196E9B
+CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B
     .string "The TEAM ROCKET HIDEOUT might\n"
     .string "be discovered!\p"
     .string "I better tell BOSS!$"
 
-gUnknown_8196EDC:: @ 8196EDC
+CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC
     .string "Hey!\p"
     .string "A switch behind the poster!?\n"
     .string "Let's push it!$"
 
-gUnknown_8196F0D:: @ 8196F0D
+CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D
     .string "A COIN CASE is required…$"
 
-gUnknown_8196F26:: @ 8196F26
+CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26
     .string "Oops!\n"
     .string "Don't have the COIN CASE!$"
 
-gUnknown_8196F46:: @ 8196F46
+CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46
     .string "A slot machine!\n"
     .string "Want to play?$"
 
-gUnknown_8196F64:: @ 8196F64
+CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64
     .string "OUT OF ORDER\n"
     .string "This is broken.$"
 
-gUnknown_8196F81:: @ 8196F81
+CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81
     .string "OUT TO LUNCH\n"
     .string "This is reserved.$"
 
-gUnknown_8196FA0:: @ 8196FA0
+CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0
     .string "Someone's keys!\n"
     .string "They'll be back.$"
 
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
index c873cd0bb..99a1a54d4 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
index 329f829d3..ca8119594 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -1,44 +1,44 @@
 CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75
 	.byte 0
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
-	msgbox gUnknown_8196FC1, MSGBOX_NPC
+CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
-	msgbox gUnknown_8196FFF, MSGBOX_NPC
+CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CBB2
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon
 	end
 
-EventScript_16CBB2:: @ 816CBB2
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16CC15
-	case 1, EventScript_16CC25
-	case 2, EventScript_16CC35
-	case 3, EventScript_16CC45
-	case 4, EventScript_16CC55
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_Abra
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CC10:: @ 816CC10
+CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10
 	hidecoinsbox 0, 0
 	release
 	end
 
-EventScript_16CC15:: @ 816CC15
+CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_ABRA
 	setvar VAR_TEMP_2, 180
@@ -48,10 +48,10 @@ EventScript_16CC15:: @ 816CC15
 	setvar VAR_TEMP_2, 120
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC25:: @ 816CC25
+CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_CLEFAIRY
 	setvar VAR_TEMP_2, 500
@@ -61,10 +61,10 @@ EventScript_16CC25:: @ 816CC25
 	setvar VAR_TEMP_2, 750
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC35:: @ 816CC35
+CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_DRATINI
 	setvar VAR_TEMP_2, 2800
@@ -74,10 +74,10 @@ EventScript_16CC35:: @ 816CC35
 	setvar VAR_TEMP_2, 2500
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC45:: @ 816CC45
+CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_SCYTHER
 	setvar VAR_TEMP_2, 5500
@@ -87,10 +87,10 @@ EventScript_16CC45:: @ 816CC45
 	setvar VAR_TEMP_2, 4600
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC55:: @ 816CC55
+CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_PORYGON
 	setvar VAR_TEMP_2, 9999
@@ -100,28 +100,28 @@ EventScript_16CC55:: @ 816CC55
 	setvar VAR_TEMP_2, 6500
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC65:: @ 816CC65
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65
 	getspeciesname 0, VAR_TEMP_1
-	msgbox gUnknown_819709D, MSGBOX_YESNO
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
-	goto_if_lt EventScript_16CDA5
+	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
 	textcolor 3
 	switch VAR_TEMP_1
-	case SPECIES_ABRA, EventScript_16CCD4
-	case SPECIES_CLEFAIRY, EventScript_16CCE9
-	case SPECIES_DRATINI, EventScript_16CCFE
-	case SPECIES_SCYTHER, EventScript_16CD13
-	case SPECIES_PORYGON, EventScript_16CD28
-	case SPECIES_PINSIR, EventScript_16CD3D
+	case SPECIES_ABRA,     CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra
+	case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy
+	case SPECIES_DRATINI,  CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini
+	case SPECIES_SCYTHER,  CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther
+	case SPECIES_PORYGON,  CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon
+	case SPECIES_PINSIR,   CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir
 	end
 
-EventScript_16CCD4:: @ 816CCD4
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 9, ITEM_NONE
 	.else
@@ -129,10 +129,10 @@ EventScript_16CCD4:: @ 816CCD4
 	givemon VAR_TEMP_1, 7, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CCE9:: @ 816CCE9
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 8, ITEM_NONE
 	.else
@@ -140,10 +140,10 @@ EventScript_16CCE9:: @ 816CCE9
 	givemon VAR_TEMP_1, 12, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CCFE:: @ 816CCFE
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.else
@@ -151,15 +151,15 @@ EventScript_16CCFE:: @ 816CCFE
 	givemon VAR_TEMP_1, 24, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD13:: @ 816CD13
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13
 	givemon VAR_TEMP_1, 25, ITEM_NONE
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD28:: @ 816CD28
+CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 26, ITEM_NONE
 	.else
@@ -167,50 +167,50 @@ EventScript_16CD28:: @ 816CD28
 	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD3D:: @ 816CD3D
+CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D
 	givemon VAR_TEMP_1, 18, ITEM_NONE
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD52:: @ 816CD52
+CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16CDB3
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16CDE0
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC
 	compare VAR_RESULT, 2
-	goto_if_eq EventScript_16CD74
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull
 	end
 
-EventScript_16CD74:: @ 816CD74
+CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74
 	textcolor 3
 	msgbox Text_NoMoreRoomForPokemon
 	hidecoinsbox 0, 0
 	release
 	end
 
-EventScript_16CD83:: @ 816CD83
+CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83
 	getpartysize
 	subvar VAR_RESULT, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CD99:: @ 816CD99
+CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99
 	textcolor 3
-	msgbox gUnknown_819703E
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired
 	release
 	end
 
-EventScript_16CDA5:: @ 816CDA5
-	msgbox gUnknown_81970D5
-	goto EventScript_16CC10
+CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CDB3:: @ 816CDB3
+CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	getspeciesname 0, VAR_TEMP_1
@@ -220,11 +220,11 @@ EventScript_16CDB3:: @ 816CDB3
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16CD83
-	goto EventScript_16CC10
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CDE0:: @ 816CDE0
+CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	getspeciesname 0, VAR_TEMP_1
@@ -234,161 +234,161 @@ EventScript_16CDE0:: @ 816CDE0
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CE12
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16CE12
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	end
 
-EventScript_16CE12:: @ 816CE12
+CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12
 	call EventScript_TransferredToPC
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CE47
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM
 	end
 
-EventScript_16CE47:: @ 816CE47
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16CEA5
-	case 1, EventScript_16CEB9
-	case 2, EventScript_16CECD
-	case 3, EventScript_16CEE1
-	case 4, EventScript_16CEF5
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_TM13
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_TM23
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_TM24
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_TM30
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_TM35
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CEA5:: @ 816CEA5
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5
 	setvar VAR_TEMP_1, ITEM_TM13
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_ICE_BEAM
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEB9:: @ 816CEB9
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9
 	setvar VAR_TEMP_1, ITEM_TM23
 	setvar VAR_TEMP_2, 3500
 	getmovename 1, MOVE_IRON_TAIL
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CECD:: @ 816CECD
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD
 	setvar VAR_TEMP_1, ITEM_TM24
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_THUNDERBOLT
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEE1:: @ 816CEE1
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1
 	setvar VAR_TEMP_1, ITEM_TM30
 	setvar VAR_TEMP_2, 4500
 	getmovename 1, MOVE_SHADOW_BALL
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEF5:: @ 816CEF5
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5
 	setvar VAR_TEMP_1, ITEM_TM35
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_FLAMETHROWER
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CF09:: @ 816CF09
-	msgbox gUnknown_81970B2, MSGBOX_YESNO
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
-	goto EventScript_16CF3F
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
-EventScript_16CF22:: @ 816CF22
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22
 	getitemname 0, VAR_TEMP_1
-	msgbox gUnknown_819709D, MSGBOX_YESNO
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
-	goto EventScript_16CF3F
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
-EventScript_16CF3F:: @ 816CF3F
+CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F
 	getitemname 0, VAR_TEMP_1
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
-	goto_if_lt EventScript_16CDA5
+	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
 	checkitemspace VAR_TEMP_1, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16CF79
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	giveitem VAR_TEMP_1
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CF79:: @ 816CF79
+CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79
 	textcolor 3
 	msgbox Text_TooBadBagFull
 	hidecoinsbox 0, 0
 	release
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CFB2
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem
 	end
 
-EventScript_16CFB2:: @ 816CFB2
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16D010
-	case 1, EventScript_16D020
-	case 2, EventScript_16D030
-	case 3, EventScript_16D040
-	case 4, EventScript_16D050
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16D010:: @ 816D010
+CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010
 	setvar VAR_TEMP_1, ITEM_SMOKE_BALL
 	setvar VAR_TEMP_2, 800
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D020:: @ 816D020
+CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020
 	setvar VAR_TEMP_1, ITEM_MIRACLE_SEED
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D030:: @ 816D030
+CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030
 	setvar VAR_TEMP_1, ITEM_CHARCOAL
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D040:: @ 816D040
+CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040
 	setvar VAR_TEMP_1, ITEM_MYSTIC_WATER
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D050:: @ 816D050
+CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050
 	setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE
 	setvar VAR_TEMP_2, 1600
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
index a5a21b9bc..140c98958 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
@@ -1,31 +1,31 @@
-gUnknown_8196FC1:: @ 8196FC1
+CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1
     .string "I sure do fancy that PORYGON!\n"
     .string "But, it's hard to win at slots!$"
 
-gUnknown_8196FFF:: @ 8196FFF
+CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF
     .string "Gahaha! I raked it in today!\n"
     .string "If only every day were like this…$"
 
-gUnknown_819703E:: @ 819703E
+CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E
     .string "A COIN CASE is required…$"
 
-gUnknown_8197057:: @ 8197057
+CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057
     .string "We exchange your COINS for prizes.$"
 
-Text_19707A:: @ 819707A
+CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A
     .string "Which prize would you like?$"
 
-gUnknown_8197096:: @ 8197096
+CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096
     .string "はい どうぞ$"
 
-gUnknown_819709D:: @ 819709D
+CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D
     .string "So, you want the {STR_VAR_1}?$"
 
-gUnknown_81970B2:: @ 81970B2
+CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2
     .string "Okay, a TM of {STR_VAR_2}\n"
     .string "is what you want?$"
 
-gUnknown_81970D5:: @ 81970D5
+CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5
     .string "Sorry, you'll need more COINS\n"
     .string "than that.$"
 
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index 88187cdc9..f0a86b8e5 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D111",
+      "script": "CeladonCity_Gym_EventScript_Kay",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D163",
+      "script": "CeladonCity_Gym_EventScript_Bridget",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D14C",
+      "script": "CeladonCity_Gym_EventScript_Tina",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "CeladonCity_Gym_EventScript_16D17A",
+      "script": "CeladonCity_Gym_EventScript_Tamia",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D19E",
+      "script": "CeladonCity_Gym_EventScript_Lori",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D128",
+      "script": "CeladonCity_Gym_EventScript_Lisa",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Gym_EventScript_16D061",
+      "script": "CeladonCity_Gym_EventScript_Erika",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D1B5",
+      "script": "CeladonCity_Gym_EventScript_Mary",
       "flag": "0"
     },
     {
@@ -187,14 +187,14 @@
       "x": 4,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_Gym_EventScript_16D1CC"
+      "script": "CeladonCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_Gym_EventScript_16D1CC"
+      "script": "CeladonCity_Gym_EventScript_GymStatue"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index 60a945e21..8291ad757 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -1,85 +1,85 @@
 CeladonCity_Gym_MapScripts:: @ 816D060
 	.byte 0
 
-CeladonCity_Gym_EventScript_16D061:: @ 816D061
+CeladonCity_Gym_EventScript_Erika:: @ 816D061
 	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6
+	trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19
 	famechecker FAMECHECKER_ERIKA, 4
-	msgbox gUnknown_81972B8
+	msgbox CeladonCity_Gym_Text_ErikaPostBattle
 	release
 	end
 
-EventScript_16D0A0:: @ 816D0A0
+CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0
 	famechecker FAMECHECKER_ERIKA, 1
 	clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
 	setflag FLAG_DEFEATED_ERIKA
 	setflag FLAG_BADGE04_GET
 	set_gym_trainers 4
-	goto EventScript_16D0C6
+	goto CeladonCity_Gym_EventScript_GiveTM19
 	end
 
-EventScript_16D0C6:: @ 816D0C6
-	msgbox gUnknown_8197327
+CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6
+	msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis
 	checkitemspace ITEM_TM19, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16D107
-	giveitem_msg gUnknown_81973BA, ITEM_TM19
+	goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19
+	giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19
 	setflag FLAG_GOT_TM19_FROM_ERIKA
-	msgbox gUnknown_81973D7
+	msgbox CeladonCity_Gym_Text_ExplainTM19
 	release
 	end
 
-EventScript_16D107:: @ 816D107
-	msgbox gUnknown_819745D
+CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107
+	msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis
 	release
 	end
 
-CeladonCity_Gym_EventScript_16D111:: @ 816D111
-	trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4
-	msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Kay:: @ 816D111
+	trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat
+	msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D128:: @ 816D128
-	trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF
+CeladonCity_Gym_EventScript_Lisa:: @ 816D128
+	trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat
 	famechecker FAMECHECKER_ERIKA, 2
-	msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE
+	msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
-	trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB
-	msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Tina:: @ 816D14C
+	trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat
+	msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D163:: @ 816D163
-	trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C
-	msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Bridget:: @ 816D163
+	trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat
+	msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
-	trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660
+CeladonCity_Gym_EventScript_Tamia:: @ 816D17A
+	trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat
 	famechecker FAMECHECKER_ERIKA, 3
-	msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE
+	msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
-	trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A
-	msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Lori:: @ 816D19E
+	trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat
+	msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
-	trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832
-	msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Mary:: @ 816D1B5
+	trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat
+	msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
+CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC
 	lockall
-	goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0
-	msgbox gUnknown_8197874
+	goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory
+	msgbox CeladonCity_Gym_Text_GymStatue
 	releaseall
 	end
 
-EventScript_16D1E0:: @ 816D1E0
-	msgbox gUnknown_81978AB
+CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0
+	msgbox CeladonCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc
index 02c39a95c..02ded4fb0 100644
--- a/data/maps/CeladonCity_Gym/text.inc
+++ b/data/maps/CeladonCity_Gym/text.inc
@@ -1,168 +1,156 @@
-gUnknown_81970FE:: @ 81970FE
-    .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more
+Text_SorryDontHaveAnyMore:: @ 81970FE
+    .string "おきゃくさん もう もてないよ$"
 
-gUnknown_819710E:: @ 819710E
-    .string "あっ そう$" @ I see
+Text_ISee:: @ 819710E
+    .string "あっ そう$"
 
-Text_197114:: @ 8197114
+CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
     .string "Hello…\n"
     .string "Lovely weather, isn't it?\l"
     .string "It's so pleasant…\p"
-
     .string "…Oh, dear…\n"
     .string "I must have dozed off. Welcome.\p"
-
     .string "My name is ERIKA.\n"
     .string "I am the LEADER of CELADON GYM.\p"
-
     .string "I am a student of the art of\n"
     .string "flower arranging.\p"
-
     .string "My POKéMON are solely of the\n"
     .string "GRASS type.\p"
-
     .string "…Oh, I'm sorry, I had no idea that\n"
     .string "you wished to challenge me.\p"
-
     .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$"
 
-Text_197260:: @ 8197260
+CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260
     .string "Oh!\n"
     .string "I concede defeat.\l"
     .string "You are remarkably strong.\p"
-
     .string "I must confer on you the\n"
     .string "RAINBOWBADGE.$"
 
-gUnknown_81972B8:: @ 81972B8
+CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8
     .string "You are cataloging POKéMON?\n"
     .string "I must say I'm impressed.\p"
-
     .string "I would never collect POKéMON if\n"
     .string "they were unattractive.$"
 
-gUnknown_8197327:: @ 8197327
+CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327
     .string "The RAINBOWBADGE will make\n"
     .string "POKéMON up to Lv. 50 obey.\p"
-
     .string "It also allows POKéMON to use\n"
     .string "STRENGTH in and out of battle.\p"
-
     .string "Please also take this with you.$"
 
-gUnknown_81973BA:: @ 81973BA
+CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA
     .string "{PLAYER} received TM19\n"
     .string "from ERIKA.$"
 
-gUnknown_81973D7:: @ 81973D7
+CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7
     .string "TM19 contains GIGA DRAIN.\p"
-
     .string "Half the damage it inflicts is\n"
     .string "drained to heal your POKéMON.\p"
-
     .string "Wouldn't you agree that it's a\n"
     .string "wonderful move?$"
 
-gUnknown_819745D:: @ 819745D
+CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D
     .string "You should make room for this.$"
 
-Text_19747C:: @ 819747C
+CeladonCity_Gym_Text_KayIntro:: @ 819747C
     .string "I should tell you about this GYM.\p"
     .string "Only real ladies are allowed in\n"
     .string "here!$"
 
-Text_1974C4:: @ 81974C4
+CeladonCity_Gym_Text_KayDefeat:: @ 81974C4
     .string "You're too rough!$"
 
-gUnknown_81974D6:: @ 81974D6
+CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6
     .string "Bleaah!\n"
     .string "I hope ERIKA wipes you out!$"
 
-Text_1974FA:: @ 81974FA
+CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA
     .string "Oh, welcome.\n"
     .string "I was getting bored.$"
 
-Text_19751C:: @ 819751C
+CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C
     .string "My makeup!$"
 
-gUnknown_8197527:: @ 8197527
+CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527
     .string "GRASS-type POKéMON are tough\n"
     .string "against the WATER type.\p"
     .string "They also have an edge on ROCK-\n"
     .string "and GROUND-type POKéMON.$"
 
-Text_197595:: @ 8197595
+CeladonCity_Gym_Text_TinaIntro:: @ 8197595
     .string "…Weren't you peeking in here\n"
     .string "earlier?$"
 
-Text_1975BB:: @ 81975BB
+CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB
     .string "You're an eye-opener!$"
 
-gUnknown_81975D1:: @ 81975D1
+CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1
     .string "Oh, you were looking at ERIKA…\n"
     .string "You weren't looking at me…$"
 
-Text_19760B:: @ 819760B
+CeladonCity_Gym_Text_TamiaIntro:: @ 819760B
     .string "Look, look!\n"
     .string "See my POKéMON!\p"
     .string "I like the GRASS type.\n"
     .string "I like how they're easy to raise.$"
 
-Text_197660:: @ 8197660
+CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660
     .string "No!$"
 
-gUnknown_8197664:: @ 8197664
+CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664
     .string "We only use GRASS-type POKéMON at\n"
     .string "our GYM.\p"
     .string "Why? We also use them for making\n"
     .string "flower arrangements!$"
 
-Text_1976C5:: @ 81976C5
+CeladonCity_Gym_Text_LisaIntro:: @ 81976C5
     .string "Oh, hey!\p"
     .string "We don't like BUG- or FIRE-type\n"
     .string "POKéMON in here!$"
 
-Text_1976FF:: @ 81976FF
+CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF
     .string "Oh!\n"
     .string "You!$"
 
-gUnknown_8197708:: @ 8197708
+CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708
     .string "Our LEADER ERIKA might be quiet,\n"
     .string "but she's famous around here.$"
 
-Text_197747:: @ 8197747
+CeladonCity_Gym_Text_LoriIntro:: @ 8197747
     .string "Pleased to meet you.\n"
     .string "My hobby is POKéMON training.$"
 
-Text_19777A:: @ 819777A
+CeladonCity_Gym_Text_LoriDefeat:: @ 819777A
     .string "Oh!\n"
     .string "Splendid!$"
 
-gUnknown_8197788:: @ 8197788
+CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788
     .string "I have a blind date coming up.\n"
     .string "I have to learn to be polite,\l"
     .string "especially if I have to battle.$"
 
-Text_1977E5:: @ 81977E5
+CeladonCity_Gym_Text_MaryIntro:: @ 81977E5
     .string "Welcome to CELADON GYM!\p"
     .string "You'd better not underestimate\n"
     .string "the nice ladies here.$"
 
-Text_197832:: @ 8197832
+CeladonCity_Gym_Text_MaryDefeat:: @ 8197832
     .string "Oh!\n"
     .string "Beaten!$"
 
-gUnknown_819783E:: @ 819783E
+CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E
     .string "I didn't bring my best POKéMON.\n"
     .string "Wait until next time!$"
 
-gUnknown_8197874:: @ 8197874
+CeladonCity_Gym_Text_GymStatue:: @ 8197874
     .string "CELADON POKéMON GYM\n"
     .string "LEADER: ERIKA\p"
     .string "WINNING TRAINERS:\n"
     .string "{RIVAL}$"
 
-gUnknown_81978AB:: @ 81978AB
+CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB
     .string "CELADON POKéMON GYM\n"
     .string "LEADER: ERIKA\p"
     .string "WINNING TRAINERS:\n"
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
index 6ab82e945..80b4df1cd 100644
--- a/data/maps/CeladonCity_Hotel/map.json
+++ b/data/maps/CeladonCity_Hotel/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D284",
+      "script": "CeladonCity_Hotel_EventScript_Receptionist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D28D",
+      "script": "CeladonCity_Hotel_EventScript_Beauty",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D296",
+      "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D29F",
+      "script": "CeladonCity_Hotel_EventScript_BeautyBrother",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc
index 4f136bad3..be366a705 100644
--- a/data/maps/CeladonCity_Hotel/scripts.inc
+++ b/data/maps/CeladonCity_Hotel/scripts.inc
@@ -1,18 +1,18 @@
 CeladonCity_Hotel_MapScripts:: @ 816D283
 	.byte 0
 
-CeladonCity_Hotel_EventScript_16D284:: @ 816D284
-	msgbox gUnknown_8197B77, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284
+	msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
-	msgbox gUnknown_8197BBE, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D
+	msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D296:: @ 816D296
-	msgbox gUnknown_8197C0C, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296
+	msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
-	msgbox gUnknown_8197C30, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F
+	msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc
index b1c989120..5ac6ac99c 100644
--- a/data/maps/CeladonCity_Hotel/text.inc
+++ b/data/maps/CeladonCity_Hotel/text.inc
@@ -1,21 +1,18 @@
-Text_197B6F:: @ 8197B6F
-    .string "ぶつだん　だ‥$"
-
-gUnknown_8197B77:: @ 8197B77
+CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77
     .string "POKéMON?\n"
     .string "No, this is a hotel for people.\p"
     .string "We're full up, unfortunately.$"
 
-gUnknown_8197BBE:: @ 8197BBE
+CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE
     .string "I'm on vacation with my brother and\n"
     .string "boyfriend.\p"
     .string "CELADON is such a pretty city!$"
 
-gUnknown_8197C0C:: @ 8197C0C
+CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C
     .string "Why?\n"
     .string "Why did she bring her brother?$"
 
-gUnknown_8197C30:: @ 8197C30
+CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30
     .string "Yippee! I'm on vacation!\n"
     .string "My sis brought me along! Awesome!$"
 
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
index 455e9d836..0fccecd67 100644
--- a/data/maps/CeladonCity_House1/map.json
+++ b/data/maps/CeladonCity_House1/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D268",
+      "script": "CeladonCity_House1_EventScript_RocketChief",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D271",
+      "script": "CeladonCity_House1_EventScript_Rocket1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D27A",
+      "script": "CeladonCity_House1_EventScript_Rocket2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc
index 6c8dab4ff..4a05ae97d 100644
--- a/data/maps/CeladonCity_House1/scripts.inc
+++ b/data/maps/CeladonCity_House1/scripts.inc
@@ -1,14 +1,14 @@
 CeladonCity_House1_MapScripts:: @ 816D267
 	.byte 0
 
-CeladonCity_House1_EventScript_16D268:: @ 816D268
-	msgbox gUnknown_8197A9F, MSGBOX_NPC
+CeladonCity_House1_EventScript_RocketChief:: @ 816D268
+	msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC
 	end
 
-CeladonCity_House1_EventScript_16D271:: @ 816D271
-	msgbox gUnknown_8197AD3, MSGBOX_NPC
+CeladonCity_House1_EventScript_Rocket1:: @ 816D271
+	msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC
 	end
 
-CeladonCity_House1_EventScript_16D27A:: @ 816D27A
-	msgbox gUnknown_8197B20, MSGBOX_NPC
+CeladonCity_House1_EventScript_Rocket2:: @ 816D27A
+	msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc
index df6acb986..d07d4a0e4 100644
--- a/data/maps/CeladonCity_House1/text.inc
+++ b/data/maps/CeladonCity_House1/text.inc
@@ -1,16 +1,20 @@
-gUnknown_8197A9F:: @ 8197A9F
+CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F
     .string "Hehehe!\p"
     .string "The slots just reel in the dough,\n"
     .string "big-time!$"
 
-gUnknown_8197AD3:: @ 8197AD3
+CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3
     .string "CHIEF!\p"
     .string "We just shipped two thousand\n"
     .string "more POKéMON as slot prizes\l"
     .string "again today!$"
 
-gUnknown_8197B20:: @ 8197B20
+CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20
     .string "Don't touch the poster at the GAME\n"
     .string "CORNER!\p"
     .string "There's no secret switch behind it!$"
 
+@ Text for the replaced altars in the rocket chiefs house / celadon mansion
+@ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG
+Text_ItsABuddhistAltar:: @ 8197B6F
+    .string "ぶつだん　だ‥$"
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
index 7d2af91a9..c37be2dc6 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
index 322968550..b98b49824 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
 	setrespawn SPAWN_CELADON_CITY
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
+CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604
-	msgbox gUnknown_819685B, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604
+	msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D
-	msgbox gUnknown_81968C2, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D
+	msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616
-	msgbox gUnknown_8196913, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616
+	msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
index 098582351..6aa628f39 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc
+++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
@@ -1,15 +1,15 @@
-gUnknown_819685B:: @ 819685B
+CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B
     .string "A POKé FLUTE awakens sleeping\n"
     .string "POKéMON. You know that.\p"
     .string "It does so with a sound that only\n"
     .string "they can hear.$"
 
-gUnknown_81968C2:: @ 81968C2
+CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2
     .string "I rode here from FUCHSIA.\p"
     .string "It's an uphill ride on CYCLING\n"
     .string "ROAD, so I'm exhausted.$"
 
-gUnknown_8196913:: @ 8196913
+CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913
     .string "If I had a BIKE, I would go to\n"
     .string "CYCLING ROAD!$"
 
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
index 9681ddfb2..dafc84778 100644
--- a/data/maps/CeladonCity_Restaurant/map.json
+++ b/data/maps/CeladonCity_Restaurant/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1EB",
+      "script": "CeladonCity_Restaurant_EventScript_Chef",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1F4",
+      "script": "CeladonCity_Restaurant_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D25E",
+      "script": "CeladonCity_Restaurant_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1FD",
+      "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D255",
+      "script": "CeladonCity_Restaurant_EventScript_WorkerM",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc
index c8ab9469a..9613406e4 100644
--- a/data/maps/CeladonCity_Restaurant/scripts.inc
+++ b/data/maps/CeladonCity_Restaurant/scripts.inc
@@ -1,41 +1,41 @@
 CeladonCity_Restaurant_MapScripts:: @ 816D1EA
 	.byte 0
 
-CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
-	msgbox gUnknown_81978E6, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB
+	msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
-	msgbox gUnknown_8197915, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4
+	msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
+CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B
-	msgbox gUnknown_81979C1
+	goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase
+	msgbox CeladonCity_Restaurant_Text_TakeThisImBusted
 	checkitemspace ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16D241
-	giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE
+	goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase
+	giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE
 	setflag FLAG_GOT_COIN_CASE
 	release
 	end
 
-EventScript_16D241:: @ 816D241
-	msgbox gUnknown_8197A5E
+CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241
+	msgbox CeladonCity_Restaurant_Text_MakeRoomForThis
 	release
 	end
 
-EventScript_16D24B:: @ 816D24B
-	msgbox gUnknown_8197A72
+CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B
+	msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack
 	release
 	end
 
-CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
-	msgbox gUnknown_8197952, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255
+	msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
-	msgbox gUnknown_819798A, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E
+	msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc
index 87edeb186..e6c27c2bd 100644
--- a/data/maps/CeladonCity_Restaurant/text.inc
+++ b/data/maps/CeladonCity_Restaurant/text.inc
@@ -1,22 +1,22 @@
-gUnknown_81978E6:: @ 81978E6
+CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6
     .string "Hi!\p"
     .string "Sorry, but we're taking a break\n"
     .string "right now.$"
 
-gUnknown_8197915:: @ 8197915
+CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915
     .string "My POKéMON are weak, so I often\n"
     .string "have to go to the DRUGSTORE.$"
 
-gUnknown_8197952:: @ 8197952
+CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952
     .string "Psst! There's a basement under the\n"
     .string "GAME CORNER, I hear.$"
 
-gUnknown_819798A:: @ 819798A
+CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A
     .string "Munch…\p"
     .string "The man at that table lost it all\n"
     .string "at the slots.$"
 
-gUnknown_81979C1:: @ 81979C1
+CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1
     .string "Go ahead! Laugh!\n"
     .string "I'm flat-out busted!\p"
     .string "No more slots for me!\n"
@@ -24,14 +24,14 @@ gUnknown_81979C1:: @ 81979C1
     .string "Here!\n"
     .string "I won't be needing this anymore!$"
 
-gUnknown_8197A38:: @ 8197A38
+CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38
     .string "{PLAYER} received a COIN CASE\n"
     .string "from the man.$"
 
-gUnknown_8197A5E:: @ 8197A5E
+CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E
     .string "Make room for this!$"
 
-gUnknown_8197A72:: @ 8197A72
+CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72
     .string "I always thought I was going to\n"
     .string "win it back…$"
 
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index def5fa6fd..58ca4c535 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164087",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164014",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164070",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F93",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Gideon",
       "flag": "0"
     },
     {
@@ -161,7 +161,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -170,7 +170,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -179,7 +179,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     }
   ],
   "bg_events": [
@@ -188,14 +188,14 @@
       "x": 11,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_3",
       "x": 26,
       "y": 11,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F78"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Computer"
     },
     {
       "type": "hidden_item",
@@ -222,147 +222,147 @@
       "x": 12,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     }
   ]
 }
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index 8382d4a72..dfcb6e43f 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -1,3 +1,12 @@
+.equ LOCALID_GRUNT1, 5
+.equ LOCALID_GRUNT2, 1
+.equ LOCALID_GRUNT3, 2
+.equ LOCALID_ADMIN1, 3
+.equ LOCALID_ADMIN2, 4
+
+.equ PLAYER_X_POS, VAR_0x8004
+.equ PLAYER_Y_POS, VAR_0x8005
+
 FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E
 	map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition
@@ -8,82 +17,82 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39
 	end
 
 FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
-	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47
+	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	end
 
-EventScript_163F47:: @ 8163F47
-	setmetatile 26, 20, 672, 0
-	setmetatile 27, 20, 672, 0
+FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47
+	setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0
+	setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
+FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A
 	lockall
-	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E
-	msgbox gUnknown_817B4E3
+	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked
+	msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen
 	releaseall
 	end
 
-EventScript_163F6E:: @ 8163F6E
-	msgbox gUnknown_817B512
+FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E
+	msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
-	msgbox gUnknown_817BB15, MSGBOX_SIGN
+FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78
+	msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
+FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81
 	lockall
-	applymovement 4, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
-	trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7
-	msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93
+	trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid
+	msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FB7:: @ 8163FB7
+FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7
 	famechecker FAMECHECKER_GIOVANNI, 5
-	msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE
+	msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FCD:: @ 8163FCD
-	msgbox gUnknown_817BC6C
+FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD
+	msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle
 	setflag FLAG_RECOVERED_SAPPHIRE
 	giveitem ITEM_SAPPHIRE
 	release
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585
-	msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9
-	msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F
-	msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16402F:: @ 816402F
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164065
-	msgbox gUnknown_817BA64
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject 1
-	removeobject 2
-	removeobject 4
-	removeobject 3
+	removeobject LOCALID_GRUNT2
+	removeobject LOCALID_GRUNT3
+	removeobject LOCALID_ADMIN2
+	removeobject LOCALID_ADMIN1
 	setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
 	fadescreen FADE_FROM_BLACK
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
@@ -91,91 +100,91 @@ EventScript_16402F:: @ 816402F
 	release
 	end
 
-EventScript_164065:: @ 8164065
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F
-	msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2
-	msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1640A2:: @ 81640A2
-	getplayerxy VAR_0x8004, VAR_0x8005
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
 	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare VAR_RESULT, DIR_NORTH
-	call_if_eq EventScript_16412E
-	msgbox gUnknown_817B7AE
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle
 	closemessage
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164144
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_16414F
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_16415A
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_16415A
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
 	playse SE_PIN
-	call EventScript_163F47
+	call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	special DrawWholeMapView
 	waitse
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164165
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_164170
-	msgbox gUnknown_817B7FA
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough
 	release
 	end
 
-EventScript_16412E:: @ 816412E
-	compare VAR_0x8004, 27
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E
+	compare PLAYER_X_POS, 27
 	goto_if_eq EventScript_Return
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164144:: @ 8164144
-	applymovement 3, Movement_16417B
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
 	waitmovement 0
 	return
 
-EventScript_16414F:: @ 816414F
-	applymovement 3, Movement_16417F
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
 	waitmovement 0
 	return
 
-EventScript_16415A:: @ 816415A
-	applymovement 3, Movement_WalkInPlaceFastestUp
+FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164165:: @ 8164165
-	applymovement 3, Movement_WalkInPlaceFastestLeft
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164170:: @ 8164170
-	applymovement 3, Movement_WalkInPlaceFastestDown
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Movement_16417B:: @ 816417B
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_16417F:: @ 816417F
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F
 	walk_right
 	walk_in_place_fastest_up
 	step_end
diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc
index b77ebd7c8..de74a7e67 100644
--- a/data/maps/FiveIsland_RocketWarehouse/text.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/text.inc
@@ -1,65 +1,65 @@
-gUnknown_817B4E3:: @ 817B4E3
+FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3
     .string "There are many POKéMON locked\n"
     .string "away in the pen…$"
 
-gUnknown_817B512:: @ 817B512
+FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512
     .string "The pen door is unlocked.\n"
     .string "The POKéMON appear to have fled.$"
 
-Text_17B54D:: @ 817B54D
+FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D
     .string "Did you come here knowing it's\n"
     .string "TEAM ROCKET's WAREHOUSE?$"
 
-Text_17B585:: @ 817B585
+FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585
     .string "What do you think you're doing?!$"
 
-gUnknown_817B5A6:: @ 817B5A6
+FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6
     .string "TEAM ROCKET broke up?\n"
     .string "What planet are you from?$"
 
-Text_17B5D6:: @ 817B5D6
+FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6
     .string "Oh, now your POKéMON look strong.\n"
     .string "You're willing to sell them?\p"
     .string "Oh?\n"
     .string "You wanted to battle?$"
 
-Text_17B62F:: @ 817B62F
+FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F
     .string "Oh, but…\n"
     .string "Too much!$"
 
-gUnknown_817B642:: @ 817B642
+FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642
     .string "We can give you a great price.\n"
     .string "Sell us your POKéMON!$"
 
-Text_17B677:: @ 817B677
+FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677
     .string "I got word about you from the\n"
     .string "others.\p"
     .string "But there's no way a kid like you'd\n"
     .string "know our BOSS GIOVANNI!$"
 
-Text_17B6D9:: @ 817B6D9
+FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9
     .string "Don't…you…dare…laugh…$"
 
-gUnknown_817B6EF:: @ 817B6EF
+FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF
     .string "Don't mess in the doings of adults,\n"
     .string "you jumped-up pip-squeak!$"
 
-Text_17B72D:: @ 817B72D
+FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D
     .string "I don't know or care if what I'm\n"
     .string "doing is right or wrong…\p"
     .string "I just put my faith in GIOVANNI\n"
     .string "and do as I am told.$"
 
-Text_17B79C:: @ 817B79C
+FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C
     .string "I…\n"
     .string "I'm shattered…$"
 
-gUnknown_817B7AE:: @ 817B7AE
+FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE
     .string "You're doing things according to\n"
     .string "your beliefs and morals.\p"
     .string "I understand now…$"
 
-gUnknown_817B7FA:: @ 817B7FA
+FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA
     .string "I've made it so you can come back\n"
     .string "in through there.\p"
     .string "Why don't you go get rested and\n"
@@ -69,7 +69,7 @@ gUnknown_817B7FA:: @ 817B7FA
     .string "You'd better steel yourself for one\n"
     .string "harsh challenge.$"
 
-Text_17B8DA:: @ 817B8DA
+FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA
     .string "That's quite enough of you \n"
     .string "playing the hero, kid.\p"
     .string "Spreading lies about how TEAM\n"
@@ -81,7 +81,7 @@ Text_17B8DA:: @ 817B8DA
     .string "And now, I'll show you how scary\n"
     .string "an angry adult can be!$"
 
-Text_17B9FB:: @ 817B9FB
+FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB
     .string "Urgh…\n"
     .string "You were too strong…\p"
     .string "…\n"
@@ -89,7 +89,7 @@ Text_17B9FB:: @ 817B9FB
     .string "So it's true?\n"
     .string "TEAM ROCKET really has disbanded?$"
 
-gUnknown_817BA64:: @ 817BA64
+FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64
     .string "We will abandon this WAREHOUSE…\p"
     .string "But don't think this is over.\n"
     .string "I won't let this be the end.\p"
@@ -98,7 +98,7 @@ gUnknown_817BA64:: @ 817BA64
     .string "I will…\p"
     .string "Until then, farewell!$"
 
-gUnknown_817BB15:: @ 817BB15
+FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15
     .string "A report with graphs and text is on\n"
     .string "the PC monitor.\p"
     .string "“The Influence of Magnetic Waves\n"
@@ -106,7 +106,7 @@ gUnknown_817BB15:: @ 817BB15
     .string "… … … … … …\p"
     .string "It's too difficult to understand…$"
 
-Text_17BBAF:: @ 817BBAF
+FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF
     .string "I almost managed to sell the\n"
     .string "SAPPHIRE for huge money…\p"
     .string "Then, you just had to come along\n"
@@ -114,19 +114,19 @@ Text_17BBAF:: @ 817BBAF
     .string "Fufu… Fufufufu…\n"
     .string "There's no forgiveness for you!$"
 
-Text_17BC55:: @ 817BC55
+FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55
     .string "Gah! Darn!\n"
     .string "Darn! Darn!$"
 
-gUnknown_817BC6C:: @ 817BC6C
+FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C
     .string "If I can't sell it, it's worthless!\n"
     .string "Go ahead, take it!$"
 
-gUnknown_817BCA3:: @ 817BCA3
+FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3
     .string "What do you want now?\n"
     .string "Go on, get lost, leave me be.$"
 
-gUnknown_817BCD7:: @ 817BCD7
+FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7
     .string "What, you again?\p"
     .string "You… You're not GIOVANNI's kid,\n"
     .string "are you?\p"
diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
index c3e3eaff2..c976122a7 100644
--- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
@@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44
 	.byte 0
 
 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
-	setstepcallback 4
+	setstepcallback STEP_CB_ICE
 	end
 
 FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
@@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
 	end
 
 FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
-	map_script_2 VAR_TEMP_1, 1, EventScript_163D65
+	map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole
 	.2byte 0
 
-EventScript_163D65:: @ 8163D65
+FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65
 	lockall
 	delay 20
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
@@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65
 	releaseall
 	end
 
-Movement_163D7F:: @ 8163D7F
+FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F
 	set_invisible
 	step_end
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index 9af9a6faf..32ca627ba 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163F25",
+      "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei",
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -92,7 +92,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -101,7 +101,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     }
   ],
   "bg_events": []
diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
index 39eb3f0b4..a0a94d4be 100644
--- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
@@ -1,100 +1,105 @@
+.equ LOCALID_ROCKET1, 1
+.equ LOCALID_ROCKET2, 2
+.equ LOCALID_LORELEI, 3
+.equ LOCALID_ROCKET3, 4
+
 FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
 	.byte 0
 
 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
 	compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
-	call_if_eq EventScript_163D94
+	call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
 	end
 
-EventScript_163D94:: @ 8163D94
+FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94
 	setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI
 	return
 
-FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
+FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
 	lockall
 	textcolor 1
-	msgbox gUnknown_817B04F
-	applymovement 1, Movement_163EE8
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B0B9
+	msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
 	closemessage
 	playse SE_PIN
-	applymovement 3, Movement_ExclamationMark
+	applymovement LOCALID_LORELEI, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_LORELEI, Movement_Delay48
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B109
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
 	closemessage
-	applymovement 3, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 35
-	applymovement 4, Movement_163F11
-	applymovement 3, Movement_163F18
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
 	waitmovement 0
-	applymovement 2, Movement_163EE8
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	playbgm MUS_ROCKET, 0
 	textcolor 0
-	msgbox gUnknown_817B20B
-	setvar VAR_LAST_TALKED, 4
-	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251
-	applymovement 3, Movement_163F1B
+	msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
+	setvar VAR_LAST_TALKED, LOCALID_ROCKET3
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B269
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
 	textcolor 0
-	msgbox gUnknown_817B2EF
+	msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat
 	textcolor 1
-	message Text_17B313
+	message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
 	waitmessage
 	waitse
 	playmoncry SPECIES_LAPRAS, 2
 	waitbuttonpress
 	waitmoncry
-	applymovement 1, Movement_163EEE
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B399
+	msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
 	closemessage
-	applymovement 3, Movement_163F1D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2
-	applymovement 1, Movement_163EF0
-	applymovement 2, Movement_163EFA
-	applymovement 4, Movement_163F05
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
 	waitmovement 0
-	removeobject 1
-	removeobject 2
-	removeobject 4
+	removeobject LOCALID_ROCKET1
+	removeobject LOCALID_ROCKET2
+	removeobject LOCALID_ROCKET3
 	delay 50
-	applymovement 3, Movement_163F23
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B457
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
 	setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
 	clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
 	setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
 	releaseall
 	end
 
-Movement_163EDD:: @ 8163EDD
+FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD
 	walk_up
 	walk_up
 	walk_right
 	walk_up
 	step_end
 
-Movement_163EE2:: @ 8163EE2
+FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2
 	delay_16
 	walk_in_place_fastest_left
 	delay_16
@@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163EE8:: @ 8163EE8
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8
 	walk_in_place_down
 	step_end
 
-gUnknown_163EEA:: @ 8163EEA
+FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-Movement_163EEE:: @ 8163EEE
+FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE
 	walk_in_place_fast_down
 	step_end
 
-Movement_163EF0:: @ 8163EF0
+FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0
 	walk_right
 	walk_down
 	walk_fast_down
@@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0
 	walk_fast_down
 	step_end
 
-Movement_163EFA:: @ 8163EFA
+FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA
 	delay_16
 	walk_left
 	walk_down
@@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA
 	walk_fast_down
 	step_end
 
-Movement_163F05:: @ 8163F05
+FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05
 	delay_16
 	walk_down
 	delay_16
@@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05
 	walk_fast_down
 	step_end
 
-Movement_163F11:: @ 8163F11
+FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-Movement_163F15:: @ 8163F15
+FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15
 	walk_left
 	walk_left
 	step_end
 
-Movement_163F18:: @ 8163F18
+FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18
 	walk_left
 	walk_up
 	step_end
 
-Movement_163F1B:: @ 8163F1B
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B
 	walk_in_place_up
 	step_end
 
-Movement_163F1D:: @ 8163F1D
+FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
@@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163F23:: @ 8163F23
+FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23
 	walk_right
 	step_end
 
-FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
-	msgbox gUnknown_817B457, MSGBOX_NPC
+FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC
 	end
diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc
index f65e95854..981041777 100644
--- a/data/maps/FourIsland_IcefallCave_Back/text.inc
+++ b/data/maps/FourIsland_IcefallCave_Back/text.inc
@@ -1,16 +1,16 @@
-gUnknown_817B04F:: @ 817B04F
+FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F
     .string "LORELEI: Keep your filthy hands\n"
     .string "off the POKéMON in the cave!\p"
     .string "Do as I say, or you'll have me to\n"
     .string "answer to!$"
 
-gUnknown_817B0B9:: @ 817B0B9
+FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9
     .string "Aww, shut it, lady, and leave\n"
     .string "us be.\p"
     .string "Don't let your glasses get all\n"
     .string "steamed up!$"
 
-gUnknown_817B109:: @ 817B109
+FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109
     .string "LORELEI: {PLAYER}?!\n"
     .string "What are you doing here?\p"
     .string "No, we can catch up later.\n"
@@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109
     .string "Are you ready?\n"
     .string "You take that one, please!$"
 
-gUnknown_817B20B:: @ 817B20B
+FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B
     .string "W-what?!\p"
     .string "Who says we can't do what we want\n"
     .string "with the POKéMON we catch?$"
 
-Text_17B251:: @ 817B251
+FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251
     .string "We didn't plan on this!$"
 
-gUnknown_817B269:: @ 817B269
+FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269
     .string "LORELEI: Humph.\n"
     .string "So despicably weak.\p"
     .string "You!\n"
@@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269
     .string "I'm smashing your ring once and\n"
     .string "for all!$"
 
-gUnknown_817B2EF:: @ 817B2EF
+FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF
     .string "N-no way!\n"
     .string "I'm not telling you that!$"
 
-Text_17B313:: @ 817B313
+FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313
     .string "LORELEI: If you won't confess,\n"
     .string "we'll deep-freeze you.\p"
     .string "My LAPRAS is furious for what\n"
@@ -52,7 +52,7 @@ Text_17B313:: @ 817B313
     .string "Go, LAPRAS!\n"
     .string "ICE BEAM…$"
 
-gUnknown_817B399:: @ 817B399
+FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399
     .string "Wawaah! Okay!\n"
     .string "I'll talk!\p"
     .string "The POKéMON are in the ROCKET\n"
@@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399
     .string "into the ROCKET WAREHOUSE!\p"
     .string "Heheheheh!$"
 
-gUnknown_817B457:: @ 817B457
+FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457
     .string "{PLAYER}, thank you.\n"
     .string "But this is awful…\p"
     .string "I was born and raised here on\n"
diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc
index bc9827037..70831a754 100644
--- a/data/maps/IndigoPlateau_Exterior/scripts.inc
+++ b/data/maps/IndigoPlateau_Exterior/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_RIVAL,    1
+.equ LOCALID_PROF_OAK, 2
+
 IndigoPlateau_Exterior_MapScripts:: @ 816723B
 	map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame
@@ -6,22 +9,23 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B
 IndigoPlateau_Exterior_OnTransition:: @ 8167246
 	setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
 	compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
-	call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
+	call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic
 	end
 
-EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255
+IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255
 	playbgm MUS_ENDING, 0
 	return
 
 IndigoPlateau_Exterior_OnFrame:: @ 816725A
-	map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits
+	map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_Credits
 	.2byte 0
 
-EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
-	@ After beating the champion, you are warped to the main
-	@ entrance of Indigo Plateau. This script starts running
-	@ immediately after your walking animation.
-	@ The script is timed to the music.
+
+@ After beating the champion, you are warped to the main
+@ entrance of Indigo Plateau. This script starts running
+@ immediately after your walking animation.
+@ The script is timed to the music.
+IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
 	lockall
 	delay 105
 
@@ -29,60 +33,60 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
 	opendoor 11, 6
 	waitdooranim
 	special SpawnCameraObject
-	addobject 1
-	applymovement 1, Movement_167346
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167337
+	addobject LOCALID_RIVAL
+	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 
 	@ Rival runs off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B
-	applymovement 1, Movement_16733E
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
+	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
 	waitmovement 0
 	delay 100
 
 	@ Oak exits building
 	opendoor 11, 6
 	waitdooranim
-	addobject 2
-	applymovement 2, Movement_16735D
+	addobject LOCALID_PROF_OAK
+	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 	delay 160
 
 	@ Oak looks at player, then walks off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F
-	applymovement 2, Movement_167348
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
+	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
 	waitmovement 0
 	delay 100
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E
+
+	@ Player begin to leave
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
 	waitmovement 0
 	delay 155
-
-	@ Player turns to face the League
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
 	waitmovement 0
 	delay 90
 
 	@ Player runs off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167335
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167311
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
 	waitmovement 0
 
 	@ Reset the map state and roll the credits
 	special RemoveCameraObject
 	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
-	removeobject 1
-	removeobject 2
+	removeobject LOCALID_RIVAL
+	removeobject LOCALID_PROF_OAK
 	special Special_Credits @ noreturn
 	waitstate
 	releaseall
 	end
 
-Movement_167311:: @ 8167311
+IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311
 	player_run_down
 	player_run_down
 	player_run_down
@@ -91,18 +95,19 @@ Movement_167311:: @ 8167311
 	player_run_down
 	step_end
 
-Movement_167318:: @ 8167318
+@ Unused
+IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: @ 8167318
 	walk_down
 	walk_down
 	step_end
 
-Movement_16731B:: @ 816731B
+IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: @ 816731B
 	delay_16
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-Movement_16731F:: @ 816731F
+IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
@@ -119,7 +124,7 @@ Movement_16731F:: @ 816731F
 	walk_in_place_fastest_down
 	step_end
 
-Movement_16732E:: @ 816732E
+IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E
 	walk_right
 	delay_16
 	walk_down
@@ -128,22 +133,22 @@ Movement_16732E:: @ 816732E
 	delay_16
 	step_end
 
-Movement_167335:: @ 8167335
+IndigoPlateau_Exterior_Movement_PlayerTurnAround:: @ 8167335
 	walk_in_place_fastest_down
 	step_end
 
-Movement_167337:: @ 8167337
+IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @ 8167337
 	face_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-Movement_16733C:: @ 816733C
+IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: @ 816733C
 	walk_in_place_fastest_up
 	step_end
 
-Movement_16733E:: @ 816733E
+IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
@@ -153,11 +158,11 @@ Movement_16733E:: @ 816733E
 	walk_fast_down
 	step_end
 
-Movement_167346:: @ 8167346
+IndigoPlateau_Exterior_Movement_RivalExitBuilding:: @ 8167346
 	walk_fast_down
 	step_end
 
-Movement_167348:: @ 8167348
+IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
@@ -180,6 +185,6 @@ Movement_167348:: @ 8167348
 	walk_down
 	step_end
 
-Movement_16735D:: @ 816735D
+IndigoPlateau_Exterior_Movement_OakExitBuilding:: @ 816735D
 	walk_down
 	step_end
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index f214403c3..e862a372e 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
index 67a3e4f6a..e0523d2ee 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -7,52 +7,52 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
 	setrespawn SPAWN_INDIGO_PLATEAU
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16EA79
+	call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
 	end
 
-EventScript_16EA79:: @ 816EA79
+IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79
 	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
 	setobjectxyperm 4, 4, 2
 	return
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
+IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16EAA6
-	msgbox gUnknown_819A8D8
+	goto_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
 	release
 	end
 
-EventScript_16EAA6:: @ 816EAA6
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9
-	msgbox gUnknown_819A943
+IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: @ 816EAA6
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing
 	release
 	end
 
-EventScript_16EAB9:: @ 816EAB9
-	msgbox gUnknown_819A8D8
+IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: @ 816EAB9
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
-	msgbox gUnknown_819A837, MSGBOX_NPC
+IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: @ 816EAC3
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice, MSGBOX_NPC
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
+IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16EAF4
+	pokemart IndigoPlateau_PokemonCenter_1F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16EAF4:: @ 816EAF4
+IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_FULL_RESTORE
@@ -64,7 +64,7 @@ Items_16EAF4:: @ 816EAF4
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06
+IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: @ 816EB06
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
index 7a4d158b3..192831d64 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819A837:: @ 819A837
+IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837
     .string "Yo!\n"
     .string "Champ in the making!\p"
     .string "At the POKéMON LEAGUE, you will\n"
@@ -8,13 +8,13 @@ gUnknown_819A837:: @ 819A837
     .string "This is it!\n"
     .string "Go for it!$"
 
-gUnknown_819A8D8:: @ 819A8D8
+IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: @ 819A8D8
     .string "From here on, you face the\n"
     .string "ELITE FOUR one by one.\p"
     .string "If you win, a door opens to the\n"
     .string "next TRAINER. Good luck!$"
 
-gUnknown_819A943:: @ 819A943
+IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A943
     .string "I am so sorry, but you've wasted\n"
     .string "your time coming here.\p"
     .string "LORELEI of the ELITE FOUR is\n"
@@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943
     .string "As a result, the POKéMON LEAGUE is\n"
     .string "closed for the time being.$"
 
+IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7
+    .string "AGATHA's GHOST-type POKéMON are\n"
+    .string "horrifically terrifying in toughness.\p"
+    .string "I took my FIGHTING-type POKéMON\n"
+    .string "and raised them to the max.\p"
+    .string "I went at AGATHA feeling pretty\n"
+    .string "confident, but she whupped us.\p"
+    .string "That old lady's also got a really\n"
+    .string "short fuse, too.\p"
+    .string "It doesn't take anything to get\n"
+    .string "that scary lady hollering.$"
+
+IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: @ 819AB16
+    .string "Maybe becoming an ELITE FOUR\n"
+    .string "member is in the blood.\p"
+    .string "From what I've heard, LANCE has\n"
+    .string "a cousin who's a GYM LEADER\l"
+    .string "somewhere far away.$"
+
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index e32b5f379..b12af5aae 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_16063C",
+      "script": "MtMoon_1F_EventScript_Iris",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_160681",
+      "script": "MtMoon_1F_EventScript_Robby",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_160653",
+      "script": "MtMoon_1F_EventScript_Jovan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_160625",
+      "script": "MtMoon_1F_EventScript_Miriam",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_16066A",
+      "script": "MtMoon_1F_EventScript_Kent",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_16060E",
+      "script": "MtMoon_1F_EventScript_Josh",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "MtMoon_1F_EventScript_1605F7",
+      "script": "MtMoon_1F_EventScript_Macros",
       "flag": "0"
     },
     {
@@ -192,7 +192,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_1F_EventScript_1ACE03",
+      "script": "MtMoon_1F_EventScript_BaldingMan",
       "flag": "0"
     }
   ],
@@ -233,7 +233,7 @@
       "x": 19,
       "y": 26,
       "elevation": 0,
-      "script": "MtMoon_1F_EventScript_1605EE"
+      "script": "MtMoon_1F_EventScript_ZubatSign"
     }
   ]
 }
diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc
index 4c80943d1..2ddfef089 100644
--- a/data/maps/MtMoon_1F/scripts.inc
+++ b/data/maps/MtMoon_1F/scripts.inc
@@ -6,41 +6,41 @@ MtMoon_1F_OnTransition:: @ 81605EA
 	setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F
 	end
 
-MtMoon_1F_EventScript_1605EE:: @ 81605EE
-	msgbox gUnknown_8172AE0, MSGBOX_SIGN
+MtMoon_1F_EventScript_ZubatSign:: @ 81605EE
+	msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN
 	end
 
-MtMoon_1F_EventScript_1605F7:: @ 81605F7
-	trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB
-	msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Macros:: @ 81605F7
+	trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat
+	msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16060E:: @ 816060E
-	trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844
-	msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Josh:: @ 816060E
+	trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat
+	msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160625:: @ 8160625
-	trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3
-	msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Miriam:: @ 8160625
+	trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat
+	msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16063C:: @ 816063C
-	trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4
-	msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Iris:: @ 816063C
+	trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat
+	msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160653:: @ 8160653
-	trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927
-	msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Jovan:: @ 8160653
+	trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat
+	msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16066A:: @ 816066A
-	trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A
-	msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Kent:: @ 816066A
+	trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat
+	msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160681:: @ 8160681
-	trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F
-	msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Robby:: @ 8160681
+	trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat
+	msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc
index 86028da5c..249c9dd50 100644
--- a/data/maps/MtMoon_1F/text.inc
+++ b/data/maps/MtMoon_1F/text.inc
@@ -1,87 +1,92 @@
-Text_17279D:: @ 817279D
+MtMoon_1F_Text_MarcosIntro:: @ 817279D
     .string "WHOA!\n"
     .string "You shocked me!\l"
     .string "…Oh, you're just a kid!$"
 
-Text_1727CB:: @ 81727CB
+MtMoon_1F_Text_MarcosDefeat:: @ 81727CB
     .string "Wow!\n"
     .string "Shocked again!$"
 
-gUnknown_81727DF:: @ 81727DF
+MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF
     .string "Kids like you shouldn't be\n"
     .string "wandering around here in the dark.$"
 
-Text_17281D:: @ 817281D
+MtMoon_1F_Text_JoshIntro:: @ 817281D
     .string "Did you come to explore the cave,\n"
     .string "too?$"
 
-Text_172844:: @ 8172844
+MtMoon_1F_Text_JoshDefeat:: @ 8172844
     .string "Losing stinks!\n"
     .string "It's so uncool.$"
 
-gUnknown_8172863:: @ 8172863
+MtMoon_1F_Text_JoshPostBattle:: @ 8172863
     .string "I came all the way down here to\n"
     .string "show off to girls.$"
 
-Text_172896:: @ 8172896
+MtMoon_1F_Text_MiriamIntro:: @ 8172896
     .string "Wow! It's way bigger in here than\n"
     .string "I thought!$"
 
-Text_1728C3:: @ 81728C3
+MtMoon_1F_Text_MiriamDefeat:: @ 81728C3
     .string "Oh!\n"
     .string "I lost it!$"
 
-gUnknown_81728D2:: @ 81728D2
+MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2
     .string "How do you get out of here?\n"
     .string "It's so big, I may get lost.$"
 
-Text_17290B:: @ 817290B
+MtMoon_1F_Text_JovanIntro:: @ 817290B
     .string "What!\n"
     .string "Don't sneak up on me!$"
 
-Text_172927:: @ 8172927
+MtMoon_1F_Text_JovanDefeat:: @ 8172927
     .string "My POKéMON won't do!$"
 
-gUnknown_817293C:: @ 817293C
+MtMoon_1F_Text_JovanPostBattle:: @ 817293C
     .string "I have to find stronger POKéMON.\n"
     .string "Where might they be?$"
 
-Text_172972:: @ 8172972
+MtMoon_1F_Text_IrisIntro:: @ 8172972
     .string "What?\n"
     .string "I'm waiting for my friends to find\l"
     .string "me here.$"
 
-Text_1729A4:: @ 81729A4
+MtMoon_1F_Text_IrisDefeat:: @ 81729A4
     .string "I lost?$"
 
-gUnknown_81729AC:: @ 81729AC
+MtMoon_1F_Text_IrisPostBattle:: @ 81729AC
     .string "I came because I heard there are\n"
     .string "some very rare fossils here.$"
 
-Text_1729EA:: @ 81729EA
+MtMoon_1F_Text_KentIntro:: @ 81729EA
     .string "Suspicious men are in the cave.\n"
     .string "What about you?$"
 
-Text_172A1A:: @ 8172A1A
+MtMoon_1F_Text_KentDefeat:: @ 8172A1A
     .string "You got me!$"
 
-gUnknown_8172A26:: @ 8172A26
+MtMoon_1F_Text_KentPostBattle:: @ 8172A26
     .string "I saw them!\n"
     .string "I'm sure they're from TEAM ROCKET!$"
 
-Text_172A55:: @ 8172A55
+MtMoon_1F_Text_RobbyIntro:: @ 8172A55
     .string "You need to go through this cave\n"
     .string "to get to CERULEAN CITY.$"
 
-Text_172A8F:: @ 8172A8F
+MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F
     .string "I lost.$"
 
-gUnknown_8172A97:: @ 8172A97
+MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97
     .string "ZUBAT is tough!\n"
     .string "But if you can catch one, you'll\l"
     .string "be able to count on it.$"
 
-gUnknown_8172AE0:: @ 8172AE0
+MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0
     .string "Beware!\n"
     .string "ZUBAT is a bloodsucker!$"
 
+MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00
+    .string "Hi, I'm excavating for fossils here\n"
+    .string "under MT. MOON.\p"
+    .string "Sometimes, BROCK of PEWTER GYM\n"
+    .string "lends me a hand.$"
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index ac65802cb..f3c51828c 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_16071B",
+      "script": "MtMoon_B2F_EventScript_DomeFossil",
       "flag": "FLAG_HIDE_DOME_FOSSIL"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_16077F",
+      "script": "MtMoon_B2F_EventScript_HelixFossil",
       "flag": "FLAG_HIDE_HELIX_FOSSIL"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_1606C2",
+      "script": "MtMoon_B2F_EventScript_Miguel",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "MtMoon_B2F_EventScript_160829",
+      "script": "MtMoon_B2F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_B2F_EventScript_1607E4",
+      "script": "MtMoon_B2F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_B2F_EventScript_160812",
+      "script": "MtMoon_B2F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_B2F_EventScript_1607FB",
+      "script": "MtMoon_B2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -195,7 +195,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_MT_MOON_B2F",
       "var_value": 0,
-      "script": "MtMoon_B2F_EventScript_1606B0"
+      "script": "MtMoon_B2F_EventScript_MiguelTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
index 71c458c12..515242568 100644
--- a/data/maps/MtMoon_B2F/scripts.inc
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -1,138 +1,142 @@
+.equ LOCALID_DOME_FOSSIL,  1
+.equ LOCALID_HELIX_FOSSIL, 2
+.equ LOCALID_MIGUEL,       3
+
 MtMoon_B2F_MapScripts:: @ 8160699
 	map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition
 	.byte 0
 
 MtMoon_B2F_OnTransition:: @ 816069F
-	call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9
+	call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils
 	end
 
-EventScript_1606A9:: @ 81606A9
+MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9
 	clearflag FLAG_HIDE_DOME_FOSSIL
 	clearflag FLAG_HIDE_HELIX_FOSSIL
 	return
 
-MtMoon_B2F_EventScript_1606B0:: @ 81606B0
+MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0
 	lockall
-	applymovement 3, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call EventScript_1606DD
+	call MtMoon_B2F_EventScript_BattleMiguel
 	releaseall
 	end
 
-MtMoon_B2F_EventScript_1606C2:: @ 81606C2
+MtMoon_B2F_EventScript_Miguel:: @ 81606C2
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707
-	goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711
-	call EventScript_1606DD
+	goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked
+	goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_EventScript_MiguelGoPickFossil
+	call MtMoon_B2F_EventScript_BattleMiguel
 	release
 	end
 
-EventScript_1606DD:: @ 81606DD
+MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD
 	textcolor 0
-	message Text_172B64
+	message MtMoon_B2F_Text_MiguelIntro
 	waitmessage
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
-	setvar VAR_LAST_TALKED, 3
-	trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99
+	setvar VAR_LAST_TALKED, LOCALID_MIGUEL
+	trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat
 	setvar VAR_MAP_SCENE_MT_MOON_B2F, 1
-	msgbox gUnknown_8172BAB
+	msgbox MtMoon_B2F_Text_WellEachTakeAFossil
 	return
 
-EventScript_160707:: @ 8160707
-	msgbox gUnknown_8172BFB
+MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707
+	msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils
 	release
 	end
 
-EventScript_160711:: @ 8160711
-	msgbox gUnknown_8172BAB
+MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711
+	msgbox MtMoon_B2F_Text_WellEachTakeAFossil
 	release
 	end
 
-MtMoon_B2F_EventScript_16071B:: @ 816071B
+MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
 	lock
 	faceplayer
-	msgbox gUnknown_8172E77, MSGBOX_YESNO
+	msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1607DE
-	removeobject 1
-	giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
+	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
+	removeobject LOCALID_DOME_FOSSIL
+	giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5
 	closemessage
 	special sub_8112364
 	delay 10
-	applymovement 3, Movement_16077A
+	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
 	waitmovement 0
-	moveobjectoffscreen 3
+	moveobjectoffscreen LOCALID_MIGUEL
 	textcolor 0
 	playfanfare MUS_FAN5
-	message Text_172BD6
+	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
 	waitfanfare
-	removeobject 2
+	removeobject LOCALID_HELIX_FOSSIL
 	setflag FLAG_GOT_DOME_FOSSIL
 	setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
 	release
 	end
 
-Movement_16077A:: @ 816077A
+MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A
 	walk_right
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-MtMoon_B2F_EventScript_16077F:: @ 816077F
+MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
 	lock
 	faceplayer
-	msgbox gUnknown_8172E94, MSGBOX_YESNO
+	msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1607DE
-	removeobject 2
-	giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
+	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
+	removeobject LOCALID_HELIX_FOSSIL
+	giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
 	closemessage
 	special sub_8112364
 	delay 10
-	applymovement 3, Movement_1607E0
+	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
 	waitmovement 0
-	moveobjectoffscreen 3
+	moveobjectoffscreen LOCALID_MIGUEL
 	textcolor 0
 	playfanfare MUS_FAN5
-	message Text_172BD6
+	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
 	waitfanfare
-	removeobject 1
+	removeobject LOCALID_DOME_FOSSIL
 	setflag FLAG_GOT_HELIX_FOSSIL
 	setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
 	release
 	end
 
-EventScript_1607DE:: @ 81607DE
+MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE
 	release
 	end
 
-Movement_1607E0:: @ 81607E0
+MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-MtMoon_B2F_EventScript_1607E4:: @ 81607E4
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8
-	msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt1:: @ 81607E4
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat
+	msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_1607FB:: @ 81607FB
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46
-	msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt2:: @ 81607FB
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat
+	msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_160812:: @ 8160812
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF
-	msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt3:: @ 8160812
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat
+	msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_160829:: @ 8160829
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E
-	msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt4:: @ 8160829
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat
+	msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc
index 2f27312db..fd4b564f0 100644
--- a/data/maps/MtMoon_B2F/text.inc
+++ b/data/maps/MtMoon_B2F/text.inc
@@ -1,90 +1,84 @@
-Text_172B00:: @ 8172B00
-    .string "Hi, I'm excavating for fossils here\n"
-    .string "under MT. MOON.\p"
-    .string "Sometimes, BROCK of PEWTER GYM\n"
-    .string "lends me a hand.$"
-
-Text_172B64:: @ 8172B64
+MtMoon_B2F_Text_MiguelIntro:: @ 8172B64
     .string "Hey, stop!\p"
     .string "I found these fossils!\n"
     .string "They're both mine!$"
 
-Text_172B99:: @ 8172B99
+MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99
     .string "Okay!\n"
     .string "I'll share!$"
 
-gUnknown_8172BAB:: @ 8172BAB
+MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB
     .string "We'll each take a fossil!\n"
     .string "No being greedy!$"
 
-Text_172BD6:: @ 8172BD6
+MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6
     .string "All right.\n"
     .string "Then this fossil is mine!$"
 
-gUnknown_8172BFB:: @ 8172BFB
+MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB
     .string "Far away, on CINNABAR ISLAND,\n"
     .string "there's a POKéMON LAB.\p"
     .string "They do research on regenerating\n"
     .string "fossils.$"
 
-Text_172C5A:: @ 8172C5A
+MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A
     .string "We, TEAM ROCKET, shall find the\n"
     .string "fossils!\p"
     .string "Reviving POKéMON from them will\n"
     .string "earn us huge riches!$"
 
-Text_172CB8:: @ 8172CB8
+MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8
     .string "Urgh!\n"
     .string "Now I'm mad!$"
 
-gUnknown_8172CCB:: @ 8172CCB
+MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB
     .string "You made me mad!\n"
     .string "TEAM ROCKET will blacklist you!$"
 
-Text_172CFC:: @ 8172CFC
+MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC
     .string "We, TEAM ROCKET, are POKéMON\n"
     .string "gangsters!\l"
     .string "We strike fear with our strength!$"
 
-Text_172D46:: @ 8172D46
+MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46
     .string "I blew it!$"
 
-gUnknown_8172D51:: @ 8172D51
+MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51
     .string "Darn it all!\n"
     .string "My associates won't stand for this!$"
 
-Text_172D82:: @ 8172D82
+MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82
     .string "We're pulling a big job here!\n"
     .string "Get lost, kid!$"
 
-Text_172DAF:: @ 8172DAF
+MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF
     .string "So, you are good…$"
 
-gUnknown_8172DC1:: @ 8172DC1
+MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1
     .string "If you find a fossil, give it to me\n"
     .string "and scram!$"
 
-Text_172DF0:: @ 8172DF0
+MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0
     .string "Little kids shouldn't be messing\n"
     .string "around with grown-ups!\p"
     .string "It could be bad news!$"
 
-Text_172E3E:: @ 8172E3E
+MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E
     .string "I'm steamed!$"
 
-gUnknown_8172E4B:: @ 8172E4B
+MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B
     .string "POKéMON lived here long before\n"
     .string "people came.$"
 
-gUnknown_8172E77:: @ 8172E77
+MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77
     .string "Do you want the DOME FOSSIL?$"
 
-gUnknown_8172E94:: @ 8172E94
+MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94
     .string "Do you want the HELIX FOSSIL?$"
 
-gUnknown_8172EB2:: @ 8172EB2
+MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2
     .string "Obtained the HELIX FOSSIL!$"
 
-gUnknown_8172ECD:: @ 8172ECD
+MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD
     .string "Obtained the DOME FOSSIL!$"
 
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index 91981c25d..ef624c9c0 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_NANADUNGEON",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc
index aeccc1e47..d9a6e376a 100644
--- a/data/maps/OneIsland/text.inc
+++ b/data/maps/OneIsland/text.inc
@@ -1,12 +1,3 @@
-Text_181569:: @ 8181569
-    .string "This FAN CLUB…\n"
-    .string "No one here has a clue!\p"
-    .string "How could they not recognize\n"
-    .string "the brilliance that is LANCE?\p"
-    .string "He stands for justice!\n"
-    .string "He's cool, and yet passionate!\l"
-    .string "He's the greatest, LANCE!$"
-
 gUnknown_818161B:: @ 818161B
     .string "BILL: Here we are!\n"
     .string "This is ONE ISLAND.\p"
diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc
index faa31c9d1..ba40d1729 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/text.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc
@@ -1,65 +1,3 @@
-Text_18CF4D:: @ 818CF4D
-    .string "Training by oneself is certainly\n"
-    .string "not a bad thing.\p"
-    .string "But it's also not bad to aim for\n"
-    .string "the top with a partner.\p"
-    .string "Even BRUNO…\n"
-    .string "He trained with a fellow by the\l"
-    .string "name of BRAWLY before.$"
-
-Text_18CFFB:: @ 818CFFB
-    .string "Do you know anything about this\n"
-    .string "stone chamber?$"
-
-Text_18D02A:: @ 818D02A
-    .string "That was uncalled for.\n"
-    .string "You didn't have to be so rough.$"
-
-Text_18D061:: @ 818D061
-    .string "The TANOBY RUINS date back at\n"
-    .string "least 1,500 years.\p"
-    .string "But it's a baffling mystery as to\n"
-    .string "why it was built in the first place.$"
-
-Text_18D0D9:: @ 818D0D9
-    .string "A mystic POKéMON is said to sleep\n"
-    .string "inside here.$"
-
-Text_18D108:: @ 818D108
-    .string "I'm not much good in battle.$"
-
-Text_18D125:: @ 818D125
-    .string "I hear there are other ruins like\n"
-    .string "the one here.\p"
-    .string "Might they be the resting places\n"
-    .string "of other mystic POKéMON?$"
-
-Text_18D18F:: @ 818D18F
-    .string "CLIFFORD is teaching me how to\n"
-    .string "paint.$"
-
-Text_18D1B5:: @ 818D1B5
-    .string "We might get in trouble for being\n"
-    .string "noisy here.$"
-
-Text_18D1E3:: @ 818D1E3
-    .string "I said that I wanted to paint an\n"
-    .string "old building.\p"
-    .string "So CLIFFORD brought me here.$"
-
-Text_18D22F:: @ 818D22F
-    .string "Today, in addition to our lesson,\n"
-    .string "we came to see the chamber.$"
-
-Text_18D26D:: @ 818D26D
-    .string "My, how extraordinary.$"
-
-Text_18D284:: @ 818D284
-    .string "Ah, so you are studying POKéMON\n"
-    .string "on your own…\p"
-    .string "Yes, you certainly are quite the\n"
-    .string "extraordinary person, indeed.$"
-
 gUnknown_818D2F0:: @ 818D2F0
     .string "MOM: …Right.\n"
     .string "All boys leave home someday.\l"
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
index 064480ba0..f71b81bf0 100644
--- a/data/maps/PokemonLeague_AgathasRoom/map.json
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_AgathasRoom_EventScript_162877",
+      "script": "PokemonLeague_AgathasRoom_EventScript_Agatha",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
index 62293c1ec..202b9fda4 100644
--- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc
+++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
@@ -7,86 +7,84 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810
 
 PokemonLeague_AgathasRoom_OnResume:: @ 8162825
 	setvar VAR_0x8004, 2
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_AgathasRoom_OnLoad:: @ 8162830
-	call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B
+	call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
-	call_if_eq EventScript_162845
+	call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry
 	end
 
-EventScript_162845:: @ 8162845
-	call EventScript_1A759C
+PokemonLeague_AgathasRoom_EventScript_CloseEntry:: @ 8162845
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_16284B:: @ 816284B
-	call EventScript_1A7538
+PokemonLeague_AgathasRoom_EventScript_SetDoorOpen:: @ 816284B
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_AgathasRoom_OnWarp:: @ 8162851
-	map_script_2 VAR_TEMP_1, 0, EventScript_16285B
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_16285B:: @ 816285B
+PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: @ 816285B
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_AgathasRoom_OnFrame:: @ 8162860
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_AgathasRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_16286A:: @ 816286A
+PokemonLeague_AgathasRoom_EventScript_EnterRoom:: @ 816286A
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3
 	releaseall
 	end
 
-PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
+PokemonLeague_AgathasRoom_EventScript_Agatha:: @ 8162877
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911
+	goto_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_AGATHA, 0
 	famechecker FAMECHECKER_AGATHA, 4
 	famechecker FAMECHECKER_OAK, 4
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_16291B
-
-EventScript_1628E8:: @ 81628E8
+	goto PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha
 	end
 
-EventScript_1628E9:: @ 81628E9
-	msgbox gUnknown_817844D
+PokemonLeague_AgathasRoom_EventScript_Intro:: @ 81628E9
+	msgbox PokemonLeague_AgathasRoom_Text_Intro
 	return
 
-EventScript_1628F2:: @ 81628F2
-	msgbox gUnknown_817858D
+PokemonLeague_AgathasRoom_EventScript_RematchIntro:: @ 81628F2
+	msgbox PokemonLeague_AgathasRoom_Text_RematchIntro
 	return
 
-EventScript_1628FB:: @ 81628FB
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7
+PokemonLeague_AgathasRoom_EventScript_Battle:: @ 81628FB
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, PokemonLeague_AgathasRoom_Text_Defeat
 	return
 
-EventScript_162906:: @ 8162906
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7
+PokemonLeague_AgathasRoom_EventScript_Rematch:: @ 8162906
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, PokemonLeague_AgathasRoom_Text_Defeat
 	return
 
-EventScript_162911:: @ 8162911
-	msgbox gUnknown_8178700
+PokemonLeague_AgathasRoom_EventScript_PostBattle:: @ 8162911
+	msgbox PokemonLeague_AgathasRoom_Text_PostBattle
 	release
 	end
 
-EventScript_16291B:: @ 816291B
+PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha:: @ 816291B
 	setflag FLAG_DEFEATED_AGATHA
-	call EventScript_1A7506
-	msgbox gUnknown_8178700
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_AgathasRoom_Text_PostBattle
 	release
 	end
diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc
index 8a29f185d..06a8af142 100644
--- a/data/maps/PokemonLeague_AgathasRoom/text.inc
+++ b/data/maps/PokemonLeague_AgathasRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817844D:: @ 817844D
+PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D
     .string "I am AGATHA of the ELITE FOUR.\p"
     .string "I hear OAK's taken a lot of\n"
     .string "interest in you, child.\p"
@@ -13,7 +13,7 @@ gUnknown_817844D:: @ 817844D
     .string "{PLAYER}! I'll show you how a real\n"
     .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_817858D:: @ 817858D
+PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D
     .string "I am AGATHA of the ELITE FOUR.\p"
     .string "You're the child that OAK's taken\n"
     .string "under his wing, aren't you?\p"
@@ -28,11 +28,11 @@ gUnknown_817858D:: @ 817858D
     .string "{PLAYER}! I'll show you how a real\n"
     .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_1786D7:: @ 81786D7
+PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7
     .string "Oh, my!\n"
     .string "You're something special, child!$"
 
-gUnknown_8178700:: @ 8178700
+PokemonLeague_AgathasRoom_Text_PostBattle:: @ 8178700
     .string "You win!\p"
     .string "I see what the old duff sees in\n"
     .string "you now.\p"
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
index 29e23f75c..a84a63e19 100644
--- a/data/maps/PokemonLeague_BrunosRoom/map.json
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_BrunosRoom_EventScript_1626EC",
+      "script": "PokemonLeague_BrunosRoom_EventScript_Bruno",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
index 709b5ab03..123c73f51 100644
--- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc
+++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
@@ -7,118 +7,116 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685
 
 PokemonLeague_BrunosRoom_OnResume:: @ 816269A
 	setvar VAR_0x8004, 1
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5
-	call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0
+	call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
-	call_if_eq EventScript_1626BA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry
 	end
 
-EventScript_1626BA:: @ 81626BA
-	call EventScript_1A759C
+PokemonLeague_BrunosRoom_EventScript_CloseEntry:: @ 81626BA
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_1626C0:: @ 81626C0
-	call EventScript_1A7538
+PokemonLeague_BrunosRoom_EventScript_SetDoorOpen:: @ 81626C0
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6
-	map_script_2 VAR_TEMP_1, 0, EventScript_1626D0
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_1626D0:: @ 81626D0
+PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: @ 81626D0
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_BrunosRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_1626DF:: @ 81626DF
+PokemonLeague_BrunosRoom_EventScript_EnterRoom:: @ 81626DF
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2
 	releaseall
 	end
 
-PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
+PokemonLeague_BrunosRoom_EventScript_Bruno:: @ 81626EC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779
+	goto_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_BRUNO, 0
 	famechecker FAMECHECKER_BRUNO, 1
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_1627B0
-
-EventScript_162750:: @ 8162750
+	goto PokemonLeague_BrunosRoom_EventScript_DefeatedBruno
 	end
 
-EventScript_162751:: @ 8162751
-	msgbox gUnknown_817820F
+PokemonLeague_BrunosRoom_EventScript_Intro:: @ 8162751
+	msgbox PokemonLeague_BrunosRoom_Text_Intro
 	return
 
-EventScript_16275A:: @ 816275A
-	msgbox gUnknown_817830C
+PokemonLeague_BrunosRoom_EventScript_RematchIntro:: @ 816275A
+	msgbox PokemonLeague_BrunosRoom_Text_RematchIntro
 	return
 
-EventScript_162763:: @ 8162763
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409
+PokemonLeague_BrunosRoom_EventScript_Battle:: @ 8162763
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, PokemonLeague_BrunosRoom_Text_Defeat
 	return
 
-EventScript_16276E:: @ 816276E
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409
+PokemonLeague_BrunosRoom_EventScript_Rematch:: @ 816276E
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, PokemonLeague_BrunosRoom_Text_Defeat
 	return
 
-EventScript_162779:: @ 8162779
-	msgbox gUnknown_8178420
+PokemonLeague_BrunosRoom_EventScript_PostBattle:: @ 8162779
+	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1627FA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1627EF
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 
-EventScript_1627B0:: @ 81627B0
+PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0
 	setflag FLAG_DEFEATED_BRUNO
-	call EventScript_1A7506
-	msgbox gUnknown_8178420
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1627FA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1627EF
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 
-EventScript_1627EF:: @ 81627EF
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: @ 81627EF
 	applymovement 1, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_1627FA:: @ 81627FA
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: @ 81627FA
 	applymovement 1, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_162805:: @ 8162805
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: @ 8162805
 	applymovement 1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc
index 57c66a96b..4c6cb4561 100644
--- a/data/maps/PokemonLeague_BrunosRoom/text.inc
+++ b/data/maps/PokemonLeague_BrunosRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817820F:: @ 817820F
+PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F
     .string "I am BRUNO of the ELITE FOUR!\p"
     .string "Through rigorous training, people\n"
     .string "and POKéMON can become stronger\l"
@@ -11,7 +11,7 @@ gUnknown_817820F:: @ 817820F
     .string "superior power!\p"
     .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_817830C:: @ 817830C
+PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C
     .string "I am BRUNO of the ELITE FOUR!\p"
     .string "Through rigorous training, people\n"
     .string "and POKéMON can become stronger\l"
@@ -24,11 +24,11 @@ gUnknown_817830C:: @ 817830C
     .string "superior power!\p"
     .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178409:: @ 8178409
+PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409
     .string "Why?\n"
     .string "How could I lose?$"
 
-gUnknown_8178420:: @ 8178420
+PokemonLeague_BrunosRoom_Text_PostBattle:: @ 8178420
     .string "My job is done.\n"
     .string "Go face your next challenge.$"
 
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
index bf0283a1f..2821da205 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_RIVAL,    1
+.equ LOCALID_PROF_OAK, 2
+
 PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp
 	map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume
@@ -6,91 +9,91 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
 
 PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2
 	setvar VAR_0x8004, 4
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162B1E
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162B31
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162B44
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
 	end
 
-EventScript_162B1E:: @ 8162B1E
-	goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle:: @ 8162B1E
+	goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B31:: @ 8162B31
-	goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur:: @ 8162B31
+	goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B44:: @ 8162B44
-	goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander:: @ 8162B44
+	goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B57:: @ 8162B57
+PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger:: @ 8162B57
 	setvar VAR_TEMP_1, 1
 	return
 
 PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D
-	map_script_2 VAR_TEMP_1, 0, EventScript_162B67
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_162B67:: @ 8162B67
+PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: @ 8162B67
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C
-	map_script_2 VAR_TEMP_1, 0, EventScript_162B76
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162B76:: @ 8162B76
+PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76
 	lockall
 	textcolor 0
 	setflag FLAG_TEMP_2
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
 	waitmovement 0
 	delay 20
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC
-	goto_if_questlog EventScript_162C68
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_RematchIntro
+	goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
 	savebgm MUS_WIN_GYM
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch
 	setflag FLAG_TEMP_4
 	clearflag FLAG_TEMP_5
 	setflag FLAG_DEFEATED_CHAMP
 	setflag FLAG_TEMP_4
-	msgbox gUnknown_8178F2F
+	msgbox PokemonLeague_ChampionsRoom_Text_PostBattle
 	playbgm MUS_SLOWMASARA, 0
-	addobject 2
-	msgbox gUnknown_8178FC6
+	addobject LOCALID_PROF_OAK
+	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F
-	applymovement 1, Movement_162D41
-	applymovement 2, Movement_162D2A
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
+	applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
+	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
 	waitmovement 0
 	delay 25
 	specialvar VAR_RESULT, ScrSpecial_GetStarter
 	getspeciesname 0, VAR_RESULT
-	msgbox gUnknown_8178FCF
-	applymovement 2, Movement_WalkInPlaceFastestRight
-	applymovement 1, Movement_WalkInPlaceFastestLeft
+	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
+	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox gUnknown_817908F
+	msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
 	closemessage
-	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 20
-	msgbox gUnknown_81791A3
+	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
 	closemessage
 	delay 13
-	applymovement 2, Movement_162D37
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12
+	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
@@ -98,62 +101,62 @@ EventScript_162B76:: @ 8162B76
 	releaseall
 	end
 
-EventScript_162C68:: @ 8162C68
-	call EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd:: @ 8162C68
+	call PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	releaseall
 	end
 
-EventScript_162C6F:: @ 8162C6F
+PokemonLeague_ChampionsRoom_EventScript_Battle:: @ 8162C6F
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162CC5
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162CD0
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162CDB
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
 	return
 
-EventScript_162C91:: @ 8162C91
+PokemonLeague_ChampionsRoom_EventScript_Rematch:: @ 8162C91
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162CE6
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162CF1
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162CFC
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
 	return
 
-EventScript_162CB3:: @ 8162CB3
-	msgbox gUnknown_8178B6C
+PokemonLeague_ChampionsRoom_EventScript_Intro:: @ 8162CB3
+	msgbox PokemonLeague_ChampionsRoom_Text_Intro
 	return
 
-EventScript_162CBC:: @ 8162CBC
-	msgbox gUnknown_8178CD4
+PokemonLeague_ChampionsRoom_EventScript_RematchIntro:: @ 8162CBC
+	msgbox PokemonLeague_ChampionsRoom_Text_RematchIntro
 	return
 
-EventScript_162CC5:: @ 8162CC5
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle:: @ 8162CC5
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CD0:: @ 8162CD0
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur:: @ 8162CD0
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CDB:: @ 8162CDB
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleCharmander:: @ 8162CDB
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CE6:: @ 8162CE6
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle:: @ 8162CE6
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CF1:: @ 8162CF1
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur:: @ 8162CF1
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CFC:: @ 8162CFC
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchCharmander:: @ 8162CFC
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-Movement_162D07:: @ 8162D07
+PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: @ 8162D07
 	walk_up
 	walk_up
 	walk_up
@@ -166,7 +169,7 @@ Movement_162D07:: @ 8162D07
 	walk_up
 	step_end
 
-Movement_162D12:: @ 8162D12
+PokemonLeague_ChampionsRoom_Movement_PlayerExit:: @ 8162D12
 	delay_16
 	walk_left
 	walk_up
@@ -181,7 +184,7 @@ Movement_162D12:: @ 8162D12
 	set_invisible
 	step_end
 
-Movement_162D1F:: @ 8162D1F
+PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: @ 8162D1F
 	delay_8
 	walk_in_place_fastest_down
 	delay_16
@@ -194,7 +197,7 @@ Movement_162D1F:: @ 8162D1F
 	walk_in_place_fastest_left
 	step_end
 
-Movement_162D2A:: @ 8162D2A
+PokemonLeague_ChampionsRoom_Movement_OakEnter:: @ 8162D2A
 	delay_16
 	delay_16
 	walk_up
@@ -209,7 +212,7 @@ Movement_162D2A:: @ 8162D2A
 	delay_16
 	step_end
 
-Movement_162D37:: @ 8162D37
+PokemonLeague_ChampionsRoom_Movement_OakExit:: @ 8162D37
 	walk_up
 	walk_up
 	walk_right
@@ -221,7 +224,7 @@ Movement_162D37:: @ 8162D37
 	set_invisible
 	step_end
 
-Movement_162D41:: @ 8162D41
+PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: @ 8162D41
 	delay_16
 	delay_16
 	delay_16
diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc
index a99db09db..19ba16fa3 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/text.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8178B6C:: @ 8178B6C
+PokemonLeague_ChampionsRoom_Text_Intro:: @ 8178B6C
     .string "{RIVAL}: Hey, {PLAYER}!\p"
     .string "I was looking forward to seeing\n"
     .string "you, {PLAYER}.\p"
@@ -16,7 +16,7 @@ gUnknown_8178B6C:: @ 8178B6C
     .string "I am the most powerful TRAINER in\n"
     .string "the world!$"
 
-gUnknown_8178CD4:: @ 8178CD4
+PokemonLeague_ChampionsRoom_Text_RematchIntro:: @ 8178CD4
     .string "{RIVAL}: Hey, {PLAYER}!\p"
     .string "You came back, {PLAYER}!\n"
     .string "Hahah, that is so great!\p"
@@ -34,7 +34,7 @@ gUnknown_8178CD4:: @ 8178CD4
     .string "I am the most powerful TRAINER in\n"
     .string "the world!$"
 
-Text_178E3F:: @ 8178E3F
+PokemonLeague_ChampionsRoom_Text_Defeat:: @ 8178E3F
     .string "NO!\n"
     .string "That can't be!\l"
     .string "You beat me at my best!\p"
@@ -43,7 +43,7 @@ Text_178E3F:: @ 8178E3F
     .string "My reign is over already?\n"
     .string "It's not fair!$"
 
-Text_178EC3:: @ 8178EC3
+PokemonLeague_ChampionsRoom_Text_Victory:: @ 8178EC3
     .string "はーはッ！\n"
     .string "かった！　かった！　かった！\p"
     .string "{PLAYER}に　まける　ような\n"
@@ -54,7 +54,7 @@ Text_178EC3:: @ 8178EC3
     .string "ほめて　つかわす！\n"
     .string "はーッ！　はーはッはッ！$"
 
-gUnknown_8178F2F:: @ 8178F2F
+PokemonLeague_ChampionsRoom_Text_PostBattle:: @ 8178F2F
     .string "Why?\n"
     .string "Why did I lose?\p"
     .string "I never made any mistakes raising\n"
@@ -63,10 +63,10 @@ gUnknown_8178F2F:: @ 8178F2F
     .string "LEAGUE CHAMPION!\p"
     .string "Although I don't like to admit it…$"
 
-gUnknown_8178FC6:: @ 8178FC6
+PokemonLeague_ChampionsRoom_Text_OakPlayer:: @ 8178FC6
     .string "OAK: {PLAYER}!$"
 
-gUnknown_8178FCF:: @ 8178FCF
+PokemonLeague_ChampionsRoom_Text_OakCongratulations:: @ 8178FCF
     .string "OAK: So, you've won!\n"
     .string "Sincerely, congratulations!\p"
     .string "You're the new POKéMON LEAGUE\n"
@@ -76,7 +76,7 @@ gUnknown_8178FCF:: @ 8178FCF
     .string "on the POKéDEX.\p"
     .string "{PLAYER}, you have come of age!$"
 
-gUnknown_817908F:: @ 817908F
+PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: @ 817908F
     .string "OAK: {RIVAL}…\n"
     .string "I'm disappointed in you.\p"
     .string "I came when I heard you'd beaten\n"
@@ -90,7 +90,7 @@ gUnknown_817908F:: @ 817908F
     .string "Without them, you will never\n"
     .string "become a CHAMP again!$"
 
-gUnknown_81791A3:: @ 81791A3
+PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe:: @ 81791A3
     .string "OAK: {PLAYER}.\p"
     .string "You understand that your victory\n"
     .string "was not just your own doing.\p"
diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc
index 080e65ece..de838a669 100644
--- a/data/maps/PokemonLeague_HallOfFame/scripts.inc
+++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc
@@ -12,26 +12,26 @@ EventScript_162D61:: @ 8162D61
 	end
 
 PokemonLeague_HallOfFame_OnFrame:: @ 8162D66
-	map_script_2 VAR_TEMP_1, 0, EventScript_162D70
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162D70:: @ 8162D70
+PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70
 	lockall
 	textcolor 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
 	waitmovement 0
 	applymovement 1, Movement_WalkInPlaceFastestLeft
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	msgbox gUnknown_817922F
+	msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
 	closemessage
 	applymovement 1, Movement_WalkInPlaceFastestUp
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	dofieldeffect 62
-	waitfieldeffect 62
+	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
+	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
 	call EventScript_1A651A
@@ -42,7 +42,7 @@ EventScript_162D70:: @ 8162D70
 	releaseall
 	end
 
-Movement_162DCD:: @ 8162DCD
+PokemonLeague_HallOfFame_Movement_EnterRoom:: @ 8162DCD
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc
index 111f655cc..a5bc2e47a 100644
--- a/data/maps/PokemonLeague_HallOfFame/text.inc
+++ b/data/maps/PokemonLeague_HallOfFame/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817922F:: @ 817922F
+PokemonLeague_HallOfFame_Text_OakCongratulations:: @ 817922F
     .string "OAK: Er-hem!\n"
     .string "Congratulations, {PLAYER}!\p"
     .string "This floor is the POKéMON HALL OF\n"
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
index 3e9571b83..47f3651e5 100644
--- a/data/maps/PokemonLeague_LancesRoom/map.json
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_LancesRoom_EventScript_162A14",
+      "script": "PokemonLeague_LancesRoom_EventScript_Lance",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc
index 56619200c..2328a777c 100644
--- a/data/maps/PokemonLeague_LancesRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc
@@ -7,41 +7,41 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D
 
 PokemonLeague_LancesRoom_OnResume:: @ 8162942
 	setvar VAR_0x8004, 3
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_LancesRoom_OnLoad:: @ 816294D
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
-	call_if_eq EventScript_162962
-	call_if_set FLAG_DEFEATED_LANCE, EventScript_162968
+	call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry
+	call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen
 	end
 
-EventScript_162962:: @ 8162962
-	call EventScript_1629A8
+PokemonLeague_LancesRoom_EventScript_CloseEntry:: @ 8162962
+	call PokemonLeague_LancesRoom_EventScript_SetEntryClosed
 	return
 
-EventScript_162968:: @ 8162968
-	call EventScript_1A7589
+PokemonLeague_LancesRoom_EventScript_SetDoorOpen:: @ 8162968
+	call PokemonLeague_EventScript_SetDoorOpenLance
 	return
 
 PokemonLeague_LancesRoom_OnWarp:: @ 816296E
-	map_script_2 VAR_TEMP_1, 0, EventScript_162978
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_162978:: @ 8162978
+PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: @ 8162978
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_LancesRoom_OnFrame:: @ 816297D
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_LancesRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162987:: @ 8162987
+PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor
 	waitmovement 0
 	setflag FLAG_TEMP_2
-	call EventScript_1629A8
+	call PokemonLeague_LancesRoom_EventScript_SetEntryClosed
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -49,18 +49,18 @@ EventScript_162987:: @ 8162987
 	releaseall
 	end
 
-EventScript_1629A8:: @ 81629A8
-	setmetatile 5, 14, 669, 1
-	setmetatile 6, 14, 670, 1
-	setmetatile 7, 14, 671, 1
-	setmetatile 5, 15, 677, 1
-	setmetatile 6, 15, 678, 1
-	setmetatile 7, 15, 679, 1
-	setmetatile 6, 16, 785, 0
-	setmetatile 7, 16, 785, 0
+PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: @ 81629A8
+	setmetatile 5, 14, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1
+	setmetatile 6, 14, METATILE_PokemonLeague_Entry_TopMid_Closed, 1
+	setmetatile 7, 14, METATILE_PokemonLeague_Entry_TopRight_Closed, 1
+	setmetatile 5, 15, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1
+	setmetatile 6, 15, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1
+	setmetatile 7, 15, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1
+	setmetatile 6, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0
+	setmetatile 7, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0
 	return
 
-Movement_1629F1:: @ 81629F1
+PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: @ 81629F1
 	walk_up
 	walk_up
 	walk_left
@@ -97,72 +97,70 @@ Movement_1629F1:: @ 81629F1
 	walk_up
 	step_end
 
-PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
+PokemonLeague_LancesRoom_EventScript_Lance:: @ 8162A14
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1
+	goto_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_LANCE, 0
 	famechecker FAMECHECKER_LANCE, 1
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_162AAB
-
-EventScript_162A78:: @ 8162A78
+	goto PokemonLeague_LancesRoom_EventScript_DefeatedLance
 	end
 
-EventScript_162A79:: @ 8162A79
-	msgbox gUnknown_8178764
+PokemonLeague_LancesRoom_EventScript_Intro:: @ 8162A79
+	msgbox PokemonLeague_LancesRoom_Text_Intro
 	return
 
-EventScript_162A82:: @ 8162A82
-	msgbox gUnknown_81788BD
+PokemonLeague_LancesRoom_EventScript_RematchIntro:: @ 8162A82
+	msgbox PokemonLeague_LancesRoom_Text_RematchIntro
 	return
 
-EventScript_162A8B:: @ 8162A8B
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15
+PokemonLeague_LancesRoom_EventScript_Battle:: @ 8162A8B
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, PokemonLeague_LancesRoom_Text_Defeat
 	return
 
-EventScript_162A96:: @ 8162A96
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15
+PokemonLeague_LancesRoom_EventScript_Rematch:: @ 8162A96
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, PokemonLeague_LancesRoom_Text_Defeat
 	return
 
-EventScript_162AA1:: @ 8162AA1
-	msgbox gUnknown_8178A52
+PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1
+	msgbox PokemonLeague_LancesRoom_Text_PostBattle
 	release
 	end
 
-EventScript_162AAB:: @ 8162AAB
+PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB
 	setvar VAR_0x8004, 0
 	special Special_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_LANCE
-	call EventScript_1A7563
-	msgbox gUnknown_8178A52
+	call PokemonLeague_EventScript_OpenDoorLance
+	msgbox PokemonLeague_LancesRoom_Text_PostBattle
 	closemessage
 	release
 	end
 
-EventScript_162AC6:: @ 8162AC6
-	applymovement 1, Movement_162ADC
+PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: @ 8162AC6
+	applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft
 	waitmovement 0
 	return
 
-EventScript_162AD1:: @ 8162AD1
-	applymovement 1, Movement_162ADF
+PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: @ 8162AD1
+	applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight
 	waitmovement 0
 	return
 
-Movement_162ADC:: @ 8162ADC
+PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: @ 8162ADC
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Movement_162ADF:: @ 8162ADF
+PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: @ 8162ADF
 	walk_right
 	walk_in_place_fastest_left
 	step_end
diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc
index 9565fd4d5..8c726875a 100644
--- a/data/maps/PokemonLeague_LancesRoom/text.inc
+++ b/data/maps/PokemonLeague_LancesRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8178764:: @ 8178764
+PokemonLeague_LancesRoom_Text_Intro:: @ 8178764
     .string "Ah! I've heard about you,\n"
     .string "{PLAYER}!\p"
     .string "I lead the ELITE FOUR.\p"
@@ -14,7 +14,7 @@ gUnknown_8178764:: @ 8178764
     .string "Your LEAGUE challenge ends with\n"
     .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_81788BD:: @ 81788BD
+PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD
     .string "Ah!\n"
     .string "So, you've returned, {PLAYER}!\p"
     .string "I lead the ELITE FOUR.\p"
@@ -30,12 +30,12 @@ gUnknown_81788BD:: @ 81788BD
     .string "Your LEAGUE challenge ends with\n"
     .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178A15:: @ 8178A15
+PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15
     .string "That's it!\p"
     .string "I hate to admit it, but you are a\n"
     .string "POKéMON master!$"
 
-gUnknown_8178A52:: @ 8178A52
+PokemonLeague_LancesRoom_Text_PostBattle:: @ 8178A52
     .string "I still can't believe my dragons\n"
     .string "lost to you, {PLAYER}.\p"
     .string "You are now the POKéMON LEAGUE\n"
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
index 6801df803..f33c2a35b 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/map.json
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC",
+      "script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
index e95ecfd98..422029153 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
@@ -8,21 +8,21 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C
 
 PokemonLeague_LoreleisRoom_OnResume:: @ 8162586
 	setvar VAR_0x8004, 0
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591
-	call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC
+	call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
-	call_if_eq EventScript_1625A6
+	call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry
 	end
 
-EventScript_1625A6:: @ 81625A6
-	call EventScript_1A759C
+PokemonLeague_LoreleisRoom_EventScript_CloseEntry:: @ 81625A6
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_1625AC:: @ 81625AC
-	call EventScript_1A7538
+PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen:: @ 81625AC
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2
@@ -30,67 +30,65 @@ PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2
 	end
 
 PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6
-	map_script_2 VAR_TEMP_1, 0, EventScript_1625C0
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_1625C0:: @ 81625C0
+PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: @ 81625C0
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, PokemonLeague_LoreleisRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_1625CF:: @ 81625CF
+PokemonLeague_LoreleisRoom_EventScript_EnterRoom:: @ 81625CF
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1
 	releaseall
 	end
 
-PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
+PokemonLeague_LoreleisRoom_EventScript_Lorelei:: @ 81625DC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669
+	goto_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_LORELEI, 0
 	famechecker FAMECHECKER_LORELEI, 1
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Intro
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_162673
-
-EventScript_162640:: @ 8162640
+	goto PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei
 	end
 
-EventScript_162641:: @ 8162641
-	msgbox gUnknown_8177FA4
+PokemonLeague_LoreleisRoom_EventScript_Intro:: @ 8162641
+	msgbox PokemonLeague_LoreleisRoom_Text_Intro
 	return
 
-EventScript_16264A:: @ 816264A
-	msgbox gUnknown_8178089
+PokemonLeague_LoreleisRoom_EventScript_RematchIntro:: @ 816264A
+	msgbox PokemonLeague_LoreleisRoom_Text_RematchIntro
 	return
 
-EventScript_162653:: @ 8162653
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191
+PokemonLeague_LoreleisRoom_EventScript_Battle:: @ 8162653
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, PokemonLeague_LoreleisRoom_Text_Defeat
 	return
 
-EventScript_16265E:: @ 816265E
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191
+PokemonLeague_LoreleisRoom_EventScript_Rematch:: @ 816265E
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, PokemonLeague_LoreleisRoom_Text_Defeat
 	return
 
-EventScript_162669:: @ 8162669
-	msgbox gUnknown_81781B0
+PokemonLeague_LoreleisRoom_EventScript_PostBattle:: @ 8162669
+	msgbox PokemonLeague_LoreleisRoom_Text_PostBattle
 	release
 	end
 
-EventScript_162673:: @ 8162673
+PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei:: @ 8162673
 	setflag FLAG_DEFEATED_LORELEI
-	call EventScript_1A7506
-	msgbox gUnknown_81781B0
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_LoreleisRoom_Text_PostBattle
 	release
 	end
diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc
index 9619ab86b..55e67d764 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/text.inc
+++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8177FA4:: @ 8177FA4
+PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4
     .string "Welcome to the POKéMON LEAGUE.\p"
     .string "I am LORELEI of the ELITE FOUR.\p"
     .string "No one can best me when it comes\n"
@@ -9,7 +9,7 @@ gUnknown_8177FA4:: @ 8177FA4
     .string "Hahaha!\n"
     .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_8178089:: @ 8178089
+PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089
     .string "Welcome to the POKéMON LEAGUE.\p"
     .string "I, LORELEI of the ELITE FOUR,\n"
     .string "have returned!\p"
@@ -22,10 +22,10 @@ gUnknown_8178089:: @ 8178089
     .string "Hahaha!\n"
     .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178191:: @ 8178191
+PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191
     .string "…Things shouldn't be this way!$"
 
-gUnknown_81781B0:: @ 81781B0
+PokemonLeague_LoreleisRoom_Text_PostBattle:: @ 81781B0
     .string "You're better than I thought.\n"
     .string "Go on ahead.\p"
     .string "You only got a taste of the\n"
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index 652ffd20b..6ea519092 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index bc8f10848..a3a9c556e 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index 1e4af29e2..9c0423004 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index 458740163..eea10cb2c 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/Prototype_SeviiIsle_6/map.json
index 25d12e137..3cc89f9f0 100644
--- a/data/maps/UnknownMap_03_50/map.json
+++ b/data/maps/Prototype_SeviiIsle_6/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_50",
-  "name": "UnknownMap_03_50",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_6",
+  "name": "Prototype_SeviiIsle_6",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_6",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc
new file mode 100644
index 000000000..459729f14
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_6_MapScripts:: @ 81687E0
+	.byte 0
diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/Prototype_SeviiIsle_7/map.json
index 25c135de4..67a37d7e7 100644
--- a/data/maps/UnknownMap_03_51/map.json
+++ b/data/maps/Prototype_SeviiIsle_7/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_51",
-  "name": "UnknownMap_03_51",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_7",
+  "name": "Prototype_SeviiIsle_7",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_7",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc
new file mode 100644
index 000000000..b7eaa6bd5
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_7_MapScripts:: @ 81687E1
+	.byte 0
diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/Prototype_SeviiIsle_8/map.json
index e38359999..0ed21e3f2 100644
--- a/data/maps/UnknownMap_03_52/map.json
+++ b/data/maps/Prototype_SeviiIsle_8/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_52",
-  "name": "UnknownMap_03_52",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_8",
+  "name": "Prototype_SeviiIsle_8",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_8",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc
new file mode 100644
index 000000000..411a66513
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_8_MapScripts:: @ 81687E2
+	.byte 0
diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/Prototype_SeviiIsle_9/map.json
index e3001e6be..1fa4c73c4 100644
--- a/data/maps/UnknownMap_03_53/map.json
+++ b/data/maps/Prototype_SeviiIsle_9/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_53",
-  "name": "UnknownMap_03_53",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_9",
+  "name": "Prototype_SeviiIsle_9",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_9",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc
new file mode 100644
index 000000000..00b06c7f0
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_9_MapScripts:: @ 81687E3
+	.byte 0
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index c365ad26e..6dd117e8a 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_1F_EventScript_162E73",
+      "script": "RockTunnel_1F_EventScript_Dana",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E5C",
+      "script": "RockTunnel_1F_EventScript_Ariana",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "RockTunnel_1F_EventScript_162E45",
+      "script": "RockTunnel_1F_EventScript_Leah",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E17",
+      "script": "RockTunnel_1F_EventScript_Lucas",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E00",
+      "script": "RockTunnel_1F_EventScript_Oliver",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162DE9",
+      "script": "RockTunnel_1F_EventScript_Lenny",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_1F_EventScript_162E2E",
+      "script": "RockTunnel_1F_EventScript_Ashton",
       "flag": "0"
     },
     {
@@ -195,7 +195,7 @@
       "x": 14,
       "y": 33,
       "elevation": 3,
-      "script": "RockTunnel_1F_EventScript_162DE0"
+      "script": "RockTunnel_1F_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc
index 49daa21a7..f18e0cd3e 100644
--- a/data/maps/RockTunnel_1F/scripts.inc
+++ b/data/maps/RockTunnel_1F/scripts.inc
@@ -6,41 +6,41 @@ RockTunnel_1F_OnTransition:: @ 8162DDC
 	setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F
 	end
 
-RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
-	msgbox gUnknown_817962D, MSGBOX_SIGN
+RockTunnel_1F_EventScript_RouteSign:: @ 8162DE0
+	msgbox RockTunnel_1F_Text_RouteSign, MSGBOX_SIGN
 	end
 
-RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
-	trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388
-	msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Lenny:: @ 8162DE9
+	trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat
+	msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E00:: @ 8162E00
-	trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E
-	msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Oliver:: @ 8162E00
+	trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat
+	msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E17:: @ 8162E17
-	trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC
-	msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Lucas:: @ 8162E17
+	trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat
+	msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
-	trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE
-	msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Ashton:: @ 8162E2E
+	trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat
+	msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E45:: @ 8162E45
-	trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547
-	msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Leah:: @ 8162E45
+	trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat
+	msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
-	trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604
-	msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Ariana:: @ 8162E5C
+	trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat
+	msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E73:: @ 8162E73
-	trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1
-	msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Dana:: @ 8162E73
+	trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat
+	msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc
index 56bc4ecbe..162e20f7d 100644
--- a/data/maps/RockTunnel_1F/text.inc
+++ b/data/maps/RockTunnel_1F/text.inc
@@ -1,83 +1,83 @@
-Text_179366:: @ 8179366
+RockTunnel_1F_Text_LennyIntro:: @ 8179366
     .string "This tunnel goes a long way, kid!$"
 
-Text_179388:: @ 8179388
+RockTunnel_1F_Text_LennyDefeat:: @ 8179388
     .string "Doh!\n"
     .string "You win!$"
 
-gUnknown_8179396:: @ 8179396
+RockTunnel_1F_Text_LennyPostBattle:: @ 8179396
     .string "Watch for ONIX.\n"
     .string "They appear only occasionally.\p"
     .string "High-level ones can put the\n"
     .string "squeeze on you!$"
 
-Text_1793F1:: @ 81793F1
+RockTunnel_1F_Text_OliverIntro:: @ 81793F1
     .string "Hmm.\n"
     .string "Maybe I'm lost in here…$"
 
-Text_17940E:: @ 817940E
+RockTunnel_1F_Text_OliverDefeat:: @ 817940E
     .string "Ease up!\n"
     .string "What am I doing?\l"
     .string "Which way is out?$"
 
-gUnknown_817943A:: @ 817943A
+RockTunnel_1F_Text_OliverPostBattle:: @ 817943A
     .string "That sleeping POKéMON on ROUTE 12\n"
     .string "forced me to take this detour.$"
 
-Text_17947B:: @ 817947B
+RockTunnel_1F_Text_LucasIntro:: @ 817947B
     .string "Outsiders like you need to show me\n"
     .string "some respect!$"
 
-Text_1794AC:: @ 81794AC
+RockTunnel_1F_Text_LucasDefeat:: @ 81794AC
     .string "I give!$"
 
-gUnknown_81794B4:: @ 81794B4
+RockTunnel_1F_Text_LucasPostBattle:: @ 81794B4
     .string "You're talented enough to hike!$"
 
-Text_1794D4:: @ 81794D4
+RockTunnel_1F_Text_AshtonIntro:: @ 81794D4
     .string "POKéMON fight!\n"
     .string "Ready, go!$"
 
-Text_1794EE:: @ 81794EE
+RockTunnel_1F_Text_AshtonDefeat:: @ 81794EE
     .string "Game over!$"
 
-gUnknown_81794F9:: @ 81794F9
+RockTunnel_1F_Text_AshtonPostBattle:: @ 81794F9
     .string "Oh well, I'll get a ZUBAT as I go!$"
 
-Text_17951C:: @ 817951C
+RockTunnel_1F_Text_LeahIntro:: @ 817951C
     .string "Eek!\p"
     .string "Don't try anything funny in the\n"
     .string "dark!$"
 
-Text_179547:: @ 8179547
+RockTunnel_1F_Text_LeahDefeat:: @ 8179547
     .string "It was too dark…$"
 
-gUnknown_8179558:: @ 8179558
+RockTunnel_1F_Text_LeahPostBattle:: @ 8179558
     .string "I saw a MACHOP in this tunnel.$"
 
-Text_179577:: @ 8179577
+RockTunnel_1F_Text_DanaIntro:: @ 8179577
     .string "I came this far looking for wild\n"
     .string "POKéMON.$"
 
-Text_1795A1:: @ 81795A1
+RockTunnel_1F_Text_DanaDefeat:: @ 81795A1
     .string "I'm out of POKéMON!$"
 
-gUnknown_81795B5:: @ 81795B5
+RockTunnel_1F_Text_DanaPostBattle:: @ 81795B5
     .string "You looked cute and harmless.\n"
     .string "Was I ever wrong!$"
 
-Text_1795E5:: @ 81795E5
+RockTunnel_1F_Text_ArianaIntro:: @ 81795E5
     .string "You have POKéMON!\n"
     .string "Let's start!$"
 
-Text_179604:: @ 8179604
+RockTunnel_1F_Text_ArianaDefeat:: @ 8179604
     .string "You play hard!$"
 
-gUnknown_8179613:: @ 8179613
+RockTunnel_1F_Text_ArianaPostBattle:: @ 8179613
     .string "Whew!\n"
     .string "I'm all sweaty now.$"
 
-gUnknown_817962D:: @ 817962D
+RockTunnel_1F_Text_RouteSign:: @ 817962D
     .string "ROCK TUNNEL\n"
     .string "CERULEAN CITY - LAVENDER TOWN$"
 
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index bbd3f59a7..b680bf4a1 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RockTunnel_B1F_EventScript_162EFE",
+      "script": "RockTunnel_B1F_EventScript_Cooper",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162EB9",
+      "script": "RockTunnel_B1F_EventScript_Dudley",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162E8B",
+      "script": "RockTunnel_B1F_EventScript_Sofia",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162ED0",
+      "script": "RockTunnel_B1F_EventScript_Allen",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162EE7",
+      "script": "RockTunnel_B1F_EventScript_Eric",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162F15",
+      "script": "RockTunnel_B1F_EventScript_Steve",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RockTunnel_B1F_EventScript_162EA2",
+      "script": "RockTunnel_B1F_EventScript_Martha",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162F2C",
+      "script": "RockTunnel_B1F_EventScript_Winston",
       "flag": "0"
     },
     {
diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc
index e2c34b53e..54d0e8153 100644
--- a/data/maps/RockTunnel_B1F/scripts.inc
+++ b/data/maps/RockTunnel_B1F/scripts.inc
@@ -1,42 +1,42 @@
 RockTunnel_B1F_MapScripts:: @ 8162E8A
 	.byte 0
 
-RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
-	trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9
-	msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Sofia:: @ 8162E8B
+	trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat
+	msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
-	trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD
-	msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Martha:: @ 8162EA2
+	trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat
+	msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
-	trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700
-	msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Dudley:: @ 8162EB9
+	trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat
+	msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
-	trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856
-	msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Allen:: @ 8162ED0
+	trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat
+	msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
-	trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932
-	msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Eric:: @ 8162EE7
+	trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat
+	msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
-	trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F
-	msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Cooper:: @ 8162EFE
+	trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat
+	msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162F15:: @ 8162F15
-	trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB
-	msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Steve:: @ 8162F15
+	trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat
+	msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
-	trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997
-	msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Winston:: @ 8162F2C
+	trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat
+	msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc
index b82f09657..1bf86a5eb 100644
--- a/data/maps/RockTunnel_B1F/text.inc
+++ b/data/maps/RockTunnel_B1F/text.inc
@@ -1,95 +1,95 @@
-Text_179657:: @ 8179657
+RockTunnel_B1F_Text_SofiaIntro:: @ 8179657
     .string "Do you know how you can avoid\n"
     .string "getting lost in the mountains?\p"
     .string "You can bend twigs as trail\n"
     .string "markers.$"
 
-Text_1796B9:: @ 81796B9
+RockTunnel_B1F_Text_SofiaDefeat:: @ 81796B9
     .string "Ohhh!\n"
     .string "I did my best!$"
 
-gUnknown_81796CE:: @ 81796CE
+RockTunnel_B1F_Text_SofiaPostBattle:: @ 81796CE
     .string "I want to go home!$"
 
-Text_1796E1:: @ 81796E1
+RockTunnel_B1F_Text_DudleyIntro:: @ 81796E1
     .string "Hahaha!\n"
     .string "Can you beat my power?$"
 
-Text_179700:: @ 8179700
+RockTunnel_B1F_Text_DudleyDefeat:: @ 8179700
     .string "Oops!\n"
     .string "Outmuscled!$"
 
-gUnknown_8179712:: @ 8179712
+RockTunnel_B1F_Text_DudleyPostBattle:: @ 8179712
     .string "I go for power because I hate\n"
     .string "thinking.$"
 
-Text_17973A:: @ 817973A
+RockTunnel_B1F_Text_CooperIntro:: @ 817973A
     .string "You have a POKéDEX?\n"
     .string "I want one, too.$"
 
-Text_17975F:: @ 817975F
+RockTunnel_B1F_Text_CooperDefeat:: @ 817975F
     .string "Shoot!\n"
     .string "I am so jealous!$"
 
-gUnknown_8179777:: @ 8179777
+RockTunnel_B1F_Text_CooperPostBattle:: @ 8179777
     .string "When you finish your POKéDEX,\n"
     .string "can I have it?$"
 
-Text_1797A4:: @ 81797A4
+RockTunnel_B1F_Text_SteveIntro:: @ 81797A4
     .string "Um… Do you know about POKéMON\n"
     .string "cosplay?$"
 
-Text_1797CB:: @ 81797CB
+RockTunnel_B1F_Text_SteveDefeat:: @ 81797CB
     .string "Well, that's that.$"
 
-gUnknown_81797DE:: @ 81797DE
+RockTunnel_B1F_Text_StevePostBattle:: @ 81797DE
     .string "POKéMON cosplay is dressing up as\n"
     .string "POKéMON for fun.\p"
     .string "CLEFAIRY is a favorite.$"
 
-Text_179829:: @ 8179829
+RockTunnel_B1F_Text_AllenIntro:: @ 8179829
     .string "My POKéMON techniques will leave\n"
     .string "you crying!$"
 
-Text_179856:: @ 8179856
+RockTunnel_B1F_Text_AllenDefeat:: @ 8179856
     .string "I give!\n"
     .string "You're a better technician!$"
 
-gUnknown_817987A:: @ 817987A
+RockTunnel_B1F_Text_AllenPostBattle:: @ 817987A
     .string "In mountains, you'll often find\n"
     .string "ROCK-type POKéMON.$"
 
-Text_1798AD:: @ 81798AD
+RockTunnel_B1F_Text_MarthaIntro:: @ 81798AD
     .string "I don't often come here, but I will\n"
     .string "battle you.$"
 
-Text_1798DD:: @ 81798DD
+RockTunnel_B1F_Text_MarthaDefeat:: @ 81798DD
     .string "Oh!\n"
     .string "I lost!$"
 
-gUnknown_81798E9:: @ 81798E9
+RockTunnel_B1F_Text_MarthaPostBattle:: @ 81798E9
     .string "I like tiny POKéMON.\n"
     .string "Big ones are too scary!$"
 
-Text_179916:: @ 8179916
+RockTunnel_B1F_Text_EricIntro:: @ 8179916
     .string "Hit me with your best shot!$"
 
-Text_179932:: @ 8179932
+RockTunnel_B1F_Text_EricDefeat:: @ 8179932
     .string "Fired away!$"
 
-gUnknown_817993E:: @ 817993E
+RockTunnel_B1F_Text_EricPostBattle:: @ 817993E
     .string "I'll raise my POKéMON to beat\n"
     .string "yours, kid.$"
 
-Text_179968:: @ 8179968
+RockTunnel_B1F_Text_WinstonIntro:: @ 8179968
     .string "I draw illustrations of POKéMON\n"
     .string "when I'm home.$"
 
-Text_179997:: @ 8179997
+RockTunnel_B1F_Text_WinstonDefeat:: @ 8179997
     .string "Whew…\n"
     .string "I'm exhausted…$"
 
-gUnknown_81799AC:: @ 81799AC
+RockTunnel_B1F_Text_WinstonPostBattle:: @ 81799AC
     .string "I'm an artist, not a fighter.\n"
     .string "I'll go home to draw.$"
 
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 586bf0f0d..4314d758f 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "RocketHideout_B1F_EventScript_1611C5",
+      "script": "RocketHideout_B1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B1F_EventScript_1611AE",
+      "script": "RocketHideout_B1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RocketHideout_B1F_EventScript_1611F3",
+      "script": "RocketHideout_B1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RocketHideout_B1F_EventScript_1611DC",
+      "script": "RocketHideout_B1F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RocketHideout_B1F_EventScript_16120A",
+      "script": "RocketHideout_B1F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc
index c27dd99f3..ac95862a2 100644
--- a/data/maps/RocketHideout_B1F/scripts.inc
+++ b/data/maps/RocketHideout_B1F/scripts.inc
@@ -4,60 +4,60 @@ RocketHideout_B1F_MapScripts:: @ 8161195
 	.byte 0
 
 RocketHideout_B1F_OnLoad:: @ 81611A0
-	call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
+	call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier
 	end
 
 RocketHideout_B1F_OnTransition:: @ 81611AA
 	setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F
 	end
 
-RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED
-	msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat
+	msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60
-	msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat
+	msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4
-	msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat
+	msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8
-	msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat
+	msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_16120A:: @ 816120A
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225
-	msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt5:: @ 816120A
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5
+	msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_161225:: @ 8161225
-	call EventScript_16126A
+RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
+	call RocketHideout_B1F_EventScript_RemoveBarrier
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	release
 	end
 
-EventScript_161233:: @ 8161233
-	setmetatile 20, 19, 718, 1
-	setmetatile 21, 19, 719, 1
-	setmetatile 20, 20, 726, 1
-	setmetatile 21, 20, 727, 1
-	setmetatile 20, 21, 642, 0
-	setmetatile 21, 21, 642, 0
+RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
+	setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0
 	return
 
-EventScript_16126A:: @ 816126A
-	setmetatile 20, 19, 642, 0
-	setmetatile 21, 19, 641, 0
-	setmetatile 20, 20, 642, 0
-	setmetatile 21, 20, 641, 0
-	setmetatile 20, 21, 642, 0
-	setmetatile 21, 21, 641, 0
+RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
+	setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 19, METATILE_Hideout_Floor, 0
+	setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 20, METATILE_Hideout_Floor, 0
+	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 21, METATILE_Hideout_Floor, 0
 	return
diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc
index fd7647e2b..9dea66b16 100644
--- a/data/maps/RocketHideout_B1F/text.inc
+++ b/data/maps/RocketHideout_B1F/text.inc
@@ -1,53 +1,53 @@
-Text_174ECA:: @ 8174ECA
+RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA
     .string "Who are you?\n"
     .string "How did you get here?$"
 
-Text_174EED:: @ 8174EED
+RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED
     .string "Oww!\n"
     .string "Beaten!$"
 
-gUnknown_8174EFA:: @ 8174EFA
+RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA
     .string "Blast it… You're dissing TEAM\n"
     .string "ROCKET, aren't you?$"
 
-Text_174F2C:: @ 8174F2C
+RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C
     .string "You broke into TEAM ROCKET's\n"
     .string "operation? What nerve!$"
 
-Text_174F60:: @ 8174F60
+RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60
     .string "Boom!$"
 
-gUnknown_8174F66:: @ 8174F66
+RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66
     .string "You're not going to get away with\n"
     .string "this, brat!$"
 
-Text_174F94:: @ 8174F94
+RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94
     .string "Intruder alert!$"
 
-Text_174FA4:: @ 8174FA4
+RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4
     .string "I can't do it!$"
 
-gUnknown_8174FB3:: @ 8174FB3
+RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3
     .string "SILPH SCOPE? Humph!\n"
     .string "I don't know where it is.$"
 
-Text_174FE1:: @ 8174FE1
+RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1
     .string "Why did you come here?$"
 
-Text_174FF8:: @ 8174FF8
+RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8
     .string "This won't do!$"
 
-gUnknown_8175007:: @ 8175007
+RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007
     .string "Okay, I'll talk…\n"
     .string "Take the elevator to see my BOSS.$"
 
-Text_17503A:: @ 817503A
+RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A
     .string "Are you lost, you little mouse?$"
 
-Text_17505A:: @ 817505A
+RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A
     .string "Why…?$"
 
-gUnknown_8175060:: @ 8175060
+RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060
     .string "Uh-oh, that ruckus somehow opened\n"
     .string "the door!$"
 
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index bdc600f55..2c353b5c1 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B2F_EventScript_1612A2",
+      "script": "RocketHideout_B2F_EventScript_Grunt",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc
index 07916ad03..55e7f6a2a 100644
--- a/data/maps/RocketHideout_B2F/scripts.inc
+++ b/data/maps/RocketHideout_B2F/scripts.inc
@@ -1,7 +1,7 @@
 RocketHideout_B2F_MapScripts:: @ 81612A1
 	.byte 0
 
-RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF
-	msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE
+RocketHideout_B2F_EventScript_Grunt:: @ 81612A2
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat
+	msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc
index d21c21555..a27121152 100644
--- a/data/maps/RocketHideout_B2F/text.inc
+++ b/data/maps/RocketHideout_B2F/text.inc
@@ -1,11 +1,11 @@
-Text_17508C:: @ 817508C
+RocketHideout_B2F_Text_GruntIntro:: @ 817508C
     .string "BOSS said you can see ghosts with\n"
     .string "the SILPH SCOPE.$"
 
-Text_1750BF:: @ 81750BF
+RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF
     .string "I surrender!$"
 
-gUnknown_81750CC:: @ 81750CC
+RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC
     .string "The TEAM ROCKET HQ has four\n"
     .string "underground floors.\p"
     .string "Think you can reach the BOSS?$"
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index be88faebf..a4c1a7c72 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RocketHideout_B3F_EventScript_1612D1",
+      "script": "RocketHideout_B3F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B3F_EventScript_1612BA",
+      "script": "RocketHideout_B3F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc
index d6a57ab77..ab1fd6bb3 100644
--- a/data/maps/RocketHideout_B3F/scripts.inc
+++ b/data/maps/RocketHideout_B3F/scripts.inc
@@ -1,12 +1,12 @@
 RocketHideout_B3F_MapScripts:: @ 81612B9
 	.byte 0
 
-RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A
-	msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat
+	msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE
-	msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat
+	msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc
index deedfce38..12a9c5a7e 100644
--- a/data/maps/RocketHideout_B3F/text.inc
+++ b/data/maps/RocketHideout_B3F/text.inc
@@ -1,25 +1,25 @@
-Text_17511A:: @ 817511A
+RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A
     .string "Stop meddling in TEAM ROCKET's\n"
     .string "affairs or else!$"
 
-Text_17514A:: @ 817514A
+RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A
     .string "Oof!\n"
     .string "Taken down!$"
 
-gUnknown_817515B:: @ 817515B
+RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B
     .string "SILPH SCOPE?\n"
     .string "Oh, that machine the BOSS stole.\p"
     .string "It's here somewhere.$"
 
-Text_17519E:: @ 817519E
+RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E
     .string "We got word from upstairs that you\n"
     .string "were coming!$"
 
-Text_1751CE:: @ 81751CE
+RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE
     .string "What?\n"
     .string "I lost? No!$"
 
-gUnknown_81751E0:: @ 81751E0
+RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0
     .string "Go ahead and go!\p"
     .string "But you can't run the elevator\n"
     .string "without the LIFT KEY.$"
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 1790720b4..da6f7f569 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_161317",
+      "script": "RocketHideout_B4F_EventScript_Giovanni",
       "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "RocketHideout_B4F_EventScript_161381",
+      "script": "RocketHideout_B4F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_161418",
+      "script": "RocketHideout_B4F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_1613CE",
+      "script": "RocketHideout_B4F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 68671a7a8..63fff7d82 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -1,33 +1,39 @@
+.equ LOCALID_GIOVANNI,    1
+.equ LOCALID_SILPH_SCOPE, 2
+.equ LOCALID_LIFT_KEY,    4
+
+.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
+
 RocketHideout_B4F_MapScripts:: @ 81612E8
 	map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad
 	.byte 0
 
 RocketHideout_B4F_OnLoad:: @ 81612EE
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_ne EventScript_16146A
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_ne RocketHideout_B4F_EventScript_SetBarrier
 	end
 
-EventScript_161311:: @ 8161311
-	addvar VAR_TEMP_1, 1
+RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311
+	addvar NUM_DOOR_GRUNTS_DEFEATED, 1
 	return
 
-RocketHideout_B4F_EventScript_161317:: @ 8161317
+RocketHideout_B4F_EventScript_Giovanni:: @ 8161317
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 0
-	message Text_175226
+	message RocketHideout_B4F_Text_GiovanniIntro
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318
-	msgbox gUnknown_817532D
+	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat
+	msgbox RocketHideout_B4F_Text_GiovanniPostBattle
 	fadescreen FADE_TO_BLACK
 	closemessage
-	removeobject 1
-	addobject 2
+	removeobject LOCALID_GIOVANNI
+	addobject LOCALID_SILPH_SCOPE
 	clearflag FLAG_HIDE_SILPH_SCOPE
 	setflag FLAG_HIDE_CELADON_ROCKETS
 	famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
@@ -38,22 +44,22 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
 RocketHideout_B4F_EventScript_SilphScope:: @ 8161363
 	lock
 	faceplayer
-	removeobject 2
+	removeobject LOCALID_SILPH_SCOPE
 	giveitem ITEM_SILPH_SCOPE
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
-RocketHideout_B4F_EventScript_161381:: @ 8161381
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D
-	msgbox gUnknown_81754BD
+RocketHideout_B4F_EventScript_Grunt1:: @ 8161381
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1
+	msgbox RocketHideout_B4F_Text_Grunt1PostBattle
 	release
 	end
 
-EventScript_16139D:: @ 816139D
-	msgbox gUnknown_81754BD
-	addobject 4
+RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D
+	msgbox RocketHideout_B4F_Text_Grunt1PostBattle
+	addobject LOCALID_LIFT_KEY
 	clearflag FLAG_HIDE_LIFT_KEY
 	release
 	end
@@ -62,65 +68,65 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD
 	lock
 	faceplayer
 	setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
-	removeobject 4
+	removeobject LOCALID_LIFT_KEY
 	giveitem ITEM_LIFT_KEY
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
-RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9
-	msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2
+	msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1613E9:: @ 81613E9
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1614A1
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 
-RocketHideout_B4F_EventScript_161418:: @ 8161418
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433
-	msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt3:: @ 8161418
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3
+	msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_161433:: @ 8161433
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1614A1
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 
-EventScript_161462:: @ 8161462
+RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	return
 
-EventScript_16146A:: @ 816146A
-	setmetatile 17, 12, 718, 1
-	setmetatile 18, 12, 719, 1
-	setmetatile 17, 13, 726, 1
-	setmetatile 18, 13, 727, 1
-	setmetatile 17, 14, 642, 0
-	setmetatile 18, 14, 642, 0
+RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
+	setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0
 	return
 
-EventScript_1614A1:: @ 81614A1
-	setmetatile 17, 12, 642, 0
-	setmetatile 18, 12, 641, 0
-	setmetatile 17, 13, 642, 0
-	setmetatile 18, 13, 641, 0
-	setmetatile 17, 14, 642, 0
-	setmetatile 18, 14, 641, 0
+RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
+	setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 12, METATILE_Hideout_Floor, 0
+	setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 13, METATILE_Hideout_Floor, 0
+	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 14, METATILE_Hideout_Floor, 0
 	return
diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc
index 4ceba8968..9d11d7502 100644
--- a/data/maps/RocketHideout_B4F/text.inc
+++ b/data/maps/RocketHideout_B4F/text.inc
@@ -1,4 +1,4 @@
-Text_175226:: @ 8175226
+RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226
     .string "So! I must say, I am impressed you\n"
     .string "got here.\p"
     .string "TEAM ROCKET captures POKéMON from\n"
@@ -9,11 +9,11 @@ Text_175226:: @ 8175226
     .string "For your insolence, you will feel a\n"
     .string "world of pain!$"
 
-Text_175318:: @ 8175318
+RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318
     .string "WHAT!\n"
     .string "This can't be!$"
 
-gUnknown_817532D:: @ 817532D
+RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D
     .string "I see that you raise POKéMON with\n"
     .string "utmost care.\p"
     .string "A child like you would never\n"
@@ -21,36 +21,36 @@ gUnknown_817532D:: @ 817532D
     .string "I shall step aside this time!\p"
     .string "I hope we meet again…$"
 
-Text_1753D0:: @ 81753D0
+RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0
     .string "I know you!\n"
     .string "You ruined our plans at MT. MOON!$"
 
-Text_1753FE:: @ 81753FE
+RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE
     .string "Burned again!$"
 
-gUnknown_817540C:: @ 817540C
+RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C
     .string "Do you have something against TEAM\n"
     .string "ROCKET?$"
 
-Text_175437:: @ 8175437
+RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437
     .string "How can you not see the beauty of\n"
     .string "our evil?$"
 
-Text_175463:: @ 8175463
+RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463
     .string "Ayaya!$"
 
-gUnknown_817546A:: @ 817546A
+RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A
     .string "BOSS!\n"
     .string "I'm sorry I failed you!$"
 
-Text_175488:: @ 8175488
+RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488
     .string "The elevator doesn't work?\n"
     .string "Who has the LIFT KEY?$"
 
-Text_1754B9:: @ 81754B9
+RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9
     .string "No!$"
 
-gUnknown_81754BD:: @ 81754BD
+RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD
     .string "Oh, no!\n"
     .string "I dropped the LIFT KEY!$"
 
diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json
index dd2191b6d..307ef90df 100644
--- a/data/maps/RocketHideout_Elevator/map.json
+++ b/data/maps/RocketHideout_Elevator/map.json
@@ -36,7 +36,7 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "RocketHideout_Elevator_EventScript_1614D9"
+      "script": "RocketHideout_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index f649e5c40..f9f210fc0 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -1,11 +1,11 @@
 RocketHideout_Elevator_MapScripts:: @ 81614D8
 	.byte 0
 
-RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
+RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
 	lockall
-	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
+	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey
 	setvar VAR_0x8004, 2
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	setvar VAR_0x8004, 2
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
-	case 0, EventScript_161530
-	case 1, EventScript_16153C
-	case 2, EventScript_161548
+	case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
+	case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
+	case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F
 	end
 
-EventScript_161530:: @ 8161530
+RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE
-	goto EventScript_161554
-
-EventScript_16153B:: @ 816153B
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16153C:: @ 816153C
+RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE
-	goto EventScript_161554
-
-EventScript_161547:: @ 8161547
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161548:: @ 8161548
+RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE
-	goto EventScript_161554
-
-EventScript_161553:: @ 8161553
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161554:: @ 8161554
+RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554
 	switch VAR_RESULT
-	case 0, EventScript_161591
-	case 1, EventScript_1615B9
-	case 2, EventScript_1615E1
-	case 3, EventScript_161609
-	case 127, EventScript_161609
+	case 0, RocketHideout_Elevator_EventScript_ToB1F
+	case 1, RocketHideout_Elevator_EventScript_ToB2F
+	case 2, RocketHideout_Elevator_EventScript_ToB4F
+	case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect
+	case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161591:: @ 8161591
+RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591
 	setvar VAR_0x8006, 3
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
 	compare VAR_ELEVATOR_FLOOR, 3
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 3
-	goto EventScript_161609
-
-EventScript_1615B8:: @ 81615B8
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615B9:: @ 81615B9
+RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9
 	setvar VAR_0x8006, 2
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
 	compare VAR_ELEVATOR_FLOOR, 2
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 2
-	goto EventScript_161609
-
-EventScript_1615E0:: @ 81615E0
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615E1:: @ 81615E1
+RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
 	setvar VAR_0x8006, 0
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
 	compare VAR_ELEVATOR_FLOOR, 0
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 0
-	goto EventScript_161609
-
-EventScript_161608:: @ 8161608
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161609:: @ 8161609
+RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_16160E:: @ 816160E
+RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
@@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E
 	setflag FLAG_TEMP_2
 	return
 
-EventScript_16161B:: @ 816161B
-	msgbox gUnknown_81754DD
+RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B
+	msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey
 	releaseall
 	end
diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc
index 89de8f918..f0e5e09f8 100644
--- a/data/maps/RocketHideout_Elevator/text.inc
+++ b/data/maps/RocketHideout_Elevator/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81754DD:: @ 81754DD
+RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD
     .string "It appears to need a key.$"
 
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
index 585054ddd..39b175cc6 100644
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -18,7 +18,7 @@
       "direction": "up"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "down"
     }
diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc
index cada12ea5..b87ca2ca2 100644
--- a/data/maps/Route5_PokemonDayCare/text.inc
+++ b/data/maps/Route5_PokemonDayCare/text.inc
@@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
 
 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
 	.string "You don't have enough money.$"
+
+Text_19E01E:: @ 819E01E
+    .string "きみの\n"
+    .string "みてみるかね？$"
+
+Text_19E02A:: @ 819E02A
+    .string "わるいけど　ひでんのわざを　もった\n"
+    .string "ポケモンは　あずかれないなぁ$"
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
index a85de2522..e75bbbf85 100644
--- a/data/maps/Route5_SouthEntrance/map.json
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F901",
+      "script": "Route5_SouthEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F90A"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F916"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F922"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc
index f20da71ae..b06a2aa2c 100644
--- a/data/maps/Route5_SouthEntrance/scripts.inc
+++ b/data/maps/Route5_SouthEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route5_SouthEntrance_MapScripts:: @ 816F900
 	.byte 0
 
-Route5_SouthEntrance_EventScript_16F901:: @ 816F901
-	msgbox gUnknown_819E16D, MSGBOX_NPC
+Route5_SouthEntrance_EventScript_Guard:: @ 816F901
+	msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A
+Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-Route5_SouthEntrance_EventScript_16F916:: @ 816F916
+Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-Route5_SouthEntrance_EventScript_16F922:: @ 816F922
+Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16F92E:: @ 816F92E
+Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16F958
-	msgbox gUnknown_819E04B
+	goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
+	msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16F958:: @ 816F958
+Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958
 	removeitem ITEM_TEA, 1
-	goto EventScript_16F963
+	goto Route5_SouthEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16F963:: @ 816F963
-	msgbox gUnknown_819E09B
+Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963
+	msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16F99C
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16F9A7
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16F9B2
-	msgbox gUnknown_819E0C1
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight
+	msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16F99C:: @ 816F99C
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2
+Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft
 	waitmovement 0
 	return
 
-EventScript_16F9A7:: @ 816F9A7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD
+Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16F9B2:: @ 816F9B2
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF
+Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight
 	waitmovement 0
 	return
 
-Movement_16F9BD:: @ 816F9BD
+Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD
 	walk_left
 	step_end
 
-Movement_16F9BF:: @ 816F9BF
+Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF
 	walk_left
 	walk_left
 	step_end
 
-Movement_16F9C2:: @ 816F9C2
+Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2
 	walk_in_place_left
 	step_end
 
-Movement_16F9C4:: @ 816F9C4
+Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4
 	walk_up
 	step_end
diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc
index 749bcabe5..2b740e141 100644
--- a/data/maps/Route5_SouthEntrance/text.inc
+++ b/data/maps/Route5_SouthEntrance/text.inc
@@ -1,21 +1,13 @@
-Text_19E01E:: @ 819E01E
-    .string "きみの\n"
-    .string "みてみるかね？$"
-
-Text_19E02A:: @ 819E02A
-    .string "わるいけど　ひでんのわざを　もった\n"
-    .string "ポケモンは　あずかれないなぁ$"
-
-gUnknown_819E04B:: @ 819E04B
+Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E09B:: @ 819E09B
+Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E0C1:: @ 819E0C1
+Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E16D:: @ 819E16D
+Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index b827521ae..bce68d653 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "up"
     },
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
index 8b49e226d..d44503ee4 100644
--- a/data/maps/Route6_NorthEntrance/map.json
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9C7",
+      "script": "Route6_NorthEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9D0"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9DC"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9E8"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc
index d1b9a4555..5c7add642 100644
--- a/data/maps/Route6_NorthEntrance/scripts.inc
+++ b/data/maps/Route6_NorthEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route6_NorthEntrance_MapScripts:: @ 816F9C6
 	.byte 0
 
-Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7
-	msgbox gUnknown_819E2A3, MSGBOX_NPC
+Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7
+	msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0
+Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC
+Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
+Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16F9F4:: @ 816F9F4
+Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FA1E
-	msgbox gUnknown_819E181
+	goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
+	msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FA1E:: @ 816FA1E
+Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FA29
+	goto Route6_NorthEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FA29:: @ 816FA29
-	msgbox gUnknown_819E1D1
+Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29
+	msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FA62
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FA6D
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FA78
-	msgbox gUnknown_819E1F7
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight
+	msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FA62:: @ 816FA62
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83
+Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft
 	waitmovement 0
 	return
 
-EventScript_16FA6D:: @ 816FA6D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86
+Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FA78:: @ 816FA78
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88
+Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight
 	waitmovement 0
 	return
 
-Movement_16FA83:: @ 816FA83
+Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83
 	walk_right
 	walk_right
 	step_end
 
-Movement_16FA86:: @ 816FA86
+Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86
 	walk_right
 	step_end
 
-Movement_16FA88:: @ 816FA88
+Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88
 	walk_in_place_right
 	step_end
 
-Movement_16FA8A:: @ 816FA8A
+Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A
 	walk_down
 	step_end
diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc
index 3d581e1fb..09705517c 100644
--- a/data/maps/Route6_NorthEntrance/text.inc
+++ b/data/maps/Route6_NorthEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E181:: @ 819E181
+Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E1D1:: @ 819E1D1
+Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E1F7:: @ 819E1F7
+Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E2A3:: @ 819E2A3
+Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index 66833b93b..145245c13 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -18,7 +18,7 @@
       "direction": "left"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "right"
     }
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
index 8bd0e7498..fbb8a163d 100644
--- a/data/maps/Route7_EastEntrance/map.json
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route7_EastEntrance_EventScript_16FA8E",
+      "script": "Route7_EastEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FA97"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerTop"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FAA3"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FAAF"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc
index cac72463b..767601f49 100644
--- a/data/maps/Route7_EastEntrance/scripts.inc
+++ b/data/maps/Route7_EastEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route7_EastEntrance_MapScripts:: @ 816FA8D
 	.byte 0
 
-Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E
-	msgbox gUnknown_819E3D9, MSGBOX_NPC
+Route7_EastEntrance_EventScript_Guard:: @ 816FA8E
+	msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route7_EastEntrance_EventScript_16FA97:: @ 816FA97
+Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3
+Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
+Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16FABB:: @ 816FABB
+Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FAE5
-	msgbox gUnknown_819E2B7
+	goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
+	msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FAE5:: @ 816FAE5
+Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FAF0
+	goto Route7_EastEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FAF0:: @ 816FAF0
-	msgbox gUnknown_819E307
+Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0
+	msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FB29
+	call_if_eq Route7_EastEntrance_WalkToGuardTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FB34
+	call_if_eq Route7_EastEntrance_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FB3F
-	msgbox gUnknown_819E32D
+	call_if_eq Route7_EastEntrance_WalkToGuardBottom
+	msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FB29:: @ 816FB29
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F
+Route7_EastEntrance_WalkToGuardTop:: @ 816FB29
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop
 	waitmovement 0
 	return
 
-EventScript_16FB34:: @ 816FB34
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A
+Route7_EastEntrance_WalkToGuardMid:: @ 816FB34
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FB3F:: @ 816FB3F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C
+Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom
 	waitmovement 0
 	return
 
-Movement_16FB4A:: @ 816FB4A
+Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A
 	walk_up
 	step_end
 
-Movement_16FB4C:: @ 816FB4C
+Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C
 	walk_up
 	walk_up
 	step_end
 
-Movement_16FB4F:: @ 816FB4F
+Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F
 	walk_in_place_up
 	step_end
 
-Movement_16FB51:: @ 816FB51
+Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51
 	walk_left
 	step_end
diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc
index 94db43e94..ec98a5867 100644
--- a/data/maps/Route7_EastEntrance/text.inc
+++ b/data/maps/Route7_EastEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E2B7:: @ 819E2B7
+Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E307:: @ 819E307
+Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E32D:: @ 819E32D
+Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E3D9:: @ 819E3D9
+Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 92e0154a4..b777fced8 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "left"
     },
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
index eb6b26e0f..3becdcbc2 100644
--- a/data/maps/Route8_WestEntrance/map.json
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB54",
+      "script": "Route8_WestEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB5D"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerTop"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB69"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB75"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc
index df9d1035c..1b36e9a15 100644
--- a/data/maps/Route8_WestEntrance/scripts.inc
+++ b/data/maps/Route8_WestEntrance/scripts.inc
@@ -1,97 +1,99 @@
 Route8_WestEntrance_MapScripts:: @ 816FB53
 	.byte 0
 
-Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
-	msgbox gUnknown_819E50F, MSGBOX_NPC
+Route8_WestEntrance_EventScript_Guard:: @ 816FB54
+	msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
+Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
+Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
+Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16FB81:: @ 816FB81
+Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FBAB
-	msgbox gUnknown_819E3ED
+	goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
+	msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FBAB:: @ 816FBAB
+Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBB6:: @ 816FBB6
+@ Unused
+Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6
 	removeitem ITEM_SODA_POP, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBC1:: @ 816FBC1
+@ Unused
+Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1
 	removeitem ITEM_LEMONADE, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBCC:: @ 816FBCC
-	msgbox gUnknown_819E43D
+Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC
+	msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FC05
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FC10
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FC1B
-	msgbox gUnknown_819E463
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom
+	msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FC05:: @ 816FC05
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B
+Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop
 	waitmovement 0
 	return
 
-EventScript_16FC10:: @ 816FC10
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26
+Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FC1B:: @ 816FC1B
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28
+Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom
 	waitmovement 0
 	return
 
-Movement_16FC26:: @ 816FC26
+Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26
 	walk_up
 	step_end
 
-Movement_16FC28:: @ 816FC28
+Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28
 	walk_up
 	walk_up
 	step_end
 
-Movement_16FC2B:: @ 816FC2B
+Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B
 	walk_in_place_up
 	step_end
 
-Movement_16FC2D:: @ 816FC2D
+Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D
 	walk_right
 	step_end
diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc
index 58e2ee8ef..3c0be19e1 100644
--- a/data/maps/Route8_WestEntrance/text.inc
+++ b/data/maps/Route8_WestEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E3ED:: @ 819E3ED
+Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E43D:: @ 819E43D
+Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E463:: @ 819E463
+Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E50F:: @ 819E50F
+Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index 9ca5a540e..83dc3497f 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16737A",
+      "script": "SaffronCity_EventScript_RocketGrunt1",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167383",
+      "script": "SaffronCity_EventScript_RocketGrunt2",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -71,7 +71,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16738C",
+      "script": "SaffronCity_EventScript_RocketGrunt3",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -84,7 +84,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167395",
+      "script": "SaffronCity_EventScript_RocketGrunt4",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -97,7 +97,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16739E",
+      "script": "SaffronCity_EventScript_RocketGrunt5",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673B9",
+      "script": "SaffronCity_EventScript_DoorGuardGrunt",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673B0",
+      "script": "SaffronCity_EventScript_RocketGrunt7",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673A7",
+      "script": "SaffronCity_EventScript_RocketGrunt6",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673EC",
+      "script": "SaffronCity_EventScript_Youngster",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673E3",
+      "script": "SaffronCity_EventScript_WorkerM",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -175,7 +175,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16741A",
+      "script": "SaffronCity_EventScript_Man",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -188,7 +188,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673FE",
+      "script": "SaffronCity_EventScript_Boy",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -201,7 +201,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167407",
+      "script": "SaffronCity_EventScript_Pidgeot",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -214,7 +214,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673F5",
+      "script": "SaffronCity_EventScript_Lass",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -227,7 +227,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1AD03A",
+      "script": "SaffronCity_EventScript_BattleGirl",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
@@ -243,7 +243,7 @@
       "x": 22,
       "y": 14,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
       "dest_warp_id": 1
     },
     {
@@ -264,7 +264,7 @@
       "x": 27,
       "y": 21,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE2",
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE",
       "dest_warp_id": 1
     },
     {
@@ -285,7 +285,7 @@
       "x": 43,
       "y": 38,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE3",
+      "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
       "dest_warp_id": 1
     },
     {
@@ -345,63 +345,63 @@
       "x": 29,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167423"
+      "script": "SaffronCity_EventScript_CitySign"
     },
     {
       "type": "bg_event_type_0",
       "x": 42,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16742C"
+      "script": "SaffronCity_EventScript_DojoSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 13,
       "y": 25,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167471"
+      "script": "SaffronCity_EventScript_SilphProductSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 18,
       "y": 30,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167456"
+      "script": "SaffronCity_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 29,
       "y": 31,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16745F"
+      "script": "SaffronCity_EventScript_SilphCoSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 54,
       "y": 25,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16744D"
+      "script": "SaffronCity_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 50,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167435"
+      "script": "SaffronCity_EventScript_GymSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 40,
       "y": 38,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167468"
+      "script": "SaffronCity_EventScript_MrPsychicsHouseSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 49,
       "y": 22,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16747A"
+      "script": "SaffronCity_EventScript_TrainerFanClubSign"
     }
   ]
 }
diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
index 53d697ff0..4b74cd43d 100644
--- a/data/maps/SaffronCity/scripts.inc
+++ b/data/maps/SaffronCity/scripts.inc
@@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F
 
 SaffronCity_OnTransition:: @ 8167365
 	setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
-	call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372
+	call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt
 	end
 
-EventScript_167372:: @ 8167372
+SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372
 	setobjectxyperm 6, 33, 31
 	return
 
-SaffronCity_EventScript_16737A:: @ 816737A
-	msgbox gUnknown_8181003, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt1:: @ 816737A
+	msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167383:: @ 8167383
-	msgbox gUnknown_818101F, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt2:: @ 8167383
+	msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16738C:: @ 816738C
-	msgbox gUnknown_818105A, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt3:: @ 816738C
+	msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167395:: @ 8167395
-	msgbox gUnknown_8181087, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt4:: @ 8167395
+	msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16739E:: @ 816739E
-	msgbox gUnknown_81810A7, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt5:: @ 816739E
+	msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673A7:: @ 81673A7
-	msgbox gUnknown_81810D5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt6:: @ 81673A7
+	msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B0:: @ 81673B0
-	msgbox gUnknown_81810F5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt7:: @ 81673B0
+	msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B9:: @ 81673B9
+SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
 	lock
-	goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7
+	goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
 	applymovement 6, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81812CA
+	msgbox SaffronCity_Text_ImASecurityGuard
 	release
 	end
 
-EventScript_1673D7:: @ 81673D7
+SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7
 	textcolor 3
-	msgbox gUnknown_8181302
+	msgbox SaffronCity_Text_HesTakingASnooze
 	release
 	end
 
-SaffronCity_EventScript_1673E3:: @ 81673E3
-	msgbox gUnknown_8181159, MSGBOX_NPC
+SaffronCity_EventScript_WorkerM:: @ 81673E3
+	msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673EC:: @ 81673EC
-	msgbox gUnknown_8181189, MSGBOX_NPC
+SaffronCity_EventScript_Youngster:: @ 81673EC
+	msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673F5:: @ 81673F5
-	msgbox gUnknown_81811BF, MSGBOX_NPC
+SaffronCity_EventScript_Lass:: @ 81673F5
+	msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673FE:: @ 81673FE
-	msgbox gUnknown_8181225, MSGBOX_NPC
+SaffronCity_EventScript_Boy:: @ 81673FE
+	msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167407:: @ 8167407
+SaffronCity_EventScript_Pidgeot:: @ 8167407
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIDGEOT, 0
-	msgbox gUnknown_8181286
+	msgbox SaffronCity_Text_Pidgeot
 	waitmoncry
 	release
 	end
 
-SaffronCity_EventScript_16741A:: @ 816741A
-	msgbox gUnknown_8181299, MSGBOX_NPC
+SaffronCity_EventScript_Man:: @ 816741A
+	msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167423:: @ 8167423
-	msgbox gUnknown_8181326, MSGBOX_SIGN
+SaffronCity_EventScript_CitySign:: @ 8167423
+	msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16742C:: @ 816742C
-	msgbox gUnknown_8181354, MSGBOX_SIGN
+SaffronCity_EventScript_DojoSign:: @ 816742C
+	msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167435:: @ 8167435
+SaffronCity_EventScript_GymSign:: @ 8167435
 	lockall
 	famechecker FAMECHECKER_SABRINA, 0
-	msgbox gUnknown_8181362
+	msgbox SaffronCity_Text_GymSign
 	releaseall
 	end
 
-SaffronCity_EventScript_16744D:: @ 816744D
-	msgbox gUnknown_81813AA, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips1:: @ 816744D
+	msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167456:: @ 8167456
-	msgbox gUnknown_8181452, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips2:: @ 8167456
+	msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16745F:: @ 816745F
-	msgbox gUnknown_81814B9, MSGBOX_SIGN
+SaffronCity_EventScript_SilphCoSign:: @ 816745F
+	msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167468:: @ 8167468
-	msgbox gUnknown_81814D3, MSGBOX_SIGN
+SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468
+	msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167471:: @ 8167471
-	msgbox gUnknown_81814E7, MSGBOX_SIGN
+SaffronCity_EventScript_SilphProductSign:: @ 8167471
+	msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16747A:: @ 816747A
-	msgbox gUnknown_8181519, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A
+	msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc
index aaa009647..d3044d14b 100644
--- a/data/maps/SaffronCity/text.inc
+++ b/data/maps/SaffronCity/text.inc
@@ -1,80 +1,80 @@
-gUnknown_8181003:: @ 8181003
+SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003
     .string "What do you want?\n"
     .string "Get lost!$"
 
-gUnknown_818101F:: @ 818101F
+SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F
     .string "BOSS said he'll take this town\n"
     .string "in the name of TEAM ROCKET!$"
 
-gUnknown_818105A:: @ 818105A
+SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A
     .string "Don't get defiant!\n"
     .string "Or I'll have to hurt you!$"
 
-gUnknown_8181087:: @ 8181087
+SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087
     .string "SAFFRON belongs to TEAM ROCKET!$"
 
-gUnknown_81810A7:: @ 81810A7
+SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7
     .string "My life as a criminal makes me feel\n"
     .string "so alive!$"
 
-gUnknown_81810D5:: @ 81810D5
+SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5
     .string "Ow!\n"
     .string "Watch where you're walking!$"
 
-gUnknown_81810F5:: @ 81810F5
+SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5
     .string "With SILPH under control, we can\n"
     .string "exploit POKéMON around the world!\p"
     .string "We'll get stinking rich, yeahah!$"
 
-gUnknown_8181159:: @ 8181159
+SaffronCity_Text_YouBeatTeamRocket:: @ 8181159
     .string "You beat TEAM ROCKET all alone?\n"
     .string "That's amazing!$"
 
-gUnknown_8181189:: @ 8181189
+SaffronCity_Text_SafeToGoOutAgain:: @ 8181189
     .string "Yeah! TEAM ROCKET is gone!\n"
     .string "It's safe to go out again!$"
 
-gUnknown_81811BF:: @ 81811BF
+SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF
     .string "People fled from here in droves\n"
     .string "when those ROCKETS came.\p"
     .string "They should be flocking back to\n"
     .string "SAFFRON now.$"
 
-gUnknown_8181225:: @ 8181225
+SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225
     .string "I flew here on my PIDGEOT when\n"
     .string "I read about SILPH.\p"
     .string "It's already over?\n"
     .string "I missed the media action…$"
 
-gUnknown_8181286:: @ 8181286
+SaffronCity_Text_Pidgeot:: @ 8181286
     .string "PIDGEOT: Bi bibii!$"
 
-gUnknown_8181299:: @ 8181299
+SaffronCity_Text_SawRocketBossEscaping:: @ 8181299
     .string "I saw the ROCKET BOSS escaping\n"
     .string "SILPH's building.$"
 
-gUnknown_81812CA:: @ 81812CA
+SaffronCity_Text_ImASecurityGuard:: @ 81812CA
     .string "I'm a security guard.\p"
     .string "Suspicious kids I don't allow in!$"
 
-gUnknown_8181302:: @ 8181302
+SaffronCity_Text_HesTakingASnooze:: @ 8181302
     .string "…\n"
     .string "Snore…\p"
     .string "Hah! He's taking a snooze!$"
 
-gUnknown_8181326:: @ 8181326
+SaffronCity_Text_CitySign:: @ 8181326
     .string "SAFFRON CITY\n"
     .string "Shining, Golden Land of Commerce$"
 
-gUnknown_8181354:: @ 8181354
+SaffronCity_Text_FightingDojo:: @ 8181354
     .string "FIGHTING DOJO$"
 
-gUnknown_8181362:: @ 8181362
+SaffronCity_Text_GymSign:: @ 8181362
     .string "SAFFRON CITY POKéMON GYM\n"
     .string "LEADER: SABRINA\l"
     .string "The Master of PSYCHIC POKéMON!$"
 
-gUnknown_81813AA:: @ 81813AA
+SaffronCity_Text_FullHealCuresStatus:: @ 81813AA
     .string "TRAINER TIPS\p"
     .string "FULL HEAL cures all ailments like\n"
     .string "burns, paralysis, poisoning,\l"
@@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA
     .string "It costs a bit more, but it's more\n"
     .string "convenient than buying other items.$"
 
-gUnknown_8181452:: @ 8181452
+SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452
     .string "TRAINER TIPS\p"
     .string "The new GREAT BALL offers improved\n"
     .string "catching rates.\p"
     .string "Try it on those hard-to-catch\n"
     .string "POKéMON.$"
 
-gUnknown_81814B9:: @ 81814B9
+SaffronCity_Text_SilphCoSign:: @ 81814B9
     .string "SILPH CO. OFFICE BUILDING$"
 
-gUnknown_81814D3:: @ 81814D3
+SaffronCity_Text_MrPsychicsHouse:: @ 81814D3
     .string "MR. PSYCHIC'S HOUSE$"
 
-gUnknown_81814E7:: @ 81814E7
+SaffronCity_Text_SilphsLatestProduct:: @ 81814E7
     .string "SILPH's latest product!\n"
     .string "Release to be determined…$"
 
-gUnknown_8181519:: @ 8181519
+SaffronCity_Text_TrainerFanClubSign:: @ 8181519
     .string "POKéMON TRAINER FAN CLUB\p"
     .string "Many TRAINERS have scribbled their\n"
     .string "names on this sign.$"
 
+SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569
+    .string "This FAN CLUB…\n"
+    .string "No one here has a clue!\p"
+    .string "How could they not recognize\n"
+    .string "the brilliance that is LANCE?\p"
+    .string "He stands for justice!\n"
+    .string "He's cool, and yet passionate!\l"
+    .string "He's the greatest, LANCE!$"
+
diff --git a/data/maps/SaffronCity_Classic/scripts.inc b/data/maps/SaffronCity_Classic/scripts.inc
deleted file mode 100644
index 26470756d..000000000
--- a/data/maps/SaffronCity_Classic/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0
diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Connection/map.json
index 0a5614975..718007c43 100644
--- a/data/maps/SaffronCity_Classic/map.json
+++ b/data/maps/SaffronCity_Connection/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_CLASSIC",
-  "name": "SaffronCity_Classic",
-  "layout": "LAYOUT_SAFFRON_CITY_CLASSIC",
+  "id": "MAP_SAFFRON_CITY_CONNECTION",
+  "name": "SaffronCity_Connection",
+  "layout": "LAYOUT_SAFFRON_CITY_CONNECTION",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
diff --git a/data/maps/SaffronCity_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc
new file mode 100644
index 000000000..94f49eb2d
--- /dev/null
+++ b/data/maps/SaffronCity_Connection/scripts.inc
@@ -0,0 +1,2 @@
+SaffronCity_Connection_MapScripts:: @ 8167483
+	.byte 0
diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
index 4f7e0a241..bb33e6ea3 100644
--- a/data/maps/SaffronCity_House1_1F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE1_1F",
-  "name": "SaffronCity_House1_1F",
-  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
+  "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
+  "name": "SaffronCity_CopycatsHouse_1F",
+  "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB40",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB37",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB49",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey",
       "flag": "0"
     }
   ],
@@ -79,7 +79,7 @@
       "x": 10,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
       "dest_warp_id": 0
     }
   ],
diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
new file mode 100644
index 000000000..e6f779e15
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
@@ -0,0 +1,20 @@
+SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36
+	.byte 0
+
+SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37
+	msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC
+	end
+
+SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40
+	msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC
+	end
+
+SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CHANSEY, 0
+	msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc
new file mode 100644
index 000000000..d7efe0281
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc
@@ -0,0 +1,13 @@
+SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B
+    .string "My daughter is so self-centered.\n"
+    .string "She has but a few friends.$"
+
+SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7
+    .string "My daughter likes to mimic people.\n"
+    .string "It's rather vexing.\p"
+    .string "Her mimicry has earned her the\n"
+    .string "nickname COPYCAT around here.$"
+
+SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B
+    .string "CHANSEY: Chaan! Sii!$"
+
diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
index e7484dfae..ab920aa73 100644
--- a/data/maps/SaffronCity_House1_2F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE1_2F",
-  "name": "SaffronCity_House1_2F",
-  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
+  "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
+  "name": "SaffronCity_CopycatsHouse_2F",
+  "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB5D",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB7B",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat",
       "flag": "0"
     }
   ],
@@ -71,7 +71,7 @@
       "x": 10,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
       "dest_warp_id": 3
     }
   ],
@@ -82,14 +82,14 @@
       "x": 1,
       "y": 1,
       "elevation": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EBC9"
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 5,
       "elevation": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EBD2"
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game"
     },
     {
       "type": "hidden_item",
@@ -97,7 +97,7 @@
       "y": 1,
       "elevation": 0,
       "item": "ITEM_NUGGET",
-      "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET",
+      "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET",
       "quantity": 1,
       "underfoot": false
     }
diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
new file mode 100644
index 000000000..a8e74c94b
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
@@ -0,0 +1,50 @@
+SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C
+	.byte 0
+
+SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_DODUO, 0
+	msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo
+	waitmoncry
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70
+	lock
+	msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B
+	goto_if_questlog EventScript_ReleaseEnd
+	special sub_8112364
+	lock
+	faceplayer
+	checkitem ITEM_POKE_DOLL, 1
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_MimicTutor
+	checkplayergender
+	compare VAR_RESULT, MALE
+	call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale
+	compare VAR_RESULT, FEMALE
+	call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale
+	return
+
+SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale
+	return
+
+SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN
+	end
diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc
index 32a666e18..978b660f5 100644
--- a/data/maps/SaffronCity_House1_2F/text.inc
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819AC60:: @ 819AC60
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60
     .string "{PLAYER}: Hi!\n"
     .string "Do you like POKéMON?\p"
     .string "{PLAYER}: Uh, no, I just asked you.\p"
@@ -7,7 +7,7 @@ gUnknown_819AC60:: @ 819AC60
     .string "COPYCAT: Hmm? Quit mimicking?\n"
     .string "But, that's my favorite hobby!$"
 
-gUnknown_819ACF1:: @ 819ACF1
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1
     .string "{PLAYER}: Hi.\n"
     .string "You must like POKéMON.\p"
     .string "{PLAYER}: No, not me.\n"
@@ -51,10 +51,10 @@ Text_MimicTaughtFemale:: @ 819AE90
     .string "COPYCAT: You bet!\n"
     .string "It's a scream!$"
 
-Text_19AF1A:: @ 819AF1A
+SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A
     .string "にもつが　いっぱいね！$"
 
-Text_19AF26:: @ 819AF26
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26
     .string "{PLAYER}“やあ！　こんにちは！\n"
     .string "きみ　ポケモン　すきかい？\p"
     .string "{PLAYER}“ぼく　じゃなくって\n"
@@ -66,7 +66,7 @@ Text_19AF26:: @ 819AF26
     .string "だって　あたし　\n"
     .string "ものまね　しゅみ　なんだ　もん！”$"
 
-Text_19AFB0:: @ 819AFB0
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0
     .string "{PLAYER}“こんにちは！\n"
     .string "ポケモン　すきなのね？\p"
     .string "{PLAYER}“わたし　じゃなくって\n"
@@ -78,23 +78,25 @@ Text_19AFB0:: @ 819AFB0
     .string "だって　あたし\n"
     .string "ものまね　しゅみ　なんだ　もん！$"
 
-gUnknown_819B030:: @ 819B030
+SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030
     .string "DODUO: Giiih!\p"
     .string "PRETTY MIRROR LOOK AT ME,\n"
     .string "SEE HOW PRETTY I CAN BE?$"
 
-gUnknown_819B071:: @ 819B071
+SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071
     .string "This is a rare POKéMON!\n"
     .string "Huh? It's only a doll!$"
 
-gUnknown_819B0A0:: @ 819B0A0
+SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0
     .string "A game with MARIO wearing a bucket\n"
     .string "on his head!$"
 
-gUnknown_819B0D0:: @ 819B0D0
+SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0
     .string "…\p"
     .string "My Secrets!\p"
     .string "Skill: Mimicry!\n"
     .string "Hobby: Collecting dolls!\l"
     .string "Favorite POKéMON: CLEFAIRY!$"
 
+SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123
+    .string "？　みえないぞ‥$"
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index d6e1d9d4d..699ead653 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED46",
+      "script": "SaffronCity_Dojo_EventScript_Hitoshi",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED5D",
+      "script": "SaffronCity_Dojo_EventScript_Hideki",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED74",
+      "script": "SaffronCity_Dojo_EventScript_Aaron",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED8B",
+      "script": "SaffronCity_Dojo_EventScript_Mike",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SaffronCity_Dojo_EventScript_16EDA2",
+      "script": "SaffronCity_Dojo_EventScript_MasterKoichi",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EC00",
+      "script": "SaffronCity_Dojo_EventScript_HitmonleeBall",
       "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EC46",
+      "script": "SaffronCity_Dojo_EventScript_HitmonchanBall",
       "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL"
     }
   ],
@@ -136,7 +136,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
       "var_value": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EBDC"
+      "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft"
     },
     {
       "type": "trigger",
@@ -145,7 +145,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
       "var_value": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EBEE"
+      "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight"
     }
   ],
   "bg_events": [
@@ -154,28 +154,28 @@
       "x": 3,
       "y": 13,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+      "script": "SaffronCity_Dojo_EventScript_Statue"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 13,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+      "script": "SaffronCity_Dojo_EventScript_Statue"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 2,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED34"
+      "script": "SaffronCity_Dojo_EventScript_LeftScroll"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED3D"
+      "script": "SaffronCity_Dojo_EventScript_RightScroll"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
index d5c3e6603..88e53d64c 100644
--- a/data/maps/SaffronCity_Dojo/scripts.inc
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -1,157 +1,159 @@
+.equ LOCALID_KARATE_MASTER, 5
+
 SaffronCity_Dojo_MapScripts:: @ 816EBDB
 	.byte 0
 
-SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
+SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC
 	lockall
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
-	applymovement 5, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	releaseall
 	end
 
-SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
+SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE
 	lockall
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
-	applymovement 5, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	releaseall
 	end
 
-SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
+SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
 	drawmonpic SPECIES_HITMONLEE, 10, 3
 	setvar VAR_TEMP_1, SPECIES_HITMONLEE
-	applymovement 5, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B44E, MSGBOX_YESNO
+	msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16EC82
+	goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
 	erasemonpic
 	release
 	end
 
-EventScript_16EC3C:: @ 816EC3C
-	msgbox gUnknown_819B4E1
+SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C
+	msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy
 	release
 	end
 
-SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
+SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
 	drawmonpic SPECIES_HITMONCHAN, 10, 3
 	setvar VAR_TEMP_1, SPECIES_HITMONCHAN
-	applymovement 5, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B49E, MSGBOX_YESNO
+	msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16EC82
+	goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
 	erasemonpic
 	release
 	end
 
-EventScript_16EC82:: @ 816EC82
+SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82
 	erasemonpic
 	givemon VAR_TEMP_1, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16ECB5
+	goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16ECEC
+	goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_16ECB5:: @ 816ECB5
+SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5
 	removeobject VAR_LAST_TALKED
 	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
-	message Text_19B473
+	message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
 	waitmessage
 	waitfanfare
 	setflag FLAG_GOT_HITMON_FROM_DOJO
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16ED29
+	goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16ED29
+	goto SaffronCity_Dojo_EventScript_EndGiveMon
 	end
 
-EventScript_16ECEC:: @ 816ECEC
+SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC
 	removeobject VAR_LAST_TALKED
 	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
-	message Text_19B473
+	message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
 	waitmessage
 	waitfanfare
 	setflag FLAG_GOT_HITMON_FROM_DOJO
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16ED1E
+	goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16ED1E
+	goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC
 	end
 
-EventScript_16ED1E:: @ 816ED1E
+SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E
 	call EventScript_TransferredToPC
-	goto EventScript_16ED29
+	goto SaffronCity_Dojo_EventScript_EndGiveMon
 	end
 
-EventScript_16ED29:: @ 816ED29
+SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29
 	release
 	end
 
-SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B
-	msgbox gUnknown_819B52E, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B
+	msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34
-	msgbox gUnknown_819B4F8, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34
+	msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
-	msgbox gUnknown_819B50F, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D
+	msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
-	trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F
-	msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46
+	trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat
+	msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
-	trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD
-	msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D
+	trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat
+	msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
-	trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396
-	msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74
+	trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat
+	msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
-	trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292
-	msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B
+	trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat
+	msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
-	trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6
-	msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2
+	trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon
+	msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16EDC6:: @ 816EDC6
-	msgbox gUnknown_819B24C
+SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6
+	msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs
 	release
 	end
 
-EventScript_16EDD0:: @ 816EDD0
+SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
 	release
 	end
diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc
index d85b5a843..9c73ffcb9 100644
--- a/data/maps/SaffronCity_Dojo/text.inc
+++ b/data/maps/SaffronCity_Dojo/text.inc
@@ -1,7 +1,4 @@
-Text_19B123:: @ 819B123
-    .string "？　みえないぞ‥$"
-
-Text_19B12C:: @ 819B12C
+SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C
     .string "Grunt!\p"
     .string "I am the KARATE MASTER!\n"
     .string "I am the LEADER here!\p"
@@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C
     .string "Expect no mercy!\p"
     .string "Fwaaa!$"
 
-Text_19B193:: @ 819B193
+SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193
     .string "Hwa!\n"
     .string "Arrgh! Beaten!$"
 
-gUnknown_819B1A7:: @ 819B1A7
+SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7
     .string "Indeed, I have lost!\p"
     .string "But, I beseech you, do not take\n"
     .string "our emblem as your trophy!\p"
@@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7
     .string "FIGHTING POKéMON!\p"
     .string "Choose whichever one you like!$"
 
-gUnknown_819B24C:: @ 819B24C
+SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C
     .string "Grunt!\n"
     .string "Stay and train at karate with us!$"
 
-Text_19B275:: @ 819B275
+SaffronCity_Dojo_Text_MikeIntro:: @ 819B275
     .string "Hoargh!\n"
     .string "Take your shoes off!$"
 
-Text_19B292:: @ 819B292
+SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292
     .string "I give up!$"
 
-gUnknown_819B29D:: @ 819B29D
+SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D
     .string "You wait 'til you see our MASTER!\n"
     .string "I'm a small fry compared to him!$"
 
-Text_19B2E0:: @ 819B2E0
+SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0
     .string "I hear you're good!\n"
     .string "Show me!$"
 
-Text_19B2FD:: @ 819B2FD
+SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD
     .string "Judge!\n"
     .string "One point!$"
 
-gUnknown_819B30F:: @ 819B30F
+SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F
     .string "Our MASTER is a pro fighter.\n"
     .string "Be prepared to lose!$"
 
-Text_19B341:: @ 819B341
+SaffronCity_Dojo_Text_AaronIntro:: @ 819B341
     .string "Hiyah!\n"
     .string "I have no fear for anything tough!\p"
     .string "I shatter boulders for training\n"
     .string "every day!$"
 
-Text_19B396:: @ 819B396
+SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396
     .string "Yow!\n"
     .string "Stubbed fingers!$"
 
-gUnknown_819B3AC:: @ 819B3AC
+SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC
     .string "The only thing that frightens us is\n"
     .string "psychic power!$"
 
-Text_19B3DF:: @ 819B3DF
+SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF
     .string "Hwaah!\p"
     .string "You're trespassing in our\n"
     .string "FIGHTING DOJO!$"
 
-Text_19B40F:: @ 819B40F
+SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F
     .string "Oof!\n"
     .string "I give up!$"
 
-gUnknown_819B41F:: @ 819B41F
+SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F
     .string "The prime fighters across the land\n"
     .string "train here.$"
 
-gUnknown_819B44E:: @ 819B44E
+SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E
     .string "You want the hard-kicking\n"
     .string "HITMONLEE?$"
 
-Text_19B473:: @ 819B473
+SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473
     .string "{PLAYER} received the {STR_VAR_1}\n"
     .string "from the KARATE MASTER.$"
 
-gUnknown_819B49E:: @ 819B49E
+SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E
     .string "You want the piston-punching\n"
     .string "HITMONCHAN?$"
 
-Text_19B4C7:: @ 819B4C7
+SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7
     .string "{PLAYER}は　カラテ　だいおう　から\n"
     .string "{STR_VAR_1}を　もらった！$"
 
-gUnknown_819B4E1:: @ 819B4E1
+SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1
     .string "Better not get greedy…$"
 
-gUnknown_819B4F8:: @ 819B4F8
+SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8
     .string "Enemies on every side!$"
 
-gUnknown_819B50F:: @ 819B50F
+SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F
     .string "What goes around comes around.$"
 
-gUnknown_819B52E:: @ 819B52E
+SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E
     .string "FIGHTING DOJO$"
 
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
index cfbf00b36..0ebd439e5 100644
--- a/data/maps/SaffronCity_Gym/map.json
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEC3",
+      "script": "SaffronCity_Gym_EventScript_Cameron",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EE88",
+      "script": "SaffronCity_Gym_EventScript_Johan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEDA",
+      "script": "SaffronCity_Gym_EventScript_Preston",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEF1",
+      "script": "SaffronCity_Gym_EventScript_Amanda",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EF08",
+      "script": "SaffronCity_Gym_EventScript_Stacy",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EF1F",
+      "script": "SaffronCity_Gym_EventScript_Tasha",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Gym_EventScript_16EDD8",
+      "script": "SaffronCity_Gym_EventScript_Sabrina",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EE9F",
+      "script": "SaffronCity_Gym_EventScript_Tyron",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF36",
+      "script": "SaffronCity_Gym_EventScript_GymGuy",
       "flag": "0"
     }
   ],
@@ -371,14 +371,14 @@
       "x": 12,
       "y": 20,
       "elevation": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF55"
+      "script": "SaffronCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "bg_event_type_0",
       "x": 16,
       "y": 20,
       "elevation": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF55"
+      "script": "SaffronCity_Gym_EventScript_GymStatue"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
index afe863e89..8b4542fab 100644
--- a/data/maps/SaffronCity_Gym/scripts.inc
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -1,97 +1,97 @@
 SaffronCity_Gym_MapScripts:: @ 816EDD7
 	.byte 0
 
-SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
+SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8
 	famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D
-	msgbox gUnknown_819B7F2
+	trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04
+	msgbox SaffronCity_Gym_Text_ExplainTM04
 	release
 	end
 
-EventScript_16EE0A:: @ 816EE0A
+SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A
 	famechecker FAMECHECKER_SABRINA, 2
 	famechecker FAMECHECKER_SABRINA, 3
 	clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
 	setflag FLAG_DEFEATED_SABRINA
 	setflag FLAG_BADGE06_GET
 	set_gym_trainers 6
-	goto EventScript_16EE3D
+	goto SaffronCity_Gym_EventScript_GiveTM04
 	end
 
-EventScript_16EE3D:: @ 816EE3D
-	msgbox gUnknown_819B6FA
+SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D
+	msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis
 	checkitemspace ITEM_TM04, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16EE7E
-	giveitem_msg gUnknown_819B7D3, ITEM_TM04
+	goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04
+	giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04
 	setflag FLAG_GOT_TM04_FROM_SABRINA
-	msgbox gUnknown_819B685
+	msgbox SaffronCity_Gym_Text_SabrinaPostBattle
 	release
 	end
 
-EventScript_16EE7E:: @ 816EE7E
-	msgbox gUnknown_819B849
+SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E
+	msgbox SaffronCity_Gym_Text_BagFullOfOtherItems
 	release
 	end
 
-SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
-	trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957
-	msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Johan:: @ 816EE88
+	trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
+	msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
-	trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E
+SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F
+	trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat
 	famechecker FAMECHECKER_SABRINA, 5
-	msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE
+	msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
-	trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1
-	msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3
+	trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
+	msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
-	trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC
-	msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Preston:: @ 816EEDA
+	trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
+	msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
-	trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8
-	msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1
+	trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
+	msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
-	trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC
-	msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Stacy:: @ 816EF08
+	trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
+	msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
-	trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D
-	msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F
+	trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
+	msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
+SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B
-	msgbox gUnknown_819BCF6
+	goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory
+	msgbox SaffronCity_Gym_Text_GymGuyAdvice
 	release
 	end
 
-EventScript_16EF4B:: @ 816EF4B
-	msgbox gUnknown_819BDBB
+SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B
+	msgbox SaffronCity_Gym_Text_GymGuyPostVictory
 	release
 	end
 
-SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
+SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55
 	lockall
-	goto_if_set FLAG_BADGE06_GET, EventScript_16EF69
-	msgbox gUnknown_819BDFE
+	goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory
+	msgbox SaffronCity_Gym_Text_GymStatue
 	releaseall
 	end
 
-EventScript_16EF69:: @ 816EF69
-	msgbox gUnknown_819BE37
+SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69
+	msgbox SaffronCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc
index ed48d983f..827d4bbd5 100644
--- a/data/maps/SaffronCity_Gym/text.inc
+++ b/data/maps/SaffronCity_Gym/text.inc
@@ -1,4 +1,4 @@
-Text_19B53C:: @ 819B53C
+SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C
     .string "I had a vision of your arrival.\p"
     .string "I have had psychic powers since\n"
     .string "I was a child.\p"
@@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C
     .string "I dislike battling, but if you wish,\n"
     .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_19B602:: @ 819B602
+SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602
     .string "This loss shocks me!\n"
     .string "But, a loss is a loss.\p"
     .string "I admit, I didn't work hard enough\n"
@@ -15,13 +15,13 @@ Text_19B602:: @ 819B602
     .string "Your victory has earned you the\n"
     .string "MARSHBADGE.$"
 
-gUnknown_819B685:: @ 819B685
+SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685
     .string "Psychic power isn't something that\n"
     .string "only a few people have.\p"
     .string "Everyone has psychic power.\n"
     .string "People just don't realize it.$"
 
-gUnknown_819B6FA:: @ 819B6FA
+SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA
     .string "The MARSHBADGE makes POKéMON up\n"
     .string "to Lv. 70 obey you.\p"
     .string "Stronger POKéMON will become wild,\n"
@@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA
     .string "much to avoid that problem.\p"
     .string "Wait, please take this TM with you.$"
 
-gUnknown_819B7D3:: @ 819B7D3
+SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3
     .string "{PLAYER} received TM04 from\n"
     .string "SABRINA.$"
 
-gUnknown_819B7F2:: @ 819B7F2
+SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2
     .string "TM04 is CALM MIND.\p"
     .string "It makes the POKéMON concentrate\n"
     .string "to raise both SP. ATK and SP. DEF.$"
 
-gUnknown_819B849:: @ 819B849
+SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849
     .string "Your BAG is full of other items.$"
 
-Text_19B86A:: @ 819B86A
+SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A
     .string "SABRINA is far younger than I,\n"
     .string "but she has earned my respect.$"
 
-Text_19B8A8:: @ 819B8A8
+SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8
     .string "Not good enough!$"
 
-gUnknown_819B8B9:: @ 819B8B9
+SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9
     .string "In a battle of equals, the one\n"
     .string "with the stronger will wins.\p"
     .string "If you wish to beat SABRINA, focus\n"
     .string "and will yourself to victory.$"
 
-Text_19B936:: @ 819B936
+SaffronCity_Gym_Text_JohanIntro:: @ 819B936
     .string "Does our unseen power scare you?$"
 
-Text_19B957:: @ 819B957
+SaffronCity_Gym_Text_JohanDefeat:: @ 819B957
     .string "I never foresaw this!$"
 
-gUnknown_819B96D:: @ 819B96D
+SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D
     .string "PSYCHIC POKéMON fear only ghosts\n"
     .string "and bugs!$"
 
-Text_19B998:: @ 819B998
+SaffronCity_Gym_Text_StacyIntro:: @ 819B998
     .string "POKéMON take on the appearance of\n"
     .string "their TRAINERS.\p"
     .string "Your POKéMON must be tough, then!$"
 
-Text_19B9EC:: @ 819B9EC
+SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC
     .string "I knew it!$"
 
-gUnknown_819B9F7:: @ 819B9F7
+SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7
     .string "I have much to learn still…\p"
     .string "I must master PSYCHIC and teach it\n"
     .string "to my POKéMON…$"
 
-Text_19BA45:: @ 819BA45
+SaffronCity_Gym_Text_TyronIntro:: @ 819BA45
     .string "You understand, don't you?\p"
     .string "That power alone isn't enough to\n"
     .string "win in the world of POKéMON?$"
 
-Text_19BA9E:: @ 819BA9E
+SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E
     .string "I don't believe this!$"
 
-gUnknown_819BAB4:: @ 819BAB4
+SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4
     .string "SABRINA just wiped out the KARATE\n"
     .string "MASTER next door.$"
 
-Text_19BAE8:: @ 819BAE8
+SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8
     .string "You and I, our POKéMON shall\n"
     .string "battle!$"
 
-Text_19BB0D:: @ 819BB0D
+SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D
     .string "I lost after all!$"
 
-gUnknown_819BB1F:: @ 819BB1F
+SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F
     .string "I knew that this was going to take\n"
     .string "place.$"
 
-Text_19BB49:: @ 819BB49
+SaffronCity_Gym_Text_CameronIntro:: @ 819BB49
     .string "SABRINA is young, but she's also\n"
     .string "our highly skilled LEADER.\p"
     .string "You won't reach her easily!$"
 
-Text_19BBA1:: @ 819BBA1
+SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1
     .string "Ow!\n"
     .string "Down and out!$"
 
-gUnknown_819BBB3:: @ 819BBB3
+SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3
     .string "There used to be two POKéMON GYMS\n"
     .string "in SAFFRON.\p"
     .string "The FIGHTING DOJO next door lost\n"
@@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3
     .string "We simply creamed them when we\n"
     .string "decided to have just one GYM.$"
 
-Text_19BC57:: @ 819BC57
+SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57
     .string "SAFFRON POKéMON GYM is famous for\n"
     .string "training psychics.\p"
     .string "You want to see SABRINA, don't\n"
     .string "you? I can tell!$"
 
-Text_19BCBC:: @ 819BCBC
+SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC
     .string "Arrrgh!$"
 
-gUnknown_819BCC4:: @ 819BCC4
+SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4
     .string "That's right! I used telepathy to\n"
     .string "read your mind!$"
 
-gUnknown_819BCF6:: @ 819BCF6
+SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6
     .string "Yo!\n"
     .string "Champ in the making!\p"
     .string "SABRINA's POKéMON use psychic\n"
@@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6
     .string "They'll get destroyed before they\n"
     .string "can even aim a punch!$"
 
-gUnknown_819BDBB:: @ 819BDBB
+SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB
     .string "Psychic power, huh?\p"
     .string "If I had that, I'd make a bundle\n"
     .string "at the slots!$"
 
-gUnknown_819BDFE:: @ 819BDFE
+SaffronCity_Gym_Text_GymStatue:: @ 819BDFE
     .string "SAFFRON POKéMON GYM\n"
     .string "LEADER: SABRINA\p"
     .string "WINNING TRAINERS:\n"
     .string "{RIVAL}$"
 
-gUnknown_819BE37:: @ 819BE37
+SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37
     .string "SAFFRON POKéMON GYM\n"
     .string "LEADER: SABRINA\p"
     .string "WINNING TRAINERS:\n"
diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House/map.json
index 41fb0d809..48b569e5e 100644
--- a/data/maps/SaffronCity_House2/map.json
+++ b/data/maps/SaffronCity_House/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE2",
-  "name": "SaffronCity_House2",
+  "id": "MAP_SAFFRON_CITY_HOUSE",
+  "name": "SaffronCity_House",
   "layout": "LAYOUT_HOUSE5",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
       "movement_range_y": 4,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF86",
+      "script": "SaffronCity_House_EventScript_Pidgey",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF74",
+      "script": "SaffronCity_House_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF7D",
+      "script": "SaffronCity_House_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -96,7 +96,7 @@
       "x": 5,
       "y": 4,
       "elevation": 3,
-      "script": "SaffronCity_House2_EventScript_16EF99"
+      "script": "SaffronCity_House_EventScript_Letter"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc
new file mode 100644
index 000000000..d94baa8a0
--- /dev/null
+++ b/data/maps/SaffronCity_House/scripts.inc
@@ -0,0 +1,24 @@
+SaffronCity_House_MapScripts:: @ 816EF73
+	.byte 0
+
+SaffronCity_House_EventScript_Lass:: @ 816EF74
+	msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC
+	end
+
+SaffronCity_House_EventScript_Youngster:: @ 816EF7D
+	msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC
+	end
+
+SaffronCity_House_EventScript_Pidgey:: @ 816EF86
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIDGEY, 0
+	msgbox SaffronCity_House_Text_Pidgey
+	waitmoncry
+	release
+	end
+
+SaffronCity_House_EventScript_Letter:: @ 816EF99
+	msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN
+	end
diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House/text.inc
index 9558880b7..7d13c13fa 100644
--- a/data/maps/SaffronCity_House2/text.inc
+++ b/data/maps/SaffronCity_House/text.inc
@@ -1,17 +1,17 @@
-gUnknown_819BE74:: @ 819BE74
+SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74
     .string "…Thank you for writing.\n"
     .string "I hope to see you soon!\p"
     .string "…Hey!\n"
     .string "Don't look at my letter!$"
 
-gUnknown_819BEC3:: @ 819BEC3
+SaffronCity_House_Text_Pidgey:: @ 819BEC3
     .string "PIDGEY: Kurukkoo!$"
 
-gUnknown_819BED5:: @ 819BED5
+SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5
     .string "The COPYCAT is cute!\n"
     .string "I'm getting her a POKé DOLL.$"
 
-gUnknown_819BF07:: @ 819BF07
+SaffronCity_House_Text_ExplainPPUp:: @ 819BF07
     .string "I was given a PP UP as a gift.\p"
     .string "It's used to increase the PP of\n"
     .string "a POKéMON's move.\p"
diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc
deleted file mode 100644
index 2f4e435fa..000000000
--- a/data/maps/SaffronCity_House1_1F/scripts.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SaffronCity_House1_1F_MapScripts:: @ 816EB36
-	.byte 0
-
-SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37
-	msgbox gUnknown_819AB9B, MSGBOX_NPC
-	end
-
-SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40
-	msgbox gUnknown_819ABD7, MSGBOX_NPC
-	end
-
-SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_CHANSEY, 0
-	msgbox gUnknown_819AC4B
-	waitmoncry
-	release
-	end
diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc
deleted file mode 100644
index 04bedb057..000000000
--- a/data/maps/SaffronCity_House1_1F/text.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Text_19A9E7:: @ 819A9E7
-    .string "AGATHA's GHOST-type POKéMON are\n"
-    .string "horrifically terrifying in toughness.\p"
-    .string "I took my FIGHTING-type POKéMON\n"
-    .string "and raised them to the max.\p"
-    .string "I went at AGATHA feeling pretty\n"
-    .string "confident, but she whupped us.\p"
-    .string "That old lady's also got a really\n"
-    .string "short fuse, too.\p"
-    .string "It doesn't take anything to get\n"
-    .string "that scary lady hollering.$"
-
-Text_19AB16:: @ 819AB16
-    .string "Maybe becoming an ELITE FOUR\n"
-    .string "member is in the blood.\p"
-    .string "From what I've heard, LANCE has\n"
-    .string "a cousin who's a GYM LEADER\l"
-    .string "somewhere far away.$"
-
-gUnknown_819AB9B:: @ 819AB9B
-    .string "My daughter is so self-centered.\n"
-    .string "She has but a few friends.$"
-
-gUnknown_819ABD7:: @ 819ABD7
-    .string "My daughter likes to mimic people.\n"
-    .string "It's rather vexing.\p"
-    .string "Her mimicry has earned her the\n"
-    .string "nickname COPYCAT around here.$"
-
-gUnknown_819AC4B:: @ 819AC4B
-    .string "CHANSEY: Chaan! Sii!$"
-
diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc
deleted file mode 100644
index 17714d816..000000000
--- a/data/maps/SaffronCity_House1_2F/scripts.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SaffronCity_House1_2F_MapScripts:: @ 816EB5C
-	.byte 0
-
-SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_DODUO, 0
-	msgbox gUnknown_819B030
-	waitmoncry
-	release
-	end
-
-SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
-	lock
-	msgbox gUnknown_819B071
-	release
-	end
-
-SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
-	goto_if_questlog EventScript_ReleaseEnd
-	special sub_8112364
-	lock
-	faceplayer
-	checkitem ITEM_POKE_DOLL, 1
-	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_MimicTutor
-	checkplayergender
-	compare VAR_RESULT, MALE
-	call_if_eq EventScript_16EBB7
-	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_16EBC0
-	release
-	end
-
-EventScript_16EBB7:: @ 816EBB7
-	msgbox gUnknown_819AC60
-	return
-
-EventScript_16EBC0:: @ 816EBC0
-	msgbox gUnknown_819ACF1
-	return
-
-SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9
-	msgbox gUnknown_819B0D0, MSGBOX_SIGN
-	end
-
-SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2
-	msgbox gUnknown_819B0A0, MSGBOX_SIGN
-	end
diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc
deleted file mode 100644
index 03afb1a4c..000000000
--- a/data/maps/SaffronCity_House2/scripts.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SaffronCity_House2_MapScripts:: @ 816EF73
-	.byte 0
-
-SaffronCity_House2_EventScript_16EF74:: @ 816EF74
-	msgbox gUnknown_819BE74, MSGBOX_NPC
-	end
-
-SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D
-	msgbox gUnknown_819BED5, MSGBOX_NPC
-	end
-
-SaffronCity_House2_EventScript_16EF86:: @ 816EF86
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_PIDGEY, 0
-	msgbox gUnknown_819BEC3
-	waitmoncry
-	release
-	end
-
-SaffronCity_House2_EventScript_16EF99:: @ 816EF99
-	msgbox gUnknown_819BF07, MSGBOX_SIGN
-	end
diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc
deleted file mode 100644
index 9e177cccb..000000000
--- a/data/maps/SaffronCity_House3/scripts.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SaffronCity_House3_MapScripts:: @ 816F05E
-	.byte 0
-
-SaffronCity_House3_EventScript_16F05F:: @ 816F05F
-	lock
-	faceplayer
-	goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5
-	msgbox gUnknown_819C142
-	checkitemspace ITEM_TM29, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16F0AB
-	giveitem_msg gUnknown_819C16C, ITEM_TM29
-	msgbox gUnknown_819C18F
-	setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
-	release
-	end
-
-EventScript_16F0AB:: @ 816F0AB
-	msgbox gUnknown_819C1FC
-	release
-	end
-
-EventScript_16F0B5:: @ 816F0B5
-	msgbox gUnknown_819C18F
-	release
-	end
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
index 8f3bd6718..ddce0c6d9 100644
--- a/data/maps/SaffronCity_Mart/map.json
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFB5",
+      "script": "SaffronCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFAC",
+      "script": "SaffronCity_Mart_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFA3",
+      "script": "SaffronCity_Mart_EventScript_Lass",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc
index 5361c07a8..c00a93776 100644
--- a/data/maps/SaffronCity_Mart/scripts.inc
+++ b/data/maps/SaffronCity_Mart/scripts.inc
@@ -1,27 +1,27 @@
 SaffronCity_Mart_MapScripts:: @ 816EFA2
 	.byte 0
 
-SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3
-	msgbox gUnknown_819BFF1, MSGBOX_NPC
+SaffronCity_Mart_EventScript_Lass:: @ 816EFA3
+	msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC
 	end
 
-SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
-	msgbox gUnknown_819BF8F, MSGBOX_NPC
+SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC
+	msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC
 	end
 
-SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
+SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16EFDC
+	pokemart SaffronCity_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16EFDC:: @ 816EFDC
+SaffronCity_Mart_Items:: @ 816EFDC
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_REVIVE
diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc
index 5acbdbd9c..edf13f2fe 100644
--- a/data/maps/SaffronCity_Mart/text.inc
+++ b/data/maps/SaffronCity_Mart/text.inc
@@ -1,10 +1,10 @@
-gUnknown_819BF8F:: @ 819BF8F
+SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F
     .string "MAX REPEL keeps weaker POKéMON\n"
     .string "from appearing.\p"
     .string "MAX REPEL stays effective longer\n"
     .string "than SUPER REPEL.$"
 
-gUnknown_819BFF1:: @ 819BFF1
+SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1
     .string "REVIVE is costly, but it revives\n"
     .string "fainted POKéMON!$"
 
diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json
index 3d3e7410e..f1d121850 100644
--- a/data/maps/SaffronCity_House3/map.json
+++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE3",
-  "name": "SaffronCity_House3",
+  "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
+  "name": "SaffronCity_MrPsychicsHouse",
   "layout": "LAYOUT_HOUSE5",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House3_EventScript_16F05F",
+      "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
new file mode 100644
index 000000000..24bd51cc1
--- /dev/null
+++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
@@ -0,0 +1,26 @@
+SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E
+	.byte 0
+
+SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F
+	lock
+	faceplayer
+	goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29
+	msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis
+	checkitemspace ITEM_TM29, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29
+	giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29
+	msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
+	setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
+	release
+	end
+
+SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB
+	msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom
+	release
+	end
+
+SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5
+	msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
+	release
+	end
diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc
index 42699924f..31d220c69 100644
--- a/data/maps/SaffronCity_House3/text.inc
+++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc
@@ -1,18 +1,18 @@
-gUnknown_819C142:: @ 819C142
+SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142
     .string "…Wait! Don't say a word!\p"
     .string "You wanted this!$"
 
-gUnknown_819C16C:: @ 819C16C
+SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C
     .string "{PLAYER} received TM29\n"
     .string "from MR. PSYCHIC.$"
 
-gUnknown_819C18F:: @ 819C18F
+SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F
     .string "You already know, don't you?\n"
     .string "TM29 is PSYCHIC.\p"
     .string "It's an attack that may also lower\n"
     .string "the target's special stats.$"
 
-gUnknown_819C1FC:: @ 819C1FC
+SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC
     .string "Where do you plan to put this?\n"
     .string "You've no room.$"
 
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index bb78415b4..1d28ff69a 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
       "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
       "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
     }
   ],
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
index 8639de5af..b8e2385e6 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
@@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
 	setrespawn SPAWN_SAFFRON_CITY
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
+SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004
-	msgbox gUnknown_819C058, MSGBOX_NPC
+SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004
+	msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D
-	msgbox gUnknown_819C023, MSGBOX_NPC
+SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D
+	msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016
+SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_eq EventScript_16F02D
-	msgbox gUnknown_819C0B4
+	goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone
+	msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets
 	release
 	end
 
-EventScript_16F02D:: @ 816F02D
-	msgbox gUnknown_819C102
+SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D
+	msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff
 	release
 	end
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
index 8a3e43a10..51d64d42c 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc
+++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
@@ -1,19 +1,19 @@
-gUnknown_819C023:: @ 819C023
+SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023
     .string "POKéMON growth rates differ from\n"
     .string "species to species.$"
 
-gUnknown_819C058:: @ 819C058
+SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058
     .string "SILPH CO. is widely known to all.\p"
     .string "It's a victim of its own fame - it\n"
     .string "attracted TEAM ROCKET.$"
 
-gUnknown_819C0B4:: @ 819C0B4
+SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4
     .string "Sigh…\n"
     .string "Wouldn't this be great?\p"
     .string "If the ELITE FOUR came and\n"
     .string "stomped TEAM ROCKET?$"
 
-gUnknown_819C102:: @ 819C102
+SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102
     .string "TEAM ROCKET took off!\n"
     .string "We can go out safely again!\l"
     .string "That's great!$"
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index 979278cdb..f8f892dca 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
index ffb4678b2..8df872d7e 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
@@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF
 	.byte 0
 
 SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA
-	map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4
+	map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans
 	.2byte 0
 
-EventScript_16F0D4:: @ 816F0D4
+SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4
 	lockall
 	textcolor 1
 	applymovement 1, Movement_WalkInPlaceFastestDown
@@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4
 	waitmovement 0
 	applymovement 1, Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_819C22B
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou
 	closemessage
-	applymovement 1, Movement_16F124
+	applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_819C235
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
 	releaseall
 	end
 
-Movement_16F124:: @ 816F124
+SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124
 	delay_16
 	delay_8
 	walk_down
@@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124
 	walk_left
 	step_end
 
-Movement_16F12C:: @ 816F12C
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C
 	delay_8
 	walk_in_place_fastest_down
 	walk_down
@@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C
 	walk_left
 	step_end
 
-Movement_16F134:: @ 816F134
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134
 	walk_fast_left
 	walk_fast_left
 	walk_fast_down
@@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134
 	walk_fast_down
 	step_end
 
-Movement_16F13B:: @ 816F13B
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-Movement_16F13E:: @ 816F13E
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E
 	jump_in_place_right
 	walk_fast_up
 	walk_fast_up
@@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E
 
 SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
-	goto_if_eq EventScript_16F267
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
-	goto_if_eq EventScript_16F15B
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions
 	end
 
-EventScript_16F15B:: @ 816F15B
+SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B
 	special Special_TryLoseFansFromPlayTime
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F207
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER2
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F213
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER3
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F21F
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER4
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F22B
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER5
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F237
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER6
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F243
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER7
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F24F
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER8
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F25B
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-EventScript_16F207:: @ 816F207
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207
 	setobjectxyperm 1, 5, 2
 	setobjectmovementtype 1, 7
 	return
 
-EventScript_16F213:: @ 816F213
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213
 	setobjectxyperm 3, 7, 4
 	setobjectmovementtype 3, 9
 	return
 
-EventScript_16F21F:: @ 816F21F
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F
 	setobjectxyperm 4, 2, 2
 	setobjectmovementtype 4, 7
 	return
 
-EventScript_16F22B:: @ 816F22B
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B
 	setobjectxyperm 2, 3, 4
 	setobjectmovementtype 2, 10
 	return
 
-EventScript_16F237:: @ 816F237
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237
 	setobjectxyperm 6, 4, 6
 	setobjectmovementtype 6, 7
 	return
 
-EventScript_16F243:: @ 816F243
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243
 	setobjectxyperm 5, 10, 3
 	setobjectmovementtype 5, 7
 	return
 
-EventScript_16F24F:: @ 816F24F
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F
 	setobjectxyperm 7, 7, 5
 	setobjectmovementtype 7, 9
 	return
 
-EventScript_16F25B:: @ 816F25B
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B
 	setobjectxyperm 8, 9, 6
 	setobjectmovementtype 8, 9
 	return
 
-EventScript_16F267:: @ 816F267
-	call EventScript_16F22B
-	call EventScript_16F237
-	call EventScript_16F243
-	call EventScript_16F24F
-	call EventScript_16F25B
+SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F2EE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F2C0
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F2E4
-	msgbox gUnknown_819C420
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
 	release
 	end
 
-EventScript_16F2C0:: @ 816F2C0
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F2DA
-	msgbox gUnknown_819C390
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
 	release
 	end
 
-EventScript_16F2DA:: @ 816F2DA
-	msgbox gUnknown_819C3BD
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou
 	release
 	end
 
-EventScript_16F2E4:: @ 816F2E4
-	msgbox gUnknown_819C4A5
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe
 	release
 	end
 
-EventScript_16F2EE:: @ 816F2EE
-	msgbox gUnknown_819C55C
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER4
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F365
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F337
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F35B
-	msgbox gUnknown_819CBD3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina
 	release
 	end
 
-EventScript_16F337:: @ 816F337
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F351
-	msgbox gUnknown_819CB32
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay
 	release
 	end
 
-EventScript_16F351:: @ 816F351
-	msgbox gUnknown_819CB62
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan
 	release
 	end
 
-EventScript_16F35B:: @ 816F35B
-	msgbox gUnknown_819CC2B
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan
 	release
 	end
 
-EventScript_16F365:: @ 816F365
-	msgbox gUnknown_819CCC2
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
+SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER2
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F3DC
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F3AE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F3D2
-	msgbox gUnknown_819C6BA
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero
 	release
 	end
 
-EventScript_16F3AE:: @ 816F3AE
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F3C8
-	msgbox gUnknown_819C5A9
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts
 	release
 	end
 
-EventScript_16F3C8:: @ 816F3C8
-	msgbox gUnknown_819C600
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou
 	release
 	end
 
-EventScript_16F3D2:: @ 816F3D2
-	msgbox gUnknown_819C73A
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd
 	release
 	end
 
-EventScript_16F3DC:: @ 816F3DC
-	msgbox gUnknown_819C7C8
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
+SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER3
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F453
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F425
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F449
-	msgbox gUnknown_819C986
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre
 	release
 	end
 
-EventScript_16F425:: @ 816F425
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F43F
-	msgbox gUnknown_819C81E
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle
 	release
 	end
 
-EventScript_16F43F:: @ 816F43F
-	msgbox gUnknown_819C8C1
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence
 	release
 	end
 
-EventScript_16F449:: @ 816F449
-	msgbox gUnknown_819C9D5
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo
 	release
 	end
 
-EventScript_16F453:: @ 816F453
-	msgbox gUnknown_819CA7C
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
+SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER6
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F491
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F4B5
-	msgbox gUnknown_819D01F
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire
 	release
 	end
 
-EventScript_16F491:: @ 816F491
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F4AB
-	msgbox gUnknown_819CEDF
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle
 	release
 	end
 
-EventScript_16F4AB:: @ 816F4AB
-	msgbox gUnknown_819CF6D
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan
 	release
 	end
 
-EventScript_16F4B5:: @ 816F4B5
-	msgbox gUnknown_819D075
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
+SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER5
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F4F3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F517
-	msgbox gUnknown_819CDDA
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks
 	release
 	end
 
-EventScript_16F4F3:: @ 816F4F3
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F50D
-	msgbox gUnknown_819CCF3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool
 	release
 	end
 
-EventScript_16F50D:: @ 816F50D
-	msgbox gUnknown_819CD4E
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans
 	release
 	end
 
-EventScript_16F517:: @ 816F517
-	msgbox gUnknown_819CE3A
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
+SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER7
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F555
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F579
-	msgbox gUnknown_819D1AE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity
 	release
 	end
 
-EventScript_16F555:: @ 816F555
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F56F
-	msgbox gUnknown_819D0E3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing
 	release
 	end
 
-EventScript_16F56F:: @ 816F56F
-	msgbox gUnknown_819D148
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan
 	release
 	end
 
-EventScript_16F579:: @ 816F579
-	msgbox gUnknown_819D211
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER8
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F5B7
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F5DB
-	msgbox gUnknown_819D3D2
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect
 	release
 	end
 
-EventScript_16F5B7:: @ 816F5B7
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F5D1
-	msgbox gUnknown_819D2B4
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational
 	release
 	end
 
-EventScript_16F5D1:: @ 816F5D1
-	msgbox gUnknown_819D31F
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan
 	release
 	end
 
-EventScript_16F5DB:: @ 816F5DB
-	msgbox gUnknown_819D477
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster
 	release
 	end
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
index ecbf0b024..fb9358c70 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
@@ -1,8 +1,8 @@
-gUnknown_819C22B:: @ 819C22B
+SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B
     .string "Huh?\n"
     .string "You…$"
 
-gUnknown_819C235:: @ 819C235
+SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235
     .string "Are you maybe…\n"
     .string "… …\p"
     .string "You are!\n"
@@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235
     .string "That way, maybe other people will\n"
     .string "become fans just like me.$"
 
-gUnknown_819C390:: @ 819C390
+SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390
     .string "I'll always be cheering for you!\p"
     .string "Go, {PLAYER}, go!$"
 
-gUnknown_819C3BD:: @ 819C3BD
+SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD
     .string "I'll always believe in you,\n"
     .string "{PLAYER}.\p"
     .string "Please show the others what you're\n"
     .string "like when you battle seriously.$"
 
-gUnknown_819C420:: @ 819C420
+SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420
     .string "I'm sorry.\n"
     .string "I was your fan before.\p"
     .string "But now, you seem to have lost\n"
@@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420
     .string "Lately, I think {STR_VAR_1} has been\n"
     .string "a lot cooler.$"
 
-gUnknown_819C4A5:: @ 819C4A5
+SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5
     .string "Oh!\n"
     .string "{PLAYER}!\p"
     .string "Everyone's been all excited about\n"
@@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5
     .string "Once I became {STR_VAR_1}'s fan,\n"
     .string "I can't just stop being a fan.$"
 
-gUnknown_819C55C:: @ 819C55C
+SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C
     .string "I think TRAINERS are so cool when\n"
     .string "they're battling.\p"
     .string "Don't you think so, too?$"
 
-gUnknown_819C5A9:: @ 819C5A9
+SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9
     .string "Oh! It's {PLAYER}!\n"
     .string "Too cool!\p"
     .string "Oh!\n"
@@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9
     .string "Can you autograph something?\n"
     .string "How about my shorts?$"
 
-gUnknown_819C600:: @ 819C600
+SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600
     .string "However hot it's been…\p"
     .string "And however cold it may get…\p"
     .string "I've always believed in, and worn,\n"
@@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600
     .string "I believe in you just as much as\n"
     .string "I believe in shorts!$"
 
-gUnknown_819C6BA:: @ 819C6BA
+SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA
     .string "BROCK's my hero!\n"
     .string "He's a man among men!\p"
     .string "Heheh, I got my mom to do\n"
@@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA
     .string "I got her to embroider “BROCK”\n"
     .string "on my shorts!$"
 
-gUnknown_819C73A:: @ 819C73A
+SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A
     .string "…  …\p"
     .string "…  …\n"
     .string "I'm BROCK's fan!\p"
@@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A
     .string "and on my shorts!\p"
     .string "I'll be his fan to the bitter end!$"
 
-gUnknown_819C7C8:: @ 819C7C8
+SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8
     .string "BROCK's the last word on cool,\n"
     .string "end of story!\p"
     .string "Now there's a guy who I want to\n"
     .string "be like!$"
 
-gUnknown_819C81E:: @ 819C81E
+SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E
     .string "{PLAYER}, I've had the pleasure of\n"
     .string "watching you battle.\p"
     .string "It brings back sweet memories of\n"
@@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E
     .string "May you continue to find success.\n"
     .string "You have a fan in me!$"
 
-gUnknown_819C8C1:: @ 819C8C1
+SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1
     .string "I have journeyed far and wide\n"
     .string "across the lands.\p"
     .string "But never have I seen a TRAINER\n"
@@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1
     .string "Make that a promise to me,\n"
     .string "my young idol!$"
 
-gUnknown_819C986:: @ 819C986
+SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986
     .string "Hmm…\n"
     .string "And you are?\p"
     .string "Were you hoping to sign up for\n"
     .string "a membership in our FAN CLUB?$"
 
-gUnknown_819C9D5:: @ 819C9D5
+SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5
     .string "Ah, so you are the much-\n"
     .string "talked-about {PLAYER}.\p"
     .string "You certainly do have the look of\n"
@@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5
     .string "… …\p"
     .string "You've still a ways to go!$"
 
-gUnknown_819CA7C:: @ 819CA7C
+SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C
     .string "All of us gathered here are fans\n"
     .string "of POKéMON TRAINERS.\p"
     .string "The way they look in battle…\n"
@@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C
     .string "Perhaps you will be talked about\n"
     .string "here, too, if you keep winning.$"
 
-gUnknown_819CB32:: @ 819CB32
+SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32
     .string "It's {PLAYER}!\n"
     .string "It's {PLAYER}!\p"
     .string "I want to be like {PLAYER} one day!$"
 
-gUnknown_819CB62:: @ 819CB62
+SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62
     .string "Everyone stopped being {PLAYER}'s\n"
     .string "fan…\p"
     .string "But that means I can have {PLAYER}\n"
@@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62
     .string "Yay! Go for it!\n"
     .string "My one and only {PLAYER}!$"
 
-gUnknown_819CBD3:: @ 819CBD3
+SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3
     .string "Do you know what?\n"
     .string "I want to be like SABRINA!\p"
     .string "I want to be a psychic girl just\n"
     .string "like her!$"
 
-gUnknown_819CC2B:: @ 819CC2B
+SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B
     .string "Even if I'm the only one, I won't\n"
     .string "stop being SABRINA's fan.\p"
     .string "My dream is to be like SABRINA,\n"
@@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B
     .string "I want to be a psychic girl just\n"
     .string "like her!$"
 
-gUnknown_819CCC2:: @ 819CCC2
+SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2
     .string "I wonder if I can become a cool\n"
     .string "TRAINER one day?$"
 
-gUnknown_819CCF3:: @ 819CCF3
+SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3
     .string "Oh, man, oh, man!\n"
     .string "Cool! Too cool!\p"
     .string "…Huh?\n"
@@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3
     .string "Just the way you battle.\n"
     .string "That's cool.$"
 
-gUnknown_819CD4E:: @ 819CD4E
+SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E
     .string "Yo, {PLAYER}!\p"
     .string "Looks like I'm the only one left\n"
     .string "out of your fans.\p"
@@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E
     .string "fan… It's less stressful.\p"
     .string "Keep up and at it!$"
 
-gUnknown_819CDDA:: @ 819CDDA
+SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA
     .string "{STR_VAR_1}'s cool, huh?\n"
     .string "I love the way he talks.\p"
     .string "I'd really relish a chance to meet\n"
     .string "him in person once.$"
 
-gUnknown_819CE3A:: @ 819CE3A
+SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A
     .string "Huh, can you believe it?\n"
     .string "Everyone turned into your fans.\p"
     .string "So after all we've been through,\n"
@@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A
     .string "Eh, being the one and only\n"
     .string "{STR_VAR_1} fan's my style, anyway.$"
 
-gUnknown_819CEDF:: @ 819CEDF
+SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF
     .string "Oh, my goodness!\n"
     .string "Is it really you, {PLAYER}?\p"
     .string "I have to tell you, I adore the\n"
@@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF
     .string "I hope you'll keep at it.\n"
     .string "I'll be your number one fan!$"
 
-gUnknown_819CF6D:: @ 819CF6D
+SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D
     .string "Oh, my goodness!\n"
     .string "If it isn't {PLAYER}!\p"
     .string "It's so disappointing… I realized\n"
@@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D
     .string "Let me cheer you on, at least!\p"
     .string "Hurray, hurray, {PLAYER}!$"
 
-gUnknown_819D01F:: @ 819D01F
+SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F
     .string "Recently, {STR_VAR_1} has been on\n"
     .string "fire.\p"
     .string "The way he battles… It's just \n"
     .string "the way that I like it!$"
 
-gUnknown_819D075:: @ 819D075
+SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075
     .string "Oh, hello!\n"
     .string "If it isn't {PLAYER}!\p"
     .string "Lately, all everyone talks about\n"
@@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075
     .string "I'm feeling lonesome because I\n"
     .string "prefer {STR_VAR_1}.$"
 
-gUnknown_819D0E3:: @ 819D0E3
+SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3
     .string "Amazing!\n"
     .string "{PLAYER}, you really are amazing!\p"
     .string "Instead of just watching, maybe\n"
     .string "I should become a TRAINER, too.$"
 
-gUnknown_819D148:: @ 819D148
+SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148
     .string "I'm your only fan…\n"
     .string "Sigh… This is lonely…\p"
     .string "Can't you try harder and make the\n"
     .string "others take notice of you?$"
 
-gUnknown_819D1AE:: @ 819D1AE
+SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE
     .string "Master {STR_VAR_1} is so dignified…\n"
     .string "He is so my type.\p"
     .string "Why can't the others see the\n"
     .string "dignity he simply oozes?$"
 
-gUnknown_819D211:: @ 819D211
+SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211
     .string "I believe in Master {STR_VAR_1}\n"
     .string "with all my heart.\p"
     .string "Even if I am the only one to\n"
@@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211
     .string "Not if I keep thinking about Master\n"
     .string "{STR_VAR_1}.$"
 
-gUnknown_819D2B4:: @ 819D2B4
+SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4
     .string "Hiyah!\p"
     .string "Your battling style is most\n"
     .string "educational.\p"
     .string "I hope that you will keep plugging\n"
     .string "away at success, hiyah!$"
 
-gUnknown_819D31F:: @ 819D31F
+SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F
     .string "Instead of just watching others\n"
     .string "battle, battle yourself!\p"
     .string "…My DOJO's MASTER chewed me out\n"
@@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F
     .string "being your fan!\p"
     .string "I can't stop being your fan!$"
 
-gUnknown_819D3D2:: @ 819D3D2
+SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2
     .string "Hiyah! There is but one TRAINER\n"
     .string "who has my respect.\p"
     .string "And that is none other than my\n"
@@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2
     .string "You should become a fan of my\n"
     .string "MASTER like me! Hiyah!$"
 
-gUnknown_819D477:: @ 819D477
+SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477
     .string "Hiyah! I respect my MASTER at the\n"
     .string "FIGHTING DOJO.\p"
     .string "I will never become a fan of\n"
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index 60183ed13..8875211f8 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 4, 2
 	setobjectmovementtype 1, 8
-	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C
+	setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
 	return
 
 EventScript_1708C3:: @ 81708C3
diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc
index 3d728797a..21c87dbc0 100644
--- a/data/maps/SevenIsland_SevaultCanyon/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon/text.inc
@@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B
     .string "SEVAULT CANYON\n"
     .string "TANOBY RUINS AHEAD$"
 
+Text_18CF4D:: @ 818CF4D
+    .string "Training by oneself is certainly\n"
+    .string "not a bad thing.\p"
+    .string "But it's also not bad to aim for\n"
+    .string "the top with a partner.\p"
+    .string "Even BRUNO…\n"
+    .string "He trained with a fellow by the\l"
+    .string "name of BRAWLY before.$"
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index b768509fb..6c16bf0c0 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_7",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_6",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
index 8758f8517..70ef487b8 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
@@ -1,10 +1,12 @@
+.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8
+
 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition
 	.byte 0
 
 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
-	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07
+	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setvar VAR_TEMP_5, 0
 	setvar VAR_TEMP_6, 0
 	setvar VAR_TEMP_7, 0
-	setvar VAR_TEMP_8, 0
+	setvar NUM_SWITCHES_PRESSED, 0
 	end
 
-EventScript_164E07:: @ 8164E07
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07
 	setobjectxyperm 1, 7, 2
 	setobjectxyperm 2, 4, 4
 	setobjectxyperm 3, 10, 4
@@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07
 	setobjectxyperm 7, 9, 8
 	return
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39
 	lockall
 	compare VAR_TEMP_1, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_1, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C
 	lockall
 	compare VAR_TEMP_2, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_2, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F
 	lockall
 	compare VAR_TEMP_3, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_3, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2
 	lockall
 	compare VAR_TEMP_4, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_4, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5
 	lockall
 	compare VAR_TEMP_5, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_5, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8
 	lockall
 	compare VAR_TEMP_6, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_6, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B
 	lockall
 	compare VAR_TEMP_7, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_7, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-EventScript_164F2E:: @ 8164F2E
-	addvar VAR_TEMP_8, 1
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
+	addvar NUM_SWITCHES_PRESSED, 1
 	playse SE_TRACK_MOVE
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
@@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E
 	delay 60
 	return
 
-EventScript_164F51:: @ 8164F51
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
@@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51
 	waitse
 	return
 
-EventScript_164F8A:: @ 8164F8A
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A
 	releaseall
 	end
 
-EventScript_164F8C:: @ 8164F8C
-	call EventScript_164F51
-	msgbox gUnknown_817D31B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen
+	msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway
 	setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
 	releaseall
 	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
index c6f137869..f86669ce4 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817D31B:: @ 817D31B
+SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B
     .string "A mysterious rumble echoed\n"
     .string "somewhere far away.$"
 
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
index 42c643af5..3f50db9fe 100644
--- a/data/maps/SevenIsland_TanobyRuins/map.json
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -29,7 +29,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D",
+      "script": "SevenIsland_TanobyRuins_EventScript_Brandon",
       "flag": "0"
     },
     {
@@ -42,7 +42,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B",
+      "script": "SevenIsland_TanobyRuins_EventScript_Benjamin",
       "flag": "0"
     },
     {
@@ -55,7 +55,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9",
+      "script": "SevenIsland_TanobyRuins_EventScript_Edna",
       "flag": "0"
     },
     {
@@ -68,7 +68,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACD07",
+      "script": "SevenIsland_TanobyRuins_EventScript_Clifford",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc
new file mode 100644
index 000000000..a5453f527
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins/text.inc
@@ -0,0 +1,52 @@
+SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB
+    .string "Do you know anything about this\n"
+    .string "stone chamber?$"
+
+SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A
+    .string "That was uncalled for.\n"
+    .string "You didn't have to be so rough.$"
+
+SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061
+    .string "The TANOBY RUINS date back at\n"
+    .string "least 1,500 years.\p"
+    .string "But it's a baffling mystery as to\n"
+    .string "why it was built in the first place.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9
+    .string "A mystic POKéMON is said to sleep\n"
+    .string "inside here.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108
+    .string "I'm not much good in battle.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125
+    .string "I hear there are other ruins like\n"
+    .string "the one here.\p"
+    .string "Might they be the resting places\n"
+    .string "of other mystic POKéMON?$"
+
+SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F
+    .string "CLIFFORD is teaching me how to\n"
+    .string "paint.$"
+
+SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5
+    .string "We might get in trouble for being\n"
+    .string "noisy here.$"
+
+SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3
+    .string "I said that I wanted to paint an\n"
+    .string "old building.\p"
+    .string "So CLIFFORD brought me here.$"
+
+SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F
+    .string "Today, in addition to our lesson,\n"
+    .string "we came to see the chamber.$"
+
+SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D
+    .string "My, how extraordinary.$"
+
+SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284
+    .string "Ah, so you are studying POKéMON\n"
+    .string "on your own…\p"
+    .string "Yes, you certainly are quite the\n"
+    .string "extraordinary person, indeed.$"
diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
index 847ae472a..0646e661d 100644
--- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6
 	.byte 0
 
 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
index b982b77dd..8a606a2c3 100644
--- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE
 	.byte 0
 
 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
index d467f79ef..819b2bbc1 100644
--- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
@@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF
 
 SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
index 2f3d604c3..e29694d8f 100644
--- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E
 	.byte 0
 
 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
index dd1a73f83..4917ecdf8 100644
--- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02
 	.byte 0
 
 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
index 131a6ecca..f1a13adcb 100644
--- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A
 	.byte 0
 
 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
index ff6c851ee..3a7720b4c 100644
--- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA
 	.byte 0
 
 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index 47fb5fa98..31a250297 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -51,7 +51,7 @@
       "x": 58,
       "y": 7,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_map": "MAP_TRAINER_TOWER_LOBBY",
       "dest_warp_id": 1
     }
   ],
diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
deleted file mode 100644
index 4987c1142..000000000
--- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8
-	call EventScript_1C52F4
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE
-	call EventScript_1C533B
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4
-	call EventScript_1C5382
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA
-	call EventScript_1C538C
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
deleted file mode 100644
index 9e61d0dfd..000000000
--- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6
-	call EventScript_1C52F4
-	end
-
-EventScript_1646FC:: @ 81646FC
-	call EventScript_1C533B
-	end
-
-EventScript_164702:: @ 8164702
-	call EventScript_1C5382
-	end
-
-EventScript_164708:: @ 8164708
-	call EventScript_1C538C
-	end
-
-EventScript_16470E:: @ 816470E
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
deleted file mode 100644
index e9afcff6c..000000000
--- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724
-	call EventScript_1C52F4
-	end
-
-EventScript_16472A:: @ 816472A
-	call EventScript_1C533B
-	end
-
-EventScript_164730:: @ 8164730
-	call EventScript_1C5382
-	end
-
-EventScript_164736:: @ 8164736
-	call EventScript_1C538C
-	end
-
-EventScript_16473C:: @ 816473C
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
deleted file mode 100644
index cfa0be11b..000000000
--- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752
-	call EventScript_1C52F4
-	end
-
-EventScript_164758:: @ 8164758
-	call EventScript_1C533B
-	end
-
-EventScript_16475E:: @ 816475E
-	call EventScript_1C5382
-	end
-
-EventScript_164764:: @ 8164764
-	call EventScript_1C538C
-	end
-
-EventScript_16476A:: @ 816476A
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
deleted file mode 100644
index 35ccdf129..000000000
--- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780
-	call EventScript_1C52F4
-	end
-
-EventScript_164786:: @ 8164786
-	call EventScript_1C533B
-	end
-
-EventScript_16478C:: @ 816478C
-	call EventScript_1C5382
-	end
-
-EventScript_164792:: @ 8164792
-	call EventScript_1C538C
-	end
-
-EventScript_164798:: @ 8164798
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
deleted file mode 100644
index abaab80d6..000000000
--- a/data/maps/SevenIsland_TrainerTower_6F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
-  "name": "SevenIsland_TrainerTower_6F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
deleted file mode 100644
index 361c92749..000000000
--- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE
-	call EventScript_1C52F4
-	end
-
-EventScript_1647B4:: @ 81647B4
-	call EventScript_1C533B
-	end
-
-EventScript_1647BA:: @ 81647BA
-	call EventScript_1C5382
-	end
-
-EventScript_1647C0:: @ 81647C0
-	call EventScript_1C538C
-	end
-
-EventScript_1647C6:: @ 81647C6
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
deleted file mode 100644
index 827c6c9ca..000000000
--- a/data/maps/SevenIsland_TrainerTower_7F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-  "name": "SevenIsland_TrainerTower_7F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
deleted file mode 100644
index be0036605..000000000
--- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC
-	call EventScript_1C52F4
-	end
-
-EventScript_1647E2:: @ 81647E2
-	call EventScript_1C533B
-	end
-
-EventScript_1647E8:: @ 81647E8
-	call EventScript_1C5382
-	end
-
-EventScript_1647EE:: @ 81647EE
-	call EventScript_1C538C
-	end
-
-EventScript_1647F4:: @ 81647F4
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
deleted file mode 100644
index ed9ba908f..000000000
--- a/data/maps/SevenIsland_TrainerTower_8F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
-  "name": "SevenIsland_TrainerTower_8F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
deleted file mode 100644
index b51982f48..000000000
--- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A
-	call EventScript_1C52F4
-	end
-
-EventScript_164810:: @ 8164810
-	call EventScript_1C533B
-	end
-
-EventScript_164816:: @ 8164816
-	call EventScript_1C5382
-	end
-
-EventScript_16481C:: @ 816481C
-	call EventScript_1C538C
-	end
-
-EventScript_164822:: @ 8164822
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
deleted file mode 100644
index f84c67295..000000000
--- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
-	lockall
-	setvar VAR_0x8004, 6
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
-	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
-	message Text_WantWhichFloor
-	waitmessage
-	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
-	switch VAR_RESULT
-	case 0, EventScript_164B46
-	case 1, EventScript_164B52
-	end
-
-EventScript_164B46:: @ 8164B46
-	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
-	goto EventScript_164B5E
-	end
-
-EventScript_164B52:: @ 8164B52
-	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
-	goto EventScript_164B5E
-	end
-
-EventScript_164B5E:: @ 8164B5E
-	switch VAR_RESULT
-	case 0, EventScript_164BCD
-	case 1, EventScript_164B90
-	case 2, EventScript_164BD3
-	case 127, EventScript_164BD3
-	end
-
-EventScript_164B90:: @ 8164B90
-	setvar VAR_0x8006, 3
-	setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
-	compare VAR_ELEVATOR_FLOOR, 3
-	goto_if_eq EventScript_164BD3
-	call EventScript_164BD8
-	setvar VAR_ELEVATOR_FLOOR, 3
-	special Special_CloseElevatorCurrentFloorWindow
-	delay 25
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5
-	waitmovement 0
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
-	waitstate
-	releaseall
-	end
-
-EventScript_164BCD:: @ 8164BCD
-	goto EventScript_164BD3
-	end
-
-EventScript_164BD3:: @ 8164BD3
-	special Special_CloseElevatorCurrentFloorWindow
-	releaseall
-	end
-
-EventScript_164BD8:: @ 8164BD8
-	special Special_CloseElevatorCurrentFloorWindow
-	closemessage
-	waitse
-	special Special_AnimateElevator
-	waitstate
-	setflag FLAG_TEMP_2
-	return
-
-Movement_164BE5:: @ 8164BE5
-	walk_in_place_fastest_down
-	delay_16
-	walk_down
-	walk_right
-	walk_right
-	walk_down
-	step_end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
deleted file mode 100644
index 0558b5a8b..000000000
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ /dev/null
@@ -1,235 +0,0 @@
-SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame
-	.byte 0
-
-SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853
-	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 10
-	special sub_815D9E8
-	setvar VAR_0x8004, 18
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164886
-	setvar VAR_TEMP_0, 0
-	setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-
-EventScript_164886:: @ 8164886
-	end
-
-SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887
-	addobject 1
-	addobject 2
-	addobject 3
-	addobject 4
-	addobject 5
-	end
-
-SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897
-	compare VAR_TEMP_D, 17
-	call_if_eq EventScript_1648A3
-	end
-
-EventScript_1648A3:: @ 81648A3
-	setmetatile 17, 10, 647, 0
-	return
-
-SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD
-	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY
-	getplayerxy VAR_TEMP_D, VAR_RESULT
-	end
-
-SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6
-	map_script_2 VAR_TEMP_0, 0, EventScript_1648ED
-	map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8
-	.2byte 0
-
-EventScript_1648C8:: @ 81648C8
-	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA
-	waitmovement 0
-	setmetatile 17, 10, 692, 1
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	waitse
-	setvar VAR_TEMP_D, 0
-	releaseall
-	end
-
-Movement_1648EA:: @ 81648EA
-	walk_down
-	walk_down
-	step_end
-
-EventScript_1648ED:: @ 81648ED
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 12
-	special sub_815D9E8
-	switch VAR_RESULT
-	case 0, EventScript_164920
-	case 1, EventScript_164938
-	case 2, EventScript_16495C
-
-EventScript_164920:: @ 8164920
-	lock
-	faceplayer
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C937
-	goto EventScript_16494B
-
-EventScript_164938:: @ 8164938
-	lock
-	faceplayer
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C9C0
-
-EventScript_16494B:: @ 816494B
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
-	waitmovement 0
-	setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
-	release
-
-EventScript_16495C:: @ 816495C
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D
-	lock
-	faceplayer
-	call EventScript_PkmnCenterNurse
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966
-	lock
-	faceplayer
-	setvar VAR_0x8004, 20
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_164988
-	msgbox gUnknown_817C9A2
-	goto EventScript_164990
-
-EventScript_164988:: @ 8164988
-	msgbox gUnknown_817CE1F
-
-EventScript_164990:: @ 8164990
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
-	goto_if_questlog EventScript_ReleaseEnd
-	lock
-	faceplayer
-	message Text_MayIHelpYou
-	waitmessage
-	pokemart Items_1649B8
-	msgbox Text_PleaseComeAgain
-	release
-	end
-
-	.align 2
-Items_1649B8:: @ 81649B8
-	.2byte ITEM_ULTRA_BALL
-	.2byte ITEM_GREAT_BALL
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_REVIVE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_ESCAPE_ROPE
-	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE
-	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C794
-	setvar VAR_0x8004, 17
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164A00
-	msgbox gUnknown_817C7D9
-	goto EventScript_164A08
-
-EventScript_164A00:: @ 8164A00
-	msgbox gUnknown_817C850
-
-EventScript_164A08:: @ 8164A08
-	message Text_17C88D
-	waitmessage
-	multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_164A53
-	case 1, EventScript_164ABF
-	case 2, EventScript_164A45
-	case 127, EventScript_164ABF
-	end
-
-EventScript_164A45:: @ 8164A45
-	msgbox gUnknown_817CCC9
-	goto EventScript_164A08
-	end
-
-EventScript_164A53:: @ 8164A53
-	multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_164AA0
-	case 1, EventScript_164AA0
-	case 2, EventScript_164AA0
-	case 3, EventScript_164AA0
-	case 4, EventScript_164ABF
-	case 127, EventScript_164ABF
-	end
-
-EventScript_164AA0:: @ 8164AA0
-	copyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
-	special HealPlayerParty
-	msgbox gUnknown_817C8BF
-	setvar VAR_0x8004, 6
-	special sub_815D9E8
-	releaseall
-	end
-
-EventScript_164ABF:: @ 8164ABF
-	msgbox gUnknown_817C91D
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
-	waitmovement 0
-	releaseall
-	end
-
-Movement_164AD4:: @ 8164AD4
-	face_right
-	step_end
-
-Movement_164AD6:: @ 8164AD6
-	walk_down
-	step_end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
-	lockall
-	fadescreen FADE_TO_BLACK
-	setvar VAR_0x8004, 1
-	special Special_BattleRecords
-	waitstate
-	releaseall
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6
-	msgbox gUnknown_817CE38, MSGBOX_NPC
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF
-	msgbox gUnknown_817CE9F, MSGBOX_NPC
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
deleted file mode 100644
index 6ae4ed2be..000000000
--- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index 7d71b3b26..bebe3f71e 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_10F_EventScript_161DC0",
+      "script": "SilphCo_10F_EventScript_Travis",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_10F_EventScript_161D96",
+      "script": "SilphCo_10F_EventScript_WorkerF",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_10F_EventScript_161DD7",
+      "script": "SilphCo_10F_EventScript_Grunt",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -181,7 +181,7 @@
       "x": 7,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_10F_EventScript_161DB7"
+      "script": "SilphCo_10F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc
index a0ab7219b..20d98d291 100644
--- a/data/maps/SilphCo_10F/scripts.inc
+++ b/data/maps/SilphCo_10F/scripts.inc
@@ -6,30 +6,30 @@ SilphCo_10F_OnLoad:: @ 8161D8C
 	call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor
 	end
 
-SilphCo_10F_EventScript_161D96:: @ 8161D96
+SilphCo_10F_EventScript_WorkerF:: @ 8161D96
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161DAD
-	msgbox gUnknown_8176DBA
+	goto_if_ge SilphCo_10F_EventScript_WorkerFRocketsGone
+	msgbox SilphCo_10F_Text_WaaaImScared
 	release
 	end
 
-EventScript_161DAD:: @ 8161DAD
-	msgbox gUnknown_8176DCE
+SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD
+	msgbox SilphCo_10F_Text_KeepMeCryingASecret
 	release
 	end
 
-SilphCo_10F_EventScript_161DB7:: @ 8161DB7
-	msgbox gUnknown_8176DF8, MSGBOX_SIGN
+SilphCo_10F_EventScript_FloorSign:: @ 8161DB7
+	msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_10F_EventScript_161DC0:: @ 8161DC0
-	trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73
-	msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE
+SilphCo_10F_EventScript_Travis:: @ 8161DC0
+	trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat
+	msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_10F_EventScript_161DD7:: @ 8161DD7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18
-	msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE
+SilphCo_10F_EventScript_Grunt:: @ 8161DD7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat
+	msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc
index a910cd435..ac8483558 100644
--- a/data/maps/SilphCo_10F/text.inc
+++ b/data/maps/SilphCo_10F/text.inc
@@ -1,33 +1,33 @@
-Text_176CED:: @ 8176CED
+SilphCo_10F_Text_GruntIntro:: @ 8176CED
     .string "Welcome to 10F!\n"
     .string "So good of you to join me!$"
 
-Text_176D18:: @ 8176D18
+SilphCo_10F_Text_GruntDefeat:: @ 8176D18
     .string "I'm stunned!$"
 
-gUnknown_8176D25:: @ 8176D25
+SilphCo_10F_Text_GruntPostBattle:: @ 8176D25
     .string "Nice try, but the boardroom is up\n"
     .string "one more floor.$"
 
-Text_176D57:: @ 8176D57
+SilphCo_10F_Text_TravisIntro:: @ 8176D57
     .string "Enough of your silly games!$"
 
-Text_176D73:: @ 8176D73
+SilphCo_10F_Text_TravisDefeat:: @ 8176D73
     .string "No continues left!$"
 
-gUnknown_8176D86:: @ 8176D86
+SilphCo_10F_Text_TravisPostBattle:: @ 8176D86
     .string "Are you satisfied with beating me?\n"
     .string "Then go on home!$"
 
-gUnknown_8176DBA:: @ 8176DBA
+SilphCo_10F_Text_WaaaImScared:: @ 8176DBA
     .string "Waaaaa!\n"
     .string "I'm scared!$"
 
-gUnknown_8176DCE:: @ 8176DCE
+SilphCo_10F_Text_KeepMeCryingASecret:: @ 8176DCE
     .string "About me crying…\n"
     .string "Please keep it a secret.$"
 
-gUnknown_8176DF8:: @ 8176DF8
+SilphCo_10F_Text_FloorSign:: @ 8176DF8
     .string "SILPH CO. HEAD OFFICE\n"
     .string "10F$"
 
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 89a1a8bf3..19b187c08 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_11F_EventScript_161DFE",
+      "script": "SilphCo_11F_EventScript_President",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_11F_EventScript_161E7F",
+      "script": "SilphCo_11F_EventScript_Secretary",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_11F_EventScript_161F40",
+      "script": "SilphCo_11F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_11F_EventScript_161F57",
+      "script": "SilphCo_11F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -123,7 +123,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_11F",
       "var_value": 0,
-      "script": "SilphCo_11F_EventScript_161E88"
+      "script": "SilphCo_11F_EventScript_GiovanniTriggerLeft"
     },
     {
       "type": "trigger",
@@ -132,7 +132,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_11F",
       "var_value": 0,
-      "script": "SilphCo_11F_EventScript_161E94"
+      "script": "SilphCo_11F_EventScript_GiovanniTriggerRight"
     }
   ],
   "bg_events": [
@@ -179,7 +179,7 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_11F_EventScript_161F37"
+      "script": "SilphCo_11F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
index 05f52646e..38de05842 100644
--- a/data/maps/SilphCo_11F/scripts.inc
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -6,76 +6,72 @@ SilphCo_11F_OnLoad:: @ 8161DF4
 	call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor
 	end
 
-SilphCo_11F_EventScript_161DFE:: @ 8161DFE
+SilphCo_11F_EventScript_President:: @ 8161DFE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75
+	goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EventScript_161E59
+	call_if_eq SilphCo_11F_EventScript_PresidentThanksMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_161E62
+	call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale
 	checkitemspace ITEM_MASTER_BALL, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_161E6B
-	giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5
-	msgbox gUnknown_8176FEB
+	goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall
+	giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5
+	msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
 	setflag FLAG_GOT_MASTER_BALL_FROM_SILPH
 	release
 	end
 
-EventScript_161E59:: @ 8161E59
-	msgbox gUnknown_8176E12
+SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59
+	msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy
 	return
 
-EventScript_161E62:: @ 8161E62
-	msgbox gUnknown_8176EE7
+SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62
+	msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl
 	return
 
-EventScript_161E6B:: @ 8161E6B
-	msgbox gUnknown_817708E
+SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B
+	msgbox SilphCo_11F_Text_YouHaveNoRoomForThis
 	release
 	end
 
-EventScript_161E75:: @ 8161E75
-	msgbox gUnknown_8176FEB
+SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75
+	msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
 	release
 	end
 
-SilphCo_11F_EventScript_161E7F:: @ 8161E7F
-	msgbox gUnknown_81770A9, MSGBOX_NPC
+SilphCo_11F_EventScript_Secretary:: @ 8161E7F
+	msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC
 	end
 
-SilphCo_11F_EventScript_161E88:: @ 8161E88
+SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_161EA0
-
-EventScript_161E93:: @ 8161E93
+	goto SilphCo_11F_EventScript_BattleGiovanni
 	end
 
-SilphCo_11F_EventScript_161E94:: @ 8161E94
+SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_161EA0
-
-EventScript_161E9F:: @ 8161E9F
+	goto SilphCo_11F_EventScript_BattleGiovanni
 	end
 
-EventScript_161EA0:: @ 8161EA0
+SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0
 	textcolor 0
 	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25
-	msgbox gUnknown_8177108
+	msgbox SilphCo_11F_Text_GiovanniIntro
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161F00
+	call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161F12
+	call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight
 	setvar VAR_LAST_TALKED, 3
-	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB
-	msgbox gUnknown_81771C2
+	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat
+	msgbox SilphCo_11F_Text_GiovanniPostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
 	removeobject 3
@@ -88,18 +84,18 @@ EventScript_161EA0:: @ 8161EA0
 	releaseall
 	end
 
-EventScript_161F00:: @ 8161F00
-	applymovement 3, Movement_161F1D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27
+SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00
+	applymovement 3, SilphCo_11F_Movement_GiovanniApproachLeft
+	applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni
 	waitmovement 0
 	return
 
-EventScript_161F12:: @ 8161F12
-	applymovement 3, Movement_161F23
+SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12
+	applymovement 3, SilphCo_11F_Movement_GiovanniApproachRight
 	waitmovement 0
 	return
 
-Movement_161F1D:: @ 8161F1D
+SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D
 	walk_down
 	walk_down
 	walk_down
@@ -107,13 +103,13 @@ Movement_161F1D:: @ 8161F1D
 	walk_in_place_fastest_left
 	step_end
 
-Movement_161F23:: @ 8161F23
+SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-Movement_161F27:: @ 8161F27
+SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27
 	delay_16
 	delay_16
 	delay_16
@@ -122,20 +118,21 @@ Movement_161F27:: @ 8161F27
 	walk_in_place_fastest_right
 	step_end
 
-EventScript_161F2E:: @ 8161F2E
-	msgbox gUnknown_817732B, MSGBOX_SIGN
+@ Unused
+SilphCo_11F_EventScript_Monitor:: @ 8161F2E
+	msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN
 	end
 
-SilphCo_11F_EventScript_161F37:: @ 8161F37
-	msgbox gUnknown_817734A, MSGBOX_SIGN
+SilphCo_11F_EventScript_FloorSign:: @ 8161F37
+	msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_11F_EventScript_161F40:: @ 8161F40
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7
-	msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE
+SilphCo_11F_EventScript_Grunt1:: @ 8161F40
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat
+	msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_11F_EventScript_161F57:: @ 8161F57
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C
-	msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE
+SilphCo_11F_EventScript_Grunt2:: @ 8161F57
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat
+	msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc
index dcb60219a..83b004f4a 100644
--- a/data/maps/SilphCo_11F/text.inc
+++ b/data/maps/SilphCo_11F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8176E12:: @ 8176E12
+SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12
     .string "PRESIDENT: Oh, dear boy!\n"
     .string "Thank you for saving SILPH.\p"
     .string "I will never forget you saved us in\n"
@@ -8,7 +8,7 @@ gUnknown_8176E12:: @ 8176E12
     .string "anything.\p"
     .string "Here, maybe this will do.$"
 
-gUnknown_8176EE7:: @ 8176EE7
+SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7
     .string "PRESIDENT: Oh, dear girl!\n"
     .string "Thank you for saving SILPH.\p"
     .string "I will never forget you saved us in\n"
@@ -18,11 +18,11 @@ gUnknown_8176EE7:: @ 8176EE7
     .string "anything.\p"
     .string "Here, maybe this will do.$"
 
-gUnknown_8176FBD:: @ 8176FBD
+SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD
     .string "{PLAYER} obtained a MASTER BALL\n"
     .string "from the PRESIDENT!$"
 
-gUnknown_8176FEB:: @ 8176FEB
+SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB
     .string "PRESIDENT: You can't buy that\n"
     .string "anywhere.\p"
     .string "It's our secret prototype MASTER\n"
@@ -32,16 +32,16 @@ gUnknown_8176FEB:: @ 8176FEB
     .string "You should be quiet about using it,\n"
     .string "though.$"
 
-gUnknown_817708E:: @ 817708E
+SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E
     .string "You have no room for this.$"
 
-gUnknown_81770A9:: @ 81770A9
+SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9
     .string "SECRETARY: Thank you for rescuing\n"
     .string "all of us.\p"
     .string "We, from the PRESIDENT down,\n"
     .string "are indebted to you.$"
 
-gUnknown_8177108:: @ 8177108
+SilphCo_11F_Text_GiovanniIntro:: @ 8177108
     .string "Ah, {PLAYER}!\n"
     .string "So we meet again!\p"
     .string "The PRESIDENT and I are discussing\n"
@@ -50,11 +50,11 @@ gUnknown_8177108:: @ 8177108
     .string "matters…\p"
     .string "Or, experience a world of pain!$"
 
-Text_1771AB:: @ 81771AB
+SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB
     .string "Arrgh!!\n"
     .string "I lost again!?$"
 
-gUnknown_81771C2:: @ 81771C2
+SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2
     .string "Blast it all!\n"
     .string "You ruined our plans for SILPH!\p"
     .string "But, TEAM ROCKET will never fall!\p"
@@ -62,33 +62,33 @@ gUnknown_81771C2:: @ 81771C2
     .string "POKéMON exist for TEAM ROCKET!\p"
     .string "I must go, but I shall return!$"
 
-Text_17726A:: @ 817726A
+SilphCo_11F_Text_Grunt2Intro:: @ 817726A
     .string "Stop right there!\n"
     .string "Don't you move!$"
 
-Text_17728C:: @ 817728C
+SilphCo_11F_Text_Grunt2Defeat:: @ 817728C
     .string "Don't…\n"
     .string "Please!$"
 
-gUnknown_817729B:: @ 817729B
+SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B
     .string "So, you want to see my BOSS?$"
 
-Text_1772B8:: @ 81772B8
+SilphCo_11F_Text_Grunt1Intro:: @ 81772B8
     .string "Halt! Do you have an appointment\n"
     .string "with my BOSS?$"
 
-Text_1772E7:: @ 81772E7
+SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7
     .string "Gaah!\n"
     .string "Demolished!$"
 
-gUnknown_81772F9:: @ 81772F9
+SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9
     .string "Watch your step…\n"
     .string "My BOSS likes his POKéMON tough!$"
 
-gUnknown_817732B:: @ 817732B
+SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B
     .string "The monitor has POKéMON on it!$"
 
-gUnknown_817734A:: @ 817734A
+SilphCo_11F_Text_FloorSign:: @ 817734A
     .string "SILPH CO. HEAD OFFICE\n"
     .string "11F$"
 
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 277329dfc..b4e329490 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_1F_EventScript_16162F",
+      "script": "SilphCo_1F_EventScript_Receptionist",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     }
   ],
@@ -71,7 +71,7 @@
       "x": 30,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_1F_EventScript_161638"
+      "script": "SilphCo_1F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc
index f10c4d8b3..004d2de0c 100644
--- a/data/maps/SilphCo_1F/scripts.inc
+++ b/data/maps/SilphCo_1F/scripts.inc
@@ -6,10 +6,10 @@ SilphCo_1F_OnTransition:: @ 816162B
 	setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F
 	end
 
-SilphCo_1F_EventScript_16162F:: @ 816162F
-	msgbox gUnknown_81754F7, MSGBOX_NPC
+SilphCo_1F_EventScript_Receptionist:: @ 816162F
+	msgbox SilphCo_1F_Text_WelcomePresidentInBoardroom, MSGBOX_NPC
 	end
 
-SilphCo_1F_EventScript_161638:: @ 8161638
-	msgbox gUnknown_8175549, MSGBOX_SIGN
+SilphCo_1F_EventScript_FloorSign:: @ 8161638
+	msgbox SilphCo_1F_Text_FloorSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc
index 048102660..808aec46b 100644
--- a/data/maps/SilphCo_1F/text.inc
+++ b/data/maps/SilphCo_1F/text.inc
@@ -1,13 +1,13 @@
-gUnknown_81754F7:: @ 81754F7
+SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7
     .string "Welcome.\p"
     .string "The PRESIDENT is in the boardroom\n"
     .string "on 11F.$"
 
-Text_17552A:: @ 817552A
+SilphCo_1F_Text_17552A:: @ 817552A
     .string "めちゃめちゃに　こわされてる\n"
     .string "とうぶん　なおりそうに　ない‥$"
 
-gUnknown_8175549:: @ 8175549
+SilphCo_1F_Text_FloorSign:: @ 8175549
     .string "SILPH CO. HEAD OFFICE\n"
     .string "1F$"
 
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index fed3b8390..89439ba8a 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_2F_EventScript_1616AE",
+      "script": "SilphCo_2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_2F_EventScript_161680",
+      "script": "SilphCo_2F_EventScript_Jerry",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_2F_EventScript_161697",
+      "script": "SilphCo_2F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_2F_EventScript_161669",
+      "script": "SilphCo_2F_EventScript_Connor",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -203,7 +203,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_2F_EventScript_161660"
+      "script": "SilphCo_2F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
index 6f800bbd0..161ddefe6 100644
--- a/data/maps/SilphCo_2F/scripts.inc
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -9,30 +9,28 @@ SilphCo_2F_OnLoad:: @ 8161647
 
 SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A
 	goto EventScript_ThunderWaveTutor
-
-EventScript_16165F:: @ 816165F
 	end
 
-SilphCo_2F_EventScript_161660:: @ 8161660
-	msgbox gUnknown_8175894, MSGBOX_SIGN
+SilphCo_2F_EventScript_FloorSign:: @ 8161660
+	msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_2F_EventScript_161669:: @ 8161669
-	trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E
-	msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Connor:: @ 8161669
+	trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat
+	msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_161680:: @ 8161680
-	trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5
-	msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Jerry:: @ 8161680
+	trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat
+	msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_161697:: @ 8161697
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A
-	msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Grunt1:: @ 8161697
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat
+	msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_1616AE:: @ 81616AE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8
-	msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Grunt2:: @ 81616AE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat
+	msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc
index 3dc65664d..82c7bac99 100644
--- a/data/maps/SilphCo_2F/text.inc
+++ b/data/maps/SilphCo_2F/text.inc
@@ -1,46 +1,46 @@
-Text_175562:: @ 8175562
+SilphCo_2F_Text_ConnorIntro:: @ 8175562
     .string "Help!\n"
     .string "I'm a SILPH employee.$"
 
-Text_17557E:: @ 817557E
+SilphCo_2F_Text_ConnorDefeat:: @ 817557E
     .string "How did you know\n"
     .string "I was a ROCKET?$"
 
-gUnknown_817559F:: @ 817559F
+SilphCo_2F_Text_ConnorPostBattle:: @ 817559F
     .string "I work for both SILPH and TEAM\n"
     .string "ROCKET.$"
 
-Text_1755C6:: @ 81755C6
+SilphCo_2F_Text_JerryIntro:: @ 81755C6
     .string "It's off-limits here!\n"
     .string "Go home!$"
 
-Text_1755E5:: @ 81755E5
+SilphCo_2F_Text_JerryDefeat:: @ 81755E5
     .string "You're good.$"
 
-gUnknown_81755F2:: @ 81755F2
+SilphCo_2F_Text_JerryPostBattle:: @ 81755F2
     .string "Can you solve the maze in here?\n"
     .string "It's not easy, I tell you!$"
 
-Text_17562D:: @ 817562D
+SilphCo_2F_Text_Grunt1Intro:: @ 817562D
     .string "No kids are allowed in here!$"
 
-Text_17564A:: @ 817564A
+SilphCo_2F_Text_Grunt1Defeat:: @ 817564A
     .string "Tough!$"
 
-gUnknown_8175651:: @ 8175651
+SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651
     .string "Diamond-shaped tiles are teleport\n"
     .string "blocks.\p"
     .string "They're transporters for this\n"
     .string "high-tech building.$"
 
-Text_1756AD:: @ 81756AD
+SilphCo_2F_Text_Grunt2Intro:: @ 81756AD
     .string "Hey, kid!\n"
     .string "What are you wandering here for?$"
 
-Text_1756D8:: @ 81756D8
+SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8
     .string "I goofed!$"
 
-gUnknown_81756E2:: @ 81756E2
+SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2
     .string "SILPH CO. will be associated with\n"
     .string "TEAM ROCKET!$"
 
@@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC
     .string "It's an ELECTRIC-type move, so it\n"
     .string "won't work on some POKéMON.$"
 
-gUnknown_8175894:: @ 8175894
+SilphCo_2F_Text_FloorSign:: @ 8175894
     .string "SILPH CO. HEAD OFFICE\n"
     .string "2F$"
 
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 8a81b5118..42a1e6b72 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_3F_EventScript_16171F",
+      "script": "SilphCo_3F_EventScript_Grunt",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_1616DE",
+      "script": "SilphCo_3F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_161708",
+      "script": "SilphCo_3F_EventScript_Jose",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -211,7 +211,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_3F_EventScript_1616FF"
+      "script": "SilphCo_3F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc
index a5e62b667..2fab54a56 100644
--- a/data/maps/SilphCo_3F/scripts.inc
+++ b/data/maps/SilphCo_3F/scripts.inc
@@ -7,30 +7,30 @@ SilphCo_3F_OnLoad:: @ 81616CB
 	call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2
 	end
 
-SilphCo_3F_EventScript_1616DE:: @ 81616DE
+SilphCo_3F_EventScript_WorkerM:: @ 81616DE
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1616F5
-	msgbox gUnknown_81758AD
+	goto_if_ge SilphCo_3F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_3F_Text_WhatAmIToDo
 	release
 	end
 
-EventScript_1616F5:: @ 81616F5
-	msgbox gUnknown_81758D3
+SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5
+	msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs
 	release
 	end
 
-SilphCo_3F_EventScript_1616FF:: @ 81616FF
-	msgbox gUnknown_81759DC, MSGBOX_SIGN
+SilphCo_3F_EventScript_FloorSign:: @ 81616FF
+	msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_3F_EventScript_161708:: @ 8161708
-	trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D
-	msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Jose:: @ 8161708
+	trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat
+	msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_3F_EventScript_16171F:: @ 816171F
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911
-	msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Grunt:: @ 816171F
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat
+	msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc
index 6b8a8d4d1..128865c1b 100644
--- a/data/maps/SilphCo_3F/text.inc
+++ b/data/maps/SilphCo_3F/text.inc
@@ -1,34 +1,34 @@
-gUnknown_81758AD:: @ 81758AD
+SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD
     .string "I work for SILPH CO.\n"
     .string "What am I to do?$"
 
-gUnknown_81758D3:: @ 81758D3
+SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3
     .string "{PLAYER}!\n"
     .string "You and your POKéMON saved us!$"
 
-Text_1758F6:: @ 81758F6
+SilphCo_3F_Text_GruntIntro:: @ 81758F6
     .string "Quit messing with us, kid!$"
 
-Text_175911:: @ 8175911
+SilphCo_3F_Text_GruntDefeat:: @ 8175911
     .string "I give up!$"
 
-gUnknown_817591C:: @ 817591C
+SilphCo_3F_Text_GruntPostBattle:: @ 817591C
     .string "A hint? You can open doors with\n"
     .string "a CARD KEY!$"
 
-Text_175948:: @ 8175948
+SilphCo_3F_Text_JoseIntro:: @ 8175948
     .string "I support TEAM ROCKET more than\n"
     .string "I support SILPH CO.!$"
 
-Text_17597D:: @ 817597D
+SilphCo_3F_Text_JoseDefeat:: @ 817597D
     .string "You really got me!$"
 
-gUnknown_8175990:: @ 8175990
+SilphCo_3F_Text_JosePostBattle:: @ 8175990
     .string "Humph…\p"
     .string "TEAM ROCKET said that if I helped\n"
     .string "them, they'd let me study POKéMON.$"
 
-gUnknown_81759DC:: @ 81759DC
+SilphCo_3F_Text_FloorSign:: @ 81759DC
     .string "SILPH CO. HEAD OFFICE\n"
     .string "3F$"
 
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index fc37a6102..6473f3c5d 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_4F_EventScript_1617A7",
+      "script": "SilphCo_4F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_4F_EventScript_161790",
+      "script": "SilphCo_4F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_4F_EventScript_161779",
+      "script": "SilphCo_4F_EventScript_Rodney",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_4F_EventScript_16174F",
+      "script": "SilphCo_4F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -242,7 +242,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_4F_EventScript_161770"
+      "script": "SilphCo_4F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc
index 406e394f1..bd20cb533 100644
--- a/data/maps/SilphCo_4F/scripts.inc
+++ b/data/maps/SilphCo_4F/scripts.inc
@@ -7,35 +7,35 @@ SilphCo_4F_OnLoad:: @ 816173C
 	call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2
 	end
 
-SilphCo_4F_EventScript_16174F:: @ 816174F
+SilphCo_4F_EventScript_WorkerM:: @ 816174F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161766
-	msgbox gUnknown_81759F5
+	goto_if_ge SilphCo_4F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_4F_Text_CantYouSeeImHiding
 	release
 	end
 
-EventScript_161766:: @ 8161766
-	msgbox gUnknown_8175A15
+SilphCo_4F_EventScript_WorkerMRocketsGone:: @ 8161766
+	msgbox SilphCo_4F_Text_TeamRocketIsGone
 	release
 	end
 
-SilphCo_4F_EventScript_161770:: @ 8161770
-	msgbox gUnknown_8175B57, MSGBOX_SIGN
+SilphCo_4F_EventScript_FloorSign:: @ 8161770
+	msgbox SilphCo_4F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_4F_EventScript_161779:: @ 8161779
-	trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0
-	msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Rodney:: @ 8161779
+	trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat
+	msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_4F_EventScript_161790:: @ 8161790
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B
-	msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Grunt1:: @ 8161790
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat
+	msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_4F_EventScript_1617A7:: @ 81617A7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B
-	msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Grunt2:: @ 81617A7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat
+	msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc
index d8741f9a3..dd1ed2d20 100644
--- a/data/maps/SilphCo_4F/text.inc
+++ b/data/maps/SilphCo_4F/text.inc
@@ -1,45 +1,45 @@
-gUnknown_81759F5:: @ 81759F5
+SilphCo_4F_Text_CantYouSeeImHiding:: @ 81759F5
     .string "Sssh!\n"
     .string "Can't you see I'm hiding?$"
 
-gUnknown_8175A15:: @ 8175A15
+SilphCo_4F_Text_TeamRocketIsGone:: @ 8175A15
     .string "Huh?\n"
     .string "TEAM ROCKET is gone?$"
 
-Text_175A2F:: @ 8175A2F
+SilphCo_4F_Text_Grunt1Intro:: @ 8175A2F
     .string "TEAM ROCKET has taken control\n"
     .string "of SILPH CO.!$"
 
-Text_175A5B:: @ 8175A5B
+SilphCo_4F_Text_Grunt1Defeat:: @ 8175A5B
     .string "Arrgh!$"
 
-gUnknown_8175A62:: @ 8175A62
+SilphCo_4F_Text_Grunt1PostBattle:: @ 8175A62
     .string "Fwahahaha!\n"
     .string "My BOSS has been after this place!$"
 
-Text_175A90:: @ 8175A90
+SilphCo_4F_Text_RodneyIntro:: @ 8175A90
     .string "My POKéMON is my loyal servant.$"
 
-Text_175AB0:: @ 8175AB0
+SilphCo_4F_Text_RodneyDefeat:: @ 8175AB0
     .string "Darn!\n"
     .string "You weak POKéMON!$"
 
-gUnknown_8175AC8:: @ 8175AC8
+SilphCo_4F_Text_RodneyPostBattle:: @ 8175AC8
     .string "The doors are electronically\n"
     .string "locked.\p"
     .string "It takes a CARD KEY to open the\n"
     .string "doors here.$"
 
-Text_175B19:: @ 8175B19
+SilphCo_4F_Text_Grunt2Intro:: @ 8175B19
     .string "Intruder spotted!$"
 
-Text_175B2B:: @ 8175B2B
+SilphCo_4F_Text_Grunt2Defeat:: @ 8175B2B
     .string "Who are you?$"
 
-gUnknown_8175B38:: @ 8175B38
+SilphCo_4F_Text_Grunt2PostBattle:: @ 8175B38
     .string "I better tell the BOSS on 11F!$"
 
-gUnknown_8175B57:: @ 8175B57
+SilphCo_4F_Text_FloorSign:: @ 8175B57
     .string "SILPH CO. HEAD OFFICE\n"
     .string "4F$"
 
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 9bc1989ff..834d3c9eb 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_5F_EventScript_161853",
+      "script": "SilphCo_5F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_5F_EventScript_16186A",
+      "script": "SilphCo_5F_EventScript_Dalton",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_5F_EventScript_1617E0",
+      "script": "SilphCo_5F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_5F_EventScript_161825",
+      "script": "SilphCo_5F_EventScript_Beau",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_5F_EventScript_16183C",
+      "script": "SilphCo_5F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_5F_EventScript_1AD0D4",
+      "script": "SilphCo_5F_EventScript_Scientist",
       "flag": "0"
     }
   ],
@@ -283,21 +283,21 @@
       "x": 28,
       "y": 11,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_161813"
+      "script": "SilphCo_5F_EventScript_PokemonReport3"
     },
     {
       "type": "bg_event_type_0",
       "x": 30,
       "y": 13,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_16180A"
+      "script": "SilphCo_5F_EventScript_PokemonReport2"
     },
     {
       "type": "bg_event_type_0",
       "x": 25,
       "y": 15,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_161801"
+      "script": "SilphCo_5F_EventScript_PokemonReport1"
     },
     {
       "type": "hidden_item",
@@ -314,7 +314,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_16181C"
+      "script": "SilphCo_5F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc
index 1a17e3b44..ae195ee09 100644
--- a/data/maps/SilphCo_5F/scripts.inc
+++ b/data/maps/SilphCo_5F/scripts.inc
@@ -8,52 +8,52 @@ SilphCo_5F_OnLoad:: @ 81617C4
 	call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3
 	end
 
-SilphCo_5F_EventScript_1617E0:: @ 81617E0
+SilphCo_5F_EventScript_WorkerM:: @ 81617E0
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1617F7
-	msgbox gUnknown_8175B70
+	goto_if_ge SilphCo_5F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_5F_Text_RocketsInUproarAboutIntruder
 	release
 	end
 
-EventScript_1617F7:: @ 81617F7
-	msgbox gUnknown_8175BB3
+SilphCo_5F_EventScript_WorkerMRocketsGone:: @ 81617F7
+	msgbox SilphCo_5F_Text_YoureOurHeroThankYou
 	release
 	end
 
-SilphCo_5F_EventScript_161801:: @ 8161801
-	msgbox gUnknown_8175D89, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport1:: @ 8161801
+	msgbox SilphCo_5F_Text_PorygonFirstVRMon, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_16180A:: @ 816180A
-	msgbox gUnknown_8175DE0, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport2:: @ 816180A
+	msgbox SilphCo_5F_Text_Over350TechniquesConfirmed, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_161813:: @ 8161813
-	msgbox gUnknown_8175E28, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport3:: @ 8161813
+	msgbox SilphCo_5F_Text_SomeMonsEvolveWhenTraded, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_16181C:: @ 816181C
-	msgbox gUnknown_8175E80, MSGBOX_SIGN
+SilphCo_5F_EventScript_FloorSign:: @ 816181C
+	msgbox SilphCo_5F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_161825:: @ 8161825
-	trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D
-	msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Beau:: @ 8161825
+	trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat
+	msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_16183C:: @ 816183C
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09
-	msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Grunt1:: @ 816183C
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat
+	msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_161853:: @ 8161853
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B
-	msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Grunt2:: @ 8161853
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat
+	msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_16186A:: @ 816186A
-	trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB
-	msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Dalton:: @ 816186A
+	trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat
+	msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc
index 5a768d5f5..3161f971c 100644
--- a/data/maps/SilphCo_5F/text.inc
+++ b/data/maps/SilphCo_5F/text.inc
@@ -1,74 +1,81 @@
-gUnknown_8175B70:: @ 8175B70
+SilphCo_5F_Text_RocketsInUproarAboutIntruder:: @ 8175B70
     .string "TEAM ROCKET is in an uproar over\n"
     .string "some intruder.\p"
     .string "That's you, right?$"
 
-gUnknown_8175BB3:: @ 8175BB3
+SilphCo_5F_Text_YoureOurHeroThankYou:: @ 8175BB3
     .string "TEAM ROCKET took off!\n"
     .string "You're our hero! Thank you!$"
 
-Text_175BE5:: @ 8175BE5
+SilphCo_5F_Text_Grunt1Intro:: @ 8175BE5
     .string "I heard a kid was wandering\n"
     .string "around.$"
 
-Text_175C09:: @ 8175C09
+SilphCo_5F_Text_Grunt1Defeat:: @ 8175C09
     .string "Boom!$"
 
-gUnknown_8175C0F:: @ 8175C0F
+SilphCo_5F_Text_Grunt1PostBattle:: @ 8175C0F
     .string "It's not smart to pick a fight with\n"
     .string "TEAM ROCKET!$"
 
-Text_175C40:: @ 8175C40
+SilphCo_5F_Text_BeauIntro:: @ 8175C40
     .string "We study POKé BALL technology on\n"
     .string "this floor.$"
 
-Text_175C6D:: @ 8175C6D
+SilphCo_5F_Text_BeauDefeat:: @ 8175C6D
     .string "Dang!\n"
     .string "Blast it!$"
 
-gUnknown_8175C7D:: @ 8175C7D
+SilphCo_5F_Text_BeauPostBattle:: @ 8175C7D
     .string "We worked on the ultimate POKé\n"
     .string "BALL which would catch anything.$"
 
-Text_175CBD:: @ 8175CBD
+SilphCo_5F_Text_DaltonIntro:: @ 8175CBD
     .string "Whaaat?\p"
     .string "There shouldn't be any children\n"
     .string "here!$"
 
-Text_175CEB:: @ 8175CEB
+SilphCo_5F_Text_DaltonDefeat:: @ 8175CEB
     .string "Oh, goodness!$"
 
-gUnknown_8175CF9:: @ 8175CF9
+SilphCo_5F_Text_DaltonPostBattle:: @ 8175CF9
     .string "You're only on 5F.\n"
     .string "It's a long way to my BOSS!$"
 
-Text_175D28:: @ 8175D28
+SilphCo_5F_Text_Grunt2Intro:: @ 8175D28
     .string "Show TEAM ROCKET a little respect!$"
 
-Text_175D4B:: @ 8175D4B
+SilphCo_5F_Text_Grunt2Defeat:: @ 8175D4B
     .string "Cough…\n"
     .string "Cough…$"
 
-gUnknown_8175D59:: @ 8175D59
+SilphCo_5F_Text_Grunt2PostBattle:: @ 8175D59
     .string "Which reminds me.\p"
     .string "KOFFING evolves into WEEZING!$"
 
-gUnknown_8175D89:: @ 8175D89
+SilphCo_5F_Text_PorygonFirstVRMon:: @ 8175D89
     .string "It's a POKéMON REPORT!\p"
     .string "POKéMON LAB created PORYGON,\n"
     .string "the first virtual-reality POKéMON.$"
 
-gUnknown_8175DE0:: @ 8175DE0
+SilphCo_5F_Text_Over350TechniquesConfirmed:: @ 8175DE0
     .string "It's a POKéMON REPORT!\p"
     .string "Over 350 POKéMON techniques have\n"
     .string "been confirmed.$"
 
-gUnknown_8175E28:: @ 8175E28
+SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: @ 8175E28
     .string "It's a POKéMON REPORT!\p"
     .string "Some POKéMON have been confirmed\n"
     .string "to evolve when they are traded.$"
 
-gUnknown_8175E80:: @ 8175E80
+SilphCo_5F_Text_FloorSign:: @ 8175E80
     .string "SILPH CO. HEAD OFFICE\n"
     .string "5F$"
 
+SilphCo_5F_Text_RocketBossLookingForStrongMons:: @ 8175E99
+    .string "Those thugs that took over our\n"
+    .string "building…\p"
+    .string "Their BOSS said he was looking for\n"
+    .string "strong POKéMON.\p"
+    .string "I hope our PRESIDENT managed to\n"
+    .string "avoid trouble…$"
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index a1142c5ed..f5e701cf2 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_6F_EventScript_161956",
+      "script": "SilphCo_6F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618D3",
+      "script": "SilphCo_6F_EventScript_WorkerM1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618F4",
+      "script": "SilphCo_6F_EventScript_WorkerF1",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_161891",
+      "script": "SilphCo_6F_EventScript_WorkerM2",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618B2",
+      "script": "SilphCo_6F_EventScript_WorkerM3",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_161915",
+      "script": "SilphCo_6F_EventScript_WorkerF2",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_6F_EventScript_16193F",
+      "script": "SilphCo_6F_EventScript_Taylor",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_6F_EventScript_16196D",
+      "script": "SilphCo_6F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -226,7 +226,7 @@
       "x": 25,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_6F_EventScript_161936"
+      "script": "SilphCo_6F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc
index 6bc5cd545..478ff3309 100644
--- a/data/maps/SilphCo_6F/scripts.inc
+++ b/data/maps/SilphCo_6F/scripts.inc
@@ -6,91 +6,91 @@ SilphCo_6F_OnLoad:: @ 8161887
 	call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor
 	end
 
-SilphCo_6F_EventScript_161891:: @ 8161891
+SilphCo_6F_EventScript_WorkerM2:: @ 8161891
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618A8
-	msgbox gUnknown_817607E
+	goto_if_ge SilphCo_6F_EventScript_WorkerM2RocketsGone
+	msgbox SilphCo_6F_Text_TargetedSilphForOurMonProducts
 	release
 	end
 
-EventScript_1618A8:: @ 81618A8
-	msgbox gUnknown_81760B6
+SilphCo_6F_EventScript_WorkerM2RocketsGone:: @ 81618A8
+	msgbox SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder
 	release
 	end
 
-SilphCo_6F_EventScript_1618B2:: @ 81618B2
+SilphCo_6F_EventScript_WorkerM3:: @ 81618B2
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618C9
-	msgbox gUnknown_8175F24
+	goto_if_ge SilphCo_6F_EventScript_WorkerM3RocketsGone
+	msgbox SilphCo_6F_Text_RocketsTookOverBuilding
 	release
 	end
 
-EventScript_1618C9:: @ 81618C9
-	msgbox gUnknown_8175F51
+SilphCo_6F_EventScript_WorkerM3RocketsGone:: @ 81618C9
+	msgbox SilphCo_6F_Text_BetterGetBackToWork
 	release
 	end
 
-SilphCo_6F_EventScript_1618D3:: @ 81618D3
+SilphCo_6F_EventScript_WorkerM1:: @ 81618D3
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618EA
-	msgbox gUnknown_8175F70
+	goto_if_ge SilphCo_6F_EventScript_WorkerM1RocketsGone
+	msgbox SilphCo_6F_Text_HelpMePlease
 	release
 	end
 
-EventScript_1618EA:: @ 81618EA
-	msgbox gUnknown_8175F93
+SilphCo_6F_EventScript_WorkerM1RocketsGone:: @ 81618EA
+	msgbox SilphCo_6F_Text_WeGotEngaged
 	release
 	end
 
-SilphCo_6F_EventScript_1618F4:: @ 81618F4
+SilphCo_6F_EventScript_WorkerF1:: @ 81618F4
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_16190B
-	msgbox gUnknown_8175FAA
+	goto_if_ge SilphCo_6F_EventScript_WorkerF1RocketsGone
+	msgbox SilphCo_6F_Text_ThatManIsSuchACoward
 	release
 	end
 
-EventScript_16190B:: @ 816190B
-	msgbox gUnknown_8175FD3
+SilphCo_6F_EventScript_WorkerF1RocketsGone:: @ 816190B
+	msgbox SilphCo_6F_Text_NeedsMeToLookAfterHim
 	release
 	end
 
-SilphCo_6F_EventScript_161915:: @ 8161915
+SilphCo_6F_EventScript_WorkerF2:: @ 8161915
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_16192C
-	msgbox gUnknown_8176012
+	goto_if_ge SilphCo_6F_EventScript_WorkerF2RocketsGone
+	msgbox SilphCo_6F_Text_RocketsTryingToConquerWorld
 	release
 	end
 
-EventScript_16192C:: @ 816192C
-	msgbox gUnknown_817604B
+SilphCo_6F_EventScript_WorkerF2RocketsGone:: @ 816192C
+	msgbox SilphCo_6F_Text_RocketsRanAwayBecauseOfYou
 	release
 	end
 
-SilphCo_6F_EventScript_161936:: @ 8161936
-	msgbox gUnknown_817624D, MSGBOX_SIGN
+SilphCo_6F_EventScript_FloorSign:: @ 8161936
+	msgbox SilphCo_6F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_6F_EventScript_16193F:: @ 816193F
-	trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD
-	msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Taylor:: @ 816193F
+	trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat
+	msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_6F_EventScript_161956:: @ 8161956
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104
-	msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Grunt1:: @ 8161956
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat
+	msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_6F_EventScript_16196D:: @ 816196D
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E
-	msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Grunt2:: @ 816196D
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat
+	msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc
index 1de83df51..f0d1084a1 100644
--- a/data/maps/SilphCo_6F/text.inc
+++ b/data/maps/SilphCo_6F/text.inc
@@ -1,86 +1,78 @@
-Text_175E99:: @ 8175E99
-    .string "Those thugs that took over our\n"
-    .string "building…\p"
-    .string "Their BOSS said he was looking for\n"
-    .string "strong POKéMON.\p"
-    .string "I hope our PRESIDENT managed to\n"
-    .string "avoid trouble…$"
-
-gUnknown_8175F24:: @ 8175F24
+SilphCo_6F_Text_RocketsTookOverBuilding:: @ 8175F24
     .string "The ROCKETS came and took over\n"
     .string "the building!$"
 
-gUnknown_8175F51:: @ 8175F51
+SilphCo_6F_Text_BetterGetBackToWork:: @ 8175F51
     .string "Well, better get back to work.$"
 
-gUnknown_8175F70:: @ 8175F70
+SilphCo_6F_Text_HelpMePlease:: @ 8175F70
     .string "Oh dear, oh dear.\n"
     .string "Help me, please!$"
 
-gUnknown_8175F93:: @ 8175F93
+SilphCo_6F_Text_WeGotEngaged:: @ 8175F93
     .string "We got engaged.\n"
     .string "Heheh!$"
 
-gUnknown_8175FAA:: @ 8175FAA
+SilphCo_6F_Text_ThatManIsSuchACoward:: @ 8175FAA
     .string "That man next to me…\n"
     .string "He's such a coward!$"
 
-gUnknown_8175FD3:: @ 8175FD3
+SilphCo_6F_Text_NeedsMeToLookAfterHim:: @ 8175FD3
     .string "He's so helpless, he needed\n"
     .string "someone like me to look after him.$"
 
-gUnknown_8176012:: @ 8176012
+SilphCo_6F_Text_RocketsTryingToConquerWorld:: @ 8176012
     .string "TEAM ROCKET is trying to conquer\n"
     .string "the world with POKéMON.$"
 
-gUnknown_817604B:: @ 817604B
+SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: @ 817604B
     .string "TEAM ROCKET ran away, and it's all\n"
     .string "because of you!$"
 
-gUnknown_817607E:: @ 817607E
+SilphCo_6F_Text_TargetedSilphForOurMonProducts:: @ 817607E
     .string "They must have targeted SILPH for\n"
     .string "our POKéMON products.$"
 
-gUnknown_81760B6:: @ 81760B6
+SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: @ 81760B6
     .string "Come work for SILPH when you\n"
     .string "get older.$"
 
-Text_1760DE:: @ 81760DE
+SilphCo_6F_Text_Grunt1Intro:: @ 81760DE
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176104:: @ 8176104
+SilphCo_6F_Text_Grunt1Defeat:: @ 8176104
     .string "Flame out!$"
 
-gUnknown_817610F:: @ 817610F
+SilphCo_6F_Text_Grunt1PostBattle:: @ 817610F
     .string "No matter!\n"
     .string "My brothers will avenge me!$"
 
-Text_176136:: @ 8176136
+SilphCo_6F_Text_TaylorIntro:: @ 8176136
     .string "That rotten PRESIDENT!\p"
     .string "Serves him right for shipping me\n"
     .string "off to the TIKSI BRANCH!\p"
     .string "That's why TEAM ROCKET came after\n"
     .string "us, I'm sure of it!$"
 
-Text_1761BD:: @ 81761BD
+SilphCo_6F_Text_TaylorDefeat:: @ 81761BD
     .string "Shoot!$"
 
-gUnknown_81761C4:: @ 81761C4
+SilphCo_6F_Text_TaylorPostBattle:: @ 81761C4
     .string "TIKSI BRANCH?\n"
     .string "It's in Russian no-man's-land!$"
 
-Text_1761F1:: @ 81761F1
+SilphCo_6F_Text_Grunt2Intro:: @ 81761F1
     .string "You dare betray TEAM ROCKET?$"
 
-Text_17620E:: @ 817620E
+SilphCo_6F_Text_Grunt2Defeat:: @ 817620E
     .string "You traitor!$"
 
-gUnknown_817621B:: @ 817621B
+SilphCo_6F_Text_Grunt2PostBattle:: @ 817621B
     .string "If you stand for justice, you\n"
     .string "betray us bad guys!$"
 
-gUnknown_817624D:: @ 817624D
+SilphCo_6F_Text_FloorSign:: @ 817624D
     .string "SILPH CO. HEAD OFFICE\n"
     .string "6F$"
 
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index 87a1a413c..994088fb0 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161AC8",
+      "script": "SilphCo_7F_EventScript_LaprasGuy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_7F_EventScript_161C1A",
+      "script": "SilphCo_7F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_7F_EventScript_161C31",
+      "script": "SilphCo_7F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_7F_EventScript_161C48",
+      "script": "SilphCo_7F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161BD9",
+      "script": "SilphCo_7F_EventScript_WorkerF",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161B97",
+      "script": "SilphCo_7F_EventScript_WorkerM1",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161BB8",
+      "script": "SilphCo_7F_EventScript_WorkerM2",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_7F_EventScript_161C03",
+      "script": "SilphCo_7F_EventScript_Joshua",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -209,7 +209,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_7F",
       "var_value": 0,
-      "script": "SilphCo_7F_EventScript_1619BC"
+      "script": "SilphCo_7F_EventScript_RivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -218,7 +218,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_7F",
       "var_value": 0,
-      "script": "SilphCo_7F_EventScript_1619C8"
+      "script": "SilphCo_7F_EventScript_RivalTriggerBottom"
     }
   ],
   "bg_events": [
@@ -321,7 +321,7 @@
       "x": 20,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_7F_EventScript_161BFA"
+      "script": "SilphCo_7F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
index 9ca4f31ec..0bfac0151 100644
--- a/data/maps/SilphCo_7F/scripts.inc
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -11,30 +11,26 @@ SilphCo_7F_OnLoad:: @ 816198F
 
 SilphCo_7F_OnTransition:: @ 81619AB
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	call_if_ge EventScript_1619B7
+	call_if_ge SilphCo_7F_EventScript_SetObjRocketsGone
 	end
 
-EventScript_1619B7:: @ 81619B7
-	setobjectmovementtype 8, 7
+SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7
+	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP
 	return
 
-SilphCo_7F_EventScript_1619BC:: @ 81619BC
+SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1619D4
-
-EventScript_1619C7:: @ 81619C7
+	goto SilphCo_7F_EventScript_RivalScene
 	end
 
-SilphCo_7F_EventScript_1619C8:: @ 81619C8
+SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_1619D4
-
-EventScript_1619D3:: @ 81619D3
+	goto SilphCo_7F_EventScript_RivalScene
 	end
 
-EventScript_1619D4:: @ 81619D4
+SilphCo_7F_EventScript_RivalScene:: @ 81619D4
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	applymovement 1, Movement_ExclamationMark
@@ -42,26 +38,26 @@ EventScript_1619D4:: @ 81619D4
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	applymovement 1, Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_8176710
+	msgbox SilphCo_7F_Text_RivalWhatKeptYou
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161A73
+	call_if_eq SilphCo_7F_EventScript_RivalApproachTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161A7F
-	msgbox gUnknown_8176727
+	call_if_eq SilphCo_7F_EventScript_RivalApproachBottom
+	msgbox SilphCo_7F_Text_RivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_161A80
+	call_if_eq SilphCo_7F_EventScript_RivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_161A8B
+	call_if_eq SilphCo_7F_EventScript_RivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_161A96
-	msgbox gUnknown_8176827
+	call_if_eq SilphCo_7F_EventScript_RivalCharmander
+	msgbox SilphCo_7F_Text_RivalPostBattle
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161AA1
+	call_if_eq SilphCo_7F_EventScript_RivalExitTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161AAC
+	call_if_eq SilphCo_7F_EventScript_RivalExitBottom
 	playse SE_TK_WARPIN
 	fadedefaultbgm
 	removeobject 1
@@ -70,42 +66,42 @@ EventScript_1619D4:: @ 81619D4
 	releaseall
 	end
 
-EventScript_161A73:: @ 8161A73
+SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73
 	closemessage
-	applymovement 1, Movement_161AB7
+	applymovement 1, SilphCo_7F_Movement_RivalApproachTop
 	waitmovement 0
 	return
 
-EventScript_161A7F:: @ 8161A7F
+SilphCo_7F_EventScript_RivalApproachBottom:: @ 8161A7F
 	return
 
-EventScript_161A80:: @ 8161A80
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0
+SilphCo_7F_EventScript_RivalSquirtle:: @ 8161A80
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161A8B:: @ 8161A8B
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0
+SilphCo_7F_EventScript_RivalBulbasaur:: @ 8161A8B
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161A96:: @ 8161A96
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0
+SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161AA1:: @ 8161AA1
-	applymovement 1, Movement_161AB9
+SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1
+	applymovement 1, SilphCo_7F_Movement_RivalExitTop
 	waitmovement 0
 	return
 
-EventScript_161AAC:: @ 8161AAC
-	applymovement 1, Movement_161ABF
+SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC
+	applymovement 1, SilphCo_7F_Movement_RivalExitBottom
 	waitmovement 0
 	return
 
-Movement_161AB7:: @ 8161AB7
+SilphCo_7F_Movement_RivalApproachTop:: @ 8161AB7
 	walk_up
 	step_end
 
-Movement_161AB9:: @ 8161AB9
+SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9
 	walk_right
 	walk_right
 	walk_right
@@ -113,7 +109,7 @@ Movement_161AB9:: @ 8161AB9
 	delay_16
 	step_end
 
-Movement_161ABF:: @ 8161ABF
+SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF
 	walk_left
 	walk_up
 	walk_up
@@ -124,136 +120,130 @@ Movement_161ABF:: @ 8161ABF
 	delay_16
 	step_end
 
-SilphCo_7F_EventScript_161AC8:: @ 8161AC8
+SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D
-	msgbox gUnknown_8176266
+	goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras
+	msgbox SilphCo_7F_Text_HaveMonForSavingUs
 	setvar VAR_TEMP_1, SPECIES_LAPRAS
 	givemon SPECIES_LAPRAS, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_161B12
+	goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_161B45
+	goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasPC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_161B12:: @ 8161B12
+SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12
 	textcolor 3
 	playfanfare MUS_FANFA1
-	message Text_1762D7
+	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_161B7E
+	goto_if_eq SilphCo_7F_EventScript_EndReceiveLapras
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_161B7E
-
-EventScript_161B44:: @ 8161B44
+	goto SilphCo_7F_EventScript_EndReceiveLapras
 	end
 
-EventScript_161B45:: @ 8161B45
+SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45
 	textcolor 3
 	playfanfare MUS_FANFA1
-	message Text_1762D7
+	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_161B73
+	goto_if_eq SilphCo_7F_EventScript_LaprasTransferredToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_161B73
-
-EventScript_161B72:: @ 8161B72
+	goto SilphCo_7F_EventScript_LaprasTransferredToPC
 	end
 
-EventScript_161B73:: @ 8161B73
+SilphCo_7F_EventScript_LaprasTransferredToPC:: @ 8161B73
 	call EventScript_TransferredToPC
-	goto EventScript_161B7E
-
-EventScript_161B7D:: @ 8161B7D
+	goto SilphCo_7F_EventScript_EndReceiveLapras
 	end
 
-EventScript_161B7E:: @ 8161B7E
+SilphCo_7F_EventScript_EndReceiveLapras:: @ 8161B7E
 	textcolor 0
-	msgbox gUnknown_8176305
+	msgbox SilphCo_7F_Text_ExplainLapras
 	setflag FLAG_GOT_LAPRAS_FROM_SILPH
 	release
 	end
 
-EventScript_161B8D:: @ 8161B8D
-	msgbox gUnknown_81763DD
+SilphCo_7F_EventScript_AlreadyGotLapras:: @ 8161B8D
+	msgbox SilphCo_7F_Text_RocketBossWentToBoardroom
 	release
 	end
 
-SilphCo_7F_EventScript_161B97:: @ 8161B97
+SilphCo_7F_EventScript_WorkerM1:: @ 8161B97
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BAE
-	msgbox gUnknown_8176444
+	goto_if_ge SilphCo_7F_EventScript_WorkerM1RocketsGone
+	msgbox SilphCo_7F_Text_RocketsAfterMasterBall
 	release
 	end
 
-EventScript_161BAE:: @ 8161BAE
-	msgbox gUnknown_8176486
+SilphCo_7F_EventScript_WorkerM1RocketsGone:: @ 8161BAE
+	msgbox SilphCo_7F_Text_CanceledMasterBallProject
 	release
 	end
 
-SilphCo_7F_EventScript_161BB8:: @ 8161BB8
+SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BCF
-	msgbox gUnknown_81764C2
+	goto_if_ge SilphCo_7F_EventScript_WorkerM2RocketsGone
+	msgbox SilphCo_7F_Text_BadIfTeamRocketTookOver
 	release
 	end
 
-EventScript_161BCF:: @ 8161BCF
-	msgbox gUnknown_8176501
+SilphCo_7F_EventScript_WorkerM2RocketsGone:: @ 8161BCF
+	msgbox SilphCo_7F_Text_WowYouChasedOffTeamRocket
 	release
 	end
 
-SilphCo_7F_EventScript_161BD9:: @ 8161BD9
+SilphCo_7F_EventScript_WorkerF:: @ 8161BD9
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BF0
-	msgbox gUnknown_8176532
+	goto_if_ge SilphCo_7F_EventScript_WorkerFRocketsGone
+	msgbox SilphCo_7F_Text_ReallyDangerousHere
 	release
 	end
 
-EventScript_161BF0:: @ 8161BF0
-	msgbox gUnknown_8176573
+SilphCo_7F_EventScript_WorkerFRocketsGone:: @ 8161BF0
+	msgbox SilphCo_7F_Text_ThankYouSoMuch
 	release
 	end
 
-SilphCo_7F_EventScript_161BFA:: @ 8161BFA
-	msgbox gUnknown_8176954, MSGBOX_SIGN
+SilphCo_7F_EventScript_FloorSign:: @ 8161BFA
+	msgbox SilphCo_7F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_7F_EventScript_161C03:: @ 8161C03
-	trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C
-	msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Joshua:: @ 8161C03
+	trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat
+	msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C1A:: @ 8161C1A
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669
-	msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt1:: @ 8161C1A
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat
+	msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C31:: @ 8161C31
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7
-	msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt2:: @ 8161C31
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat
+	msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C48:: @ 8161C48
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5
-	msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt3:: @ 8161C48
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat
+	msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc
index d977d816e..27e01c4a5 100644
--- a/data/maps/SilphCo_7F/text.inc
+++ b/data/maps/SilphCo_7F/text.inc
@@ -1,15 +1,15 @@
-gUnknown_8176266:: @ 8176266
+SilphCo_7F_Text_HaveMonForSavingUs:: @ 8176266
     .string "Oh! Hi! You're not a ROCKET!\n"
     .string "You came to save us?\l"
     .string "Why, thank you!\p"
     .string "I want you to have this POKéMON\n"
     .string "for saving us.$"
 
-Text_1762D7:: @ 81762D7
+SilphCo_7F_Text_ObtainedLaprasFromEmployee:: @ 81762D7
     .string "{PLAYER} obtained a LAPRAS from\n"
     .string "the SILPH employee!$"
 
-gUnknown_8176305:: @ 8176305
+SilphCo_7F_Text_ExplainLapras:: @ 8176305
     .string "It's a LAPRAS.\n"
     .string "It's a very intelligent POKéMON.\p"
     .string "We kept it in our lab, but it will\n"
@@ -19,94 +19,94 @@ gUnknown_8176305:: @ 8176305
     .string "It's a good swimmer.\n"
     .string "It'll give you a lift across water!$"
 
-gUnknown_81763DD:: @ 81763DD
+SilphCo_7F_Text_RocketBossWentToBoardroom:: @ 81763DD
     .string "TEAM ROCKET's BOSS went to the\n"
     .string "boardroom!\p"
     .string "Is our PRESIDENT okay?\n"
     .string "I'm worried.$"
 
-Text_17642B:: @ 817642B
+SilphCo_7F_Text_OhNo:: @ 817642B
     .string "あ‥　もう　もてないぞ$"
 
-Text_176437:: @ 8176437
+SilphCo_7F_Text_SavedAtLast:: @ 8176437
     .string "たすかったよ　ありがと！$"
 
-gUnknown_8176444:: @ 8176444
+SilphCo_7F_Text_RocketsAfterMasterBall:: @ 8176444
     .string "TEAM ROCKET was after the MASTER\n"
     .string "BALL, which catches any POKéMON.$"
 
-gUnknown_8176486:: @ 8176486
+SilphCo_7F_Text_CanceledMasterBallProject:: @ 8176486
     .string "We canceled the MASTER BALL\n"
     .string "project because of TEAM ROCKET.$"
 
-gUnknown_81764C2:: @ 81764C2
+SilphCo_7F_Text_BadIfTeamRocketTookOver:: @ 81764C2
     .string "It would be bad if TEAM ROCKET\n"
     .string "took over SILPH or our POKéMON.$"
 
-gUnknown_8176501:: @ 8176501
+SilphCo_7F_Text_WowYouChasedOffTeamRocket:: @ 8176501
     .string "Wow!\p"
     .string "You chased off TEAM ROCKET all by\n"
     .string "yourself?$"
 
-gUnknown_8176532:: @ 8176532
+SilphCo_7F_Text_ReallyDangerousHere:: @ 8176532
     .string "You!\n"
     .string "It's really dangerous here!\p"
     .string "You came to save me?\n"
     .string "You can't!$"
 
-gUnknown_8176573:: @ 8176573
+SilphCo_7F_Text_ThankYouSoMuch:: @ 8176573
     .string "Thank you so much!$"
 
-Text_176586:: @ 8176586
+SilphCo_7F_Text_Grunt3Intro:: @ 8176586
     .string "Uh-oh!\n"
     .string "I smell a little mouse!$"
 
-Text_1765A5:: @ 81765A5
+SilphCo_7F_Text_Grunt3Defeat:: @ 81765A5
     .string "Lights out!$"
 
-gUnknown_81765B1:: @ 81765B1
+SilphCo_7F_Text_Grunt3PostBattle:: @ 81765B1
     .string "You won't find my BOSS by just\n"
     .string "scurrying around!$"
 
-Text_1765E2:: @ 81765E2
+SilphCo_7F_Text_JoshuaIntro:: @ 81765E2
     .string "Heheh!\p"
     .string "You mistook me for a SILPH worker?$"
 
-Text_17660C:: @ 817660C
+SilphCo_7F_Text_JoshuaDefeat:: @ 817660C
     .string "I'm done!$"
 
-gUnknown_8176616:: @ 8176616
+SilphCo_7F_Text_JoshuaPostBattle:: @ 8176616
     .string "Despite your age, you are a\n"
     .string "skilled TRAINER!$"
 
-Text_176643:: @ 8176643
+SilphCo_7F_Text_Grunt1Intro:: @ 8176643
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176669:: @ 8176669
+SilphCo_7F_Text_Grunt1Defeat:: @ 8176669
     .string "Aack!\n"
     .string "Brothers, I lost!$"
 
-gUnknown_8176681:: @ 8176681
+SilphCo_7F_Text_Grunt1PostBattle:: @ 8176681
     .string "Doesn't matter.\n"
     .string "My brothers will repay the favor!$"
 
-Text_1766B3:: @ 81766B3
+SilphCo_7F_Text_Grunt2Intro:: @ 81766B3
     .string "A child intruder?\n"
     .string "That must be you!$"
 
-Text_1766D7:: @ 81766D7
+SilphCo_7F_Text_Grunt2Defeat:: @ 81766D7
     .string "Fine!\n"
     .string "I lost!$"
 
-gUnknown_81766E5:: @ 81766E5
+SilphCo_7F_Text_Grunt2PostBattle:: @ 81766E5
     .string "Go on home before my BOSS gets\n"
     .string "ticked off!$"
 
-gUnknown_8176710:: @ 8176710
+SilphCo_7F_Text_RivalWhatKeptYou:: @ 8176710
     .string "{RIVAL}: What kept you, {PLAYER}?$"
 
-gUnknown_8176727:: @ 8176727
+SilphCo_7F_Text_RivalIntro:: @ 8176727
     .string "{RIVAL}: Hahaha! I thought you'd\n"
     .string "turn up if I waited here!\p"
     .string "I guess TEAM ROCKET slowed you\n"
@@ -114,18 +114,18 @@ gUnknown_8176727:: @ 8176727
     .string "I saw you in SAFFRON, so I decided\n"
     .string "to see if you got better!$"
 
-Text_1767D0:: @ 81767D0
+SilphCo_7F_Text_RivalDefeat:: @ 81767D0
     .string "Oh, man!\n"
     .string "So, you are ready for BOSS\l"
     .string "ROCKET!$"
 
-Text_1767FC:: @ 81767FC
+SilphCo_7F_Text_RivalVictory:: @ 81767FC
     .string "{RIVAL}“おまえなあ‥\p"
     .string "こんな　うでまえじゃ\n"
     .string "まだまだ‥\l"
     .string "いちにんまえ　とは　いえないぜ$"
 
-gUnknown_8176827:: @ 8176827
+SilphCo_7F_Text_RivalPostBattle:: @ 8176827
     .string "Well, {PLAYER}!\n"
     .string "I'm moving on up and ahead!\p"
     .string "By checking my POKéDEX, I'm\n"
@@ -140,7 +140,7 @@ gUnknown_8176827:: @ 8176827
     .string "Don't sweat it!\l"
     .string "Smell ya!$"
 
-gUnknown_8176954:: @ 8176954
+SilphCo_7F_Text_FloorSign:: @ 8176954
     .string "SILPH CO. HEAD OFFICE\n"
     .string "7F$"
 
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index ef04548df..badb0553e 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_8F_EventScript_161CB0",
+      "script": "SilphCo_8F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_8F_EventScript_161CC7",
+      "script": "SilphCo_8F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_8F_EventScript_161C99",
+      "script": "SilphCo_8F_EventScript_Parker",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_8F_EventScript_161C6F",
+      "script": "SilphCo_8F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_8F_EventScript_1AD0ED",
+      "script": "SilphCo_8F_EventScript_Scientist",
       "flag": "0"
     }
   ],
@@ -188,7 +188,7 @@
       "x": 27,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_8F_EventScript_161C90"
+      "script": "SilphCo_8F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
index f96188c3f..d888f339e 100644
--- a/data/maps/SilphCo_8F/scripts.inc
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -6,35 +6,35 @@ SilphCo_8F_OnLoad:: @ 8161C65
 	call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor
 	end
 
-SilphCo_8F_EventScript_161C6F:: @ 8161C6F
+SilphCo_8F_EventScript_WorkerM:: @ 8161C6F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161C86
-	msgbox gUnknown_817696D
+	goto_if_ge SilphCo_8F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_8F_Text_WonderIfSilphIsFinished
 	release
 	end
 
-EventScript_161C86:: @ 8161C86
-	msgbox gUnknown_817698C
+SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86
+	msgbox SilphCo_8F_Text_ThanksForSavingUs
 	release
 	end
 
-SilphCo_8F_EventScript_161C90:: @ 8161C90
-	msgbox gUnknown_8176AB2, MSGBOX_SIGN
+SilphCo_8F_EventScript_FloorSign:: @ 8161C90
+	msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_8F_EventScript_161C99:: @ 8161C99
-	trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19
-	msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Parker:: @ 8161C99
+	trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat
+	msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_8F_EventScript_161CB0:: @ 8161CB0
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE
-	msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt1:: @ 8161CB0
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat
+	msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_8F_EventScript_161CC7:: @ 8161CC7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C
-	msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt2:: @ 8161CC7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat
+	msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc
index 858d5da17..9144cda4e 100644
--- a/data/maps/SilphCo_8F/text.inc
+++ b/data/maps/SilphCo_8F/text.inc
@@ -1,42 +1,49 @@
-gUnknown_817696D:: @ 817696D
+SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D
     .string "I wonder if SILPH is finished…$"
 
-gUnknown_817698C:: @ 817698C
+SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C
     .string "Thanks for saving us!$"
 
-Text_1769A2:: @ 81769A2
+SilphCo_8F_Text_Grunt1Intro:: @ 81769A2
     .string "That's as far as you'll go!$"
 
-Text_1769BE:: @ 81769BE
+SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE
     .string "Not enough grit!$"
 
-gUnknown_81769CF:: @ 81769CF
+SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF
     .string "If you don't turn back…\n"
     .string "I'll call for backup!$"
 
-Text_1769FD:: @ 81769FD
+SilphCo_8F_Text_ParkerIntro:: @ 81769FD
     .string "You're causing us problems!$"
 
-Text_176A19:: @ 8176A19
+SilphCo_8F_Text_ParkerDefeat:: @ 8176A19
     .string "Huh?\n"
     .string "I lost?$"
 
-gUnknown_8176A26:: @ 8176A26
+SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26
     .string "So, what do you think of SILPH\n"
     .string "BUILDING's maze?$"
 
-Text_176A56:: @ 8176A56
+SilphCo_8F_Text_Grunt2Intro:: @ 8176A56
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176A7C:: @ 8176A7C
+SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C
     .string "Whoo!\n"
     .string "Oh, Brothers!$"
 
-gUnknown_8176A90:: @ 8176A90
+SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90
     .string "I'll leave you up to my brothers.$"
 
-gUnknown_8176AB2:: @ 8176AB2
+SilphCo_8F_Text_FloorSign:: @ 8176AB2
     .string "SILPH CO. HEAD OFFICE\n"
     .string "8F$"
 
+SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB
+    .string "TEAM ROCKET's BOSS is terribly\n"
+    .string "cruel!\p"
+    .string "To him, POKéMON are just tools to\n"
+    .string "be used.\p"
+    .string "What will happen if that tyrant\n"
+    .string "takes over our company…$"
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index e8f39eba5..92a229699 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_9F_EventScript_161D41",
+      "script": "SilphCo_9F_EventScript_Ed",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_9F_EventScript_161D6F",
+      "script": "SilphCo_9F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_9F_EventScript_161D09",
+      "script": "SilphCo_9F_EventScript_HealWoman",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_9F_EventScript_161D58",
+      "script": "SilphCo_9F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -242,7 +242,7 @@
       "x": 17,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_9F_EventScript_161D38"
+      "script": "SilphCo_9F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 7f4258b5d..5cdfc2c82 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -9,38 +9,38 @@ SilphCo_9F_OnLoad:: @ 8161CE4
 	call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4
 	end
 
-SilphCo_9F_EventScript_161D09:: @ 8161D09
+SilphCo_9F_EventScript_HealWoman:: @ 8161D09
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161D2E
-	msgbox gUnknown_8176B54
+	goto_if_ge SilphCo_9F_EventScript_HealWomanRocketsGone
+	msgbox SilphCo_9F_Text_YouShouldTakeQuickNap
 	closemessage
 	call EventScript_OutOfCenterPartyHeal
-	msgbox gUnknown_8176B81
+	msgbox SilphCo_9F_Text_DontGiveUp
 	release
 	end
 
-EventScript_161D2E:: @ 8161D2E
-	msgbox gUnknown_8176B90
+SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E
+	msgbox SilphCo_9F_Text_ThankYouSoMuch
 	release
 	end
 
-SilphCo_9F_EventScript_161D38:: @ 8161D38
-	msgbox gUnknown_8176CD4, MSGBOX_SIGN
+SilphCo_9F_EventScript_FloorSign:: @ 8161D38
+	msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_9F_EventScript_161D41:: @ 8161D41
-	trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B
-	msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Ed:: @ 8161D41
+	trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat
+	msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_9F_EventScript_161D58:: @ 8161D58
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8
-	msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt1:: @ 8161D58
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat
+	msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_9F_EventScript_161D6F:: @ 8161D6F
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0
-	msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt2:: @ 8161D6F
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat
+	msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc
index bf400f768..f89262090 100644
--- a/data/maps/SilphCo_9F/text.inc
+++ b/data/maps/SilphCo_9F/text.inc
@@ -1,55 +1,47 @@
-Text_176ACB:: @ 8176ACB
-    .string "TEAM ROCKET's BOSS is terribly\n"
-    .string "cruel!\p"
-    .string "To him, POKéMON are just tools to\n"
-    .string "be used.\p"
-    .string "What will happen if that tyrant\n"
-    .string "takes over our company…$"
-
-gUnknown_8176B54:: @ 8176B54
+SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54
     .string "You look tired.\n"
     .string "You should take a quick nap.$"
 
-gUnknown_8176B81:: @ 8176B81
+SilphCo_9F_Text_DontGiveUp:: @ 8176B81
     .string "Don't give up!$"
 
-gUnknown_8176B90:: @ 8176B90
+SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90
     .string "Thank you so much.$"
 
-Text_176BA3:: @ 8176BA3
+SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3
     .string "Your POKéMON seem to adore you,\n"
     .string "kid!$"
 
-Text_176BC8:: @ 8176BC8
+SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8
     .string "Ghaaah!$"
 
-gUnknown_8176BD0:: @ 8176BD0
+SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0
     .string "If I had started as a TRAINER at\n"
     .string "your age…$"
 
-Text_176BFB:: @ 8176BFB
+SilphCo_9F_Text_EdIntro:: @ 8176BFB
     .string "Your POKéMON have weak points!\n"
     .string "I can nail them!$"
 
-Text_176C2B:: @ 8176C2B
+SilphCo_9F_Text_EdDefeat:: @ 8176C2B
     .string "You hammered me!$"
 
-gUnknown_8176C3C:: @ 8176C3C
+SilphCo_9F_Text_EdPostBattle:: @ 8176C3C
     .string "Exploiting weak spots does work.\n"
     .string "Think about type advantages.$"
 
-Text_176C7A:: @ 8176C7A
+SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176CA0:: @ 8176CA0
+SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0
     .string "Warg!\n"
     .string "Brothers, I lost!$"
 
-gUnknown_8176CB8:: @ 8176CB8
+SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8
     .string "My brothers will avenge me!$"
 
-gUnknown_8176CD4:: @ 8176CD4
+SilphCo_9F_Text_FloorSign:: @ 8176CD4
     .string "SILPH CO. HEAD OFFICE\n"
     .string "9F$"
 
diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json
index 815ed916e..857d5c209 100644
--- a/data/maps/SilphCo_Elevator/map.json
+++ b/data/maps/SilphCo_Elevator/map.json
@@ -29,7 +29,7 @@
       "x": 0,
       "y": 2,
       "elevation": 3,
-      "script": "SilphCo_Elevator_EventScript_161F6F"
+      "script": "SilphCo_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
index 87ed62c9b..790eba70a 100644
--- a/data/maps/SilphCo_Elevator/scripts.inc
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -1,10 +1,10 @@
 SilphCo_Elevator_MapScripts:: @ 8161F6E
 	.byte 0
 
-SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
+SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F
 	lockall
 	setvar VAR_0x8004, 1
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -14,159 +14,137 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
 	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
-	case 0, EventScript_1621BF
-	case 1, EventScript_162197
-	case 2, EventScript_16216F
-	case 3, EventScript_162147
-	case 4, EventScript_16211F
-	case 5, EventScript_1620F7
-	case 6, EventScript_1620CF
-	case 7, EventScript_1620A7
-	case 8, EventScript_16207F
-	case 9, EventScript_162057
-	case 10, EventScript_16202F
-	case 11, EventScript_1621E7
-	case 127, EventScript_1621E7
+	case 0, SilphCo_Elevator_EventScript_To11F
+	case 1, SilphCo_Elevator_EventScript_To10F
+	case 2, SilphCo_Elevator_EventScript_To9F
+	case 3, SilphCo_Elevator_EventScript_To8F
+	case 4, SilphCo_Elevator_EventScript_To7F
+	case 5, SilphCo_Elevator_EventScript_To6F
+	case 6, SilphCo_Elevator_EventScript_To5F
+	case 7, SilphCo_Elevator_EventScript_To4F
+	case 8, SilphCo_Elevator_EventScript_To3F
+	case 9, SilphCo_Elevator_EventScript_To2F
+	case 10, SilphCo_Elevator_EventScript_To1F
+	case 11, SilphCo_Elevator_EventScript_ExitFloorSelect
+	case 127, SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16202F:: @ 816202F
+SilphCo_Elevator_EventScript_To1F:: @ 816202F
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 4
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 4
-	goto EventScript_1621E7
-
-EventScript_162056:: @ 8162056
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162057:: @ 8162057
+SilphCo_Elevator_EventScript_To2F:: @ 8162057
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 5
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 5
-	goto EventScript_1621E7
-
-EventScript_16207E:: @ 816207E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16207F:: @ 816207F
+SilphCo_Elevator_EventScript_To3F:: @ 816207F
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 6
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 6
-	goto EventScript_1621E7
-
-EventScript_1620A6:: @ 81620A6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620A7:: @ 81620A7
+SilphCo_Elevator_EventScript_To4F:: @ 81620A7
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 7
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 7
-	goto EventScript_1621E7
-
-EventScript_1620CE:: @ 81620CE
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620CF:: @ 81620CF
+SilphCo_Elevator_EventScript_To5F:: @ 81620CF
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 8
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 8
-	goto EventScript_1621E7
-
-EventScript_1620F6:: @ 81620F6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620F7:: @ 81620F7
+SilphCo_Elevator_EventScript_To6F:: @ 81620F7
 	setvar VAR_0x8006, 9
 	setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3
 	compare VAR_ELEVATOR_FLOOR, 9
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 9
-	goto EventScript_1621E7
-
-EventScript_16211E:: @ 816211E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16211F:: @ 816211F
+SilphCo_Elevator_EventScript_To7F:: @ 816211F
 	setvar VAR_0x8006, 10
 	setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3
 	compare VAR_ELEVATOR_FLOOR, 10
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 10
-	goto EventScript_1621E7
-
-EventScript_162146:: @ 8162146
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162147:: @ 8162147
+SilphCo_Elevator_EventScript_To8F:: @ 8162147
 	setvar VAR_0x8006, 11
 	setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 11
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 11
-	goto EventScript_1621E7
-
-EventScript_16216E:: @ 816216E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16216F:: @ 816216F
+SilphCo_Elevator_EventScript_To9F:: @ 816216F
 	setvar VAR_0x8006, 12
 	setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3
 	compare VAR_ELEVATOR_FLOOR, 12
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 12
-	goto EventScript_1621E7
-
-EventScript_162196:: @ 8162196
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162197:: @ 8162197
+SilphCo_Elevator_EventScript_To10F:: @ 8162197
 	setvar VAR_0x8006, 13
 	setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3
 	compare VAR_ELEVATOR_FLOOR, 13
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 13
-	goto EventScript_1621E7
-
-EventScript_1621BE:: @ 81621BE
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1621BF:: @ 81621BF
+SilphCo_Elevator_EventScript_To11F:: @ 81621BF
 	setvar VAR_0x8006, 14
 	setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3
 	compare VAR_ELEVATOR_FLOOR, 14
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 14
-	goto EventScript_1621E7
-
-EventScript_1621E6:: @ 81621E6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1621E7:: @ 81621E7
+SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_1621EC:: @ 81621EC
+SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc
index 26217512e..21a47dcd6 100644
--- a/data/maps/SixIsland_DottedHole_1F/scripts.inc
+++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc
@@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F
 	end
 
-SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
+SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C
 	lockall
 	braillemessage Braille_Text_Up
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
+SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195
 	lockall
 	braillemessage Braille_Text_Down
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
+SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E
 	lockall
 	braillemessage Braille_Text_Right
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
+SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7
 	lockall
 	braillemessage Braille_Text_Left
 	waitbuttonpress
diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json
index 449f0da2d..9d264d645 100644
--- a/data/maps/SixIsland_DottedHole_B1F/map.json
+++ b/data/maps/SixIsland_DottedHole_B1F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B1F_EventScript_16418C"
+      "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json
index 79cf28355..0dd58ba70 100644
--- a/data/maps/SixIsland_DottedHole_B2F/map.json
+++ b/data/maps/SixIsland_DottedHole_B2F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B2F_EventScript_1641A7"
+      "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json
index 6c7af4456..df77a280c 100644
--- a/data/maps/SixIsland_DottedHole_B3F/map.json
+++ b/data/maps/SixIsland_DottedHole_B3F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B3F_EventScript_16419E"
+      "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json
index 2490d48a7..56e07628d 100644
--- a/data/maps/SixIsland_DottedHole_B4F/map.json
+++ b/data/maps/SixIsland_DottedHole_B4F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B4F_EventScript_164195"
+      "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index e3cce0b89..0acc6464e 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire",
       "flag": "FLAG_HIDE_SAPPHIRE"
     },
     {
@@ -63,7 +63,7 @@
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F"
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
index a73503f7c..67f4c6a2d 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
@@ -1,29 +1,32 @@
+.equ LOCALID_SAPPHIRE, 1
+.equ LOCALID_THIEF,    2
+
 SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4
 	.byte 0
 
-SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
+SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5
 	lock
 	faceplayer
 	textcolor 3
 	playfanfare MUS_FAN5
-	message Text_17BD82
+	message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire
 	waitmessage
 	waitfanfare
 	closemessage
-	setobjectxyperm 2, 5, 0
-	addobject 2
+	setobjectxyperm LOCALID_THIEF, 5, 0
+	addobject LOCALID_THIEF
 	playse SE_RU_HYUU
-	applymovement 2, Movement_16440F
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn
 	waitmovement 0
 	playse SE_W070
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 12
@@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
 	special Special_ShakeScreen
 	delay 60
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164325
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164330
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16433B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164346
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest
 	textcolor 0
-	msgbox gUnknown_817BD97
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164351
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164366
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16437B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164390
-	removeobject 1
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest
+	removeobject LOCALID_SAPPHIRE
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_164304
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164304
-	msgbox gUnknown_817BDD4
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1643A5
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1643B7
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_1643C9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_1643DB
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest
 	playse SE_KAIDAN
 	delay 35
-	removeobject 2
+	removeobject LOCALID_THIEF
 	setflag FLAG_LEARNED_YES_NAH_CHANSEY
 	release
 	end
 
-EventScript_1642F9:: @ 81642F9
+@ Lots of redundant scripts below
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164304:: @ 8164304
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16430F:: @ 816430F
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_16431A:: @ 816431A
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_164325:: @ 8164325
-	applymovement 2, Movement_1643ED
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_164330:: @ 8164330
-	applymovement 2, Movement_1643ED
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_16433B:: @ 816433B
-	applymovement 2, Movement_1643F1
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164346:: @ 8164346
-	applymovement 2, Movement_1643F1
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164351:: @ 8164351
-	applymovement 2, Movement_1643F5
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164366:: @ 8164366
-	applymovement 2, Movement_1643F5
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16437B:: @ 816437B
-	applymovement 2, Movement_1643F7
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164390:: @ 8164390
-	applymovement 2, Movement_1643F7
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_1643A5:: @ 81643A5
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_1643F9
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
 	waitmovement 0
 	return
 
-EventScript_1643B7:: @ 81643B7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164401
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
 	waitmovement 0
 	return
 
-EventScript_1643C9:: @ 81643C9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164409
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-EventScript_1643DB:: @ 81643DB
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164409
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-Movement_1643ED:: @ 81643ED
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-Movement_1643F1:: @ 81643F1
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_1643F5:: @ 81643F5
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5
 	walk_right
 	step_end
 
-Movement_1643F7:: @ 81643F7
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7
 	walk_up
 	step_end
 
-Movement_1643F9:: @ 81643F9
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9
 	walk_fast_up
 	walk_fast_right
 	walk_fast_right
@@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9
 	walk_fast_right
 	step_end
 
-Movement_164401:: @ 8164401
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -207,7 +211,7 @@ Movement_164401:: @ 8164401
 	walk_fast_right
 	step_end
 
-Movement_164409:: @ 8164409
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -215,7 +219,7 @@ Movement_164409:: @ 8164409
 	walk_fast_up
 	step_end
 
-Movement_16440F:: @ 816440F
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F
 	face_down
 	disable_anim
 	slide_down
@@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F
 	restore_anim
 	step_end
 
-Movement_16441C:: @ 816441C
+SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
+SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F
 	lockall
 	setvar VAR_0x8005, 130
 	braillemessage_wait Braille_Text_LetTheTwo
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
index 713e8cadf..4fdef4a5d 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
@@ -1,12 +1,12 @@
-Text_17BD82:: @ 817BD82
+SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82
     .string "{PLAYER} found a SAPPHIRE!$"
 
-gUnknown_817BD97:: @ 817BD97
+SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97
     .string "Fufu… Fufufufu…\n"
     .string "I guessed right.\p"
     .string "I was right in tailing you!$"
 
-gUnknown_817BDD4:: @ 817BDD4
+SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4
     .string "I knew that there was a SAPPHIRE\n"
     .string "here, so it belongs to me!\p"
     .string "I'll sell it to TEAM ROCKET for\n"
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index f6dd0d71c..d3ba4d3c3 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_T_MORI",
   "region_map_section": "MAPSEC_BERRY_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
index 22ddfed8b..84f116348 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/map.json
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60",
+      "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
index 46e8e15f8..7729b3536 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
@@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, TRUE
-	call_if_eq EventScript_164D50
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut
 	compare VAR_0x8008, FALSE
-	call_if_eq EventScript_164D54
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall
 	end
 
-EventScript_164D50:: @ 8164D50
-	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2
+ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50
+	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT
 	return
 
-EventScript_164D54:: @ 8164D54
+ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54
 	setobjectxyperm 1, 6, 3
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
+ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2
+	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_164D90
-	msgbox gUnknown_817D13B
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold
+	msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold
 	closemessage
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-EventScript_164D90:: @ 8164D90
-	msgbox gUnknown_817D1C9
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90
+	msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou
 	giveitem ITEM_NUGGET
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164DB8
+	compare VAR_RESULT, FALSE
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget
 	setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL
-	goto EventScript_164DC2
+	goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	end
 
-EventScript_164DB8:: @ 8164DB8
-	msgbox gUnknown_817D2DC
+ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8
+	msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull
 	release
 	end
 
-EventScript_164DC2:: @ 8164DC2
-	msgbox gUnknown_817D28C
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2
+	msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget
 	release
 	end
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
index e8c5269dd..96a0603c4 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc
+++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817D13B:: @ 817D13B
+ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B
     .string "Hey, there!\n"
     .string "How's it going?\p"
     .string "What am I doing here, you ask?\n"
@@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B
     .string "When I strike it rich, I'm buying\n"
     .string "a house in KANTO.$"
 
-gUnknown_817D1C9:: @ 817D1C9
+ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9
     .string "Hey, there! How's it going?\n"
     .string "Did you hear? I've struck gold!\p"
     .string "You remembered that I was\n"
@@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9
     .string "So, I'll show you!\n"
     .string "This is for you!$"
 
-gUnknown_817D28C:: @ 817D28C
+ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C
     .string "That's a NUGGET!\p"
     .string "I can't give you any nuggets of\n"
     .string "wisdom, so that'll have to do!$"
 
-gUnknown_817D2DC:: @ 817D2DC
+ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC
     .string "Whoops, your BAG is crammed full!\n"
     .string "I'll give this to you later.$"
 
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json
index 924dbbcba..925dbdd69 100644
--- a/data/maps/SevenIsland_TrainerTower_1F/map.json
+++ b/data/maps/TrainerTower_1F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
-  "name": "SevenIsland_TrainerTower_1F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
+  "id": "MAP_TRAINER_TOWER_1F",
+  "name": "TrainerTower_1F",
+  "layout": "LAYOUT_TRAINER_TOWER_1F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,14 +84,14 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_map": "MAP_TRAINER_TOWER_2F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_map": "MAP_TRAINER_TOWER_LOBBY",
       "dest_warp_id": 0
     }
   ],
@@ -103,7 +103,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -112,7 +112,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -121,7 +121,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc
new file mode 100644
index 000000000..77917c4a4
--- /dev/null
+++ b/data/maps/TrainerTower_1F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_1F_MapScripts:: @ 81646B8
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ All Trainer Tower floors/roof share these scripts for their object events
+
+TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_EventScript_SinglesTrainer:: @ 81646CE
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_EventScript_Owner:: @ 81646E0
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/TrainerTower_2F/map.json
index 1ee41e1b4..e2e2f4c97 100644
--- a/data/maps/SevenIsland_TrainerTower_5F/map.json
+++ b/data/maps/TrainerTower_2F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
-  "name": "SevenIsland_TrainerTower_5F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
+  "id": "MAP_TRAINER_TOWER_2F",
+  "name": "TrainerTower_2F",
+  "layout": "LAYOUT_TRAINER_TOWER_2F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
+      "dest_map": "MAP_TRAINER_TOWER_3F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_map": "MAP_TRAINER_TOWER_1F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc
new file mode 100644
index 000000000..c34f36a34
--- /dev/null
+++ b/data/maps/TrainerTower_2F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_2F_MapScripts:: @ 81646E6
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_2F_EventScript_Owner:: @ 816470E
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/TrainerTower_3F/map.json
index 6d0fbaa4c..8db22b61d 100644
--- a/data/maps/SevenIsland_TrainerTower_2F/map.json
+++ b/data/maps/TrainerTower_3F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
-  "name": "SevenIsland_TrainerTower_2F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
+  "id": "MAP_TRAINER_TOWER_3F",
+  "name": "TrainerTower_3F",
+  "layout": "LAYOUT_TRAINER_TOWER_3F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_map": "MAP_TRAINER_TOWER_4F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_map": "MAP_TRAINER_TOWER_2F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc
new file mode 100644
index 000000000..0c8d434eb
--- /dev/null
+++ b/data/maps/TrainerTower_3F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_3F_MapScripts:: @ 8164714
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_3F_EventScript_Owner:: @ 816473C
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json
index d4a021ff3..32c868e91 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/TrainerTower_4F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
-  "name": "SevenIsland_TrainerTower_4F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
+  "id": "MAP_TRAINER_TOWER_4F",
+  "name": "TrainerTower_4F",
+  "layout": "LAYOUT_TRAINER_TOWER_4F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
+      "dest_map": "MAP_TRAINER_TOWER_5F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_map": "MAP_TRAINER_TOWER_3F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc
new file mode 100644
index 000000000..6e0e7e09f
--- /dev/null
+++ b/data/maps/TrainerTower_4F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_4F_MapScripts:: @ 8164742
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_4F_EventScript_Owner:: @ 816476A
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/TrainerTower_5F/map.json
index 780878898..7a32b597c 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/TrainerTower_5F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
-  "name": "SevenIsland_TrainerTower_3F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
+  "id": "MAP_TRAINER_TOWER_5F",
+  "name": "TrainerTower_5F",
+  "layout": "LAYOUT_TRAINER_TOWER_5F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_map": "MAP_TRAINER_TOWER_6F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_map": "MAP_TRAINER_TOWER_4F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc
new file mode 100644
index 000000000..71af237be
--- /dev/null
+++ b/data/maps/TrainerTower_5F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_5F_MapScripts:: @ 8164770
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_5F_EventScript_Owner:: @ 8164798
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json
new file mode 100644
index 000000000..05491cf05
--- /dev/null
+++ b/data/maps/TrainerTower_6F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_6F",
+  "name": "TrainerTower_6F",
+  "layout": "LAYOUT_TRAINER_TOWER_6F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_7F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc
new file mode 100644
index 000000000..8b9e1dd38
--- /dev/null
+++ b/data/maps/TrainerTower_6F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_6F_MapScripts:: @ 816479E
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_6F_EventScript_Owner:: @ 81647C6
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json
new file mode 100644
index 000000000..76f2a53f4
--- /dev/null
+++ b/data/maps/TrainerTower_7F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_7F",
+  "name": "TrainerTower_7F",
+  "layout": "LAYOUT_TRAINER_TOWER_7F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_8F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc
new file mode 100644
index 000000000..de47276ca
--- /dev/null
+++ b/data/maps/TrainerTower_7F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_7F_MapScripts:: @ 81647CC
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_7F_EventScript_Owner:: @ 81647F4
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json
new file mode 100644
index 000000000..26cabfb06
--- /dev/null
+++ b/data/maps/TrainerTower_8F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_8F",
+  "name": "TrainerTower_8F",
+  "layout": "LAYOUT_TRAINER_TOWER_8F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_ROOF",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_7F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc
new file mode 100644
index 000000000..fc168780b
--- /dev/null
+++ b/data/maps/TrainerTower_8F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_8F_MapScripts:: @ 81647FA
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_8F_EventScript_Owner:: @ 8164822
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json
index fef686312..7d004c2df 100644
--- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json
+++ b/data/maps/TrainerTower_Elevator/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-  "name": "SevenIsland_TrainerTower_Elevator",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+  "id": "MAP_TRAINER_TOWER_ELEVATOR",
+  "name": "TrainerTower_Elevator",
+  "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -29,7 +29,7 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03"
+      "script": "TrainerTower_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc
new file mode 100644
index 000000000..349667102
--- /dev/null
+++ b/data/maps/TrainerTower_Elevator/scripts.inc
@@ -0,0 +1,80 @@
+TrainerTower_Elevator_MapScripts:: @ 8164AF8
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03
+	lockall
+	setvar VAR_0x8004, 6
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
+	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
+	special Special_DrawElevatorCurrentFloorWindow
+	message Text_WantWhichFloor
+	waitmessage
+	setvar VAR_0x8004, 6
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	switch VAR_RESULT
+	case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof
+	case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby
+	end
+
+TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46
+	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
+	goto TrainerTower_Elevator_EventScript_ChooseFloor
+	end
+
+TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52
+	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
+	goto TrainerTower_Elevator_EventScript_ChooseFloor
+	end
+
+TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E
+	switch VAR_RESULT
+	case 0, TrainerTower_Elevator_EventScript_SelectRoof
+	case 1, TrainerTower_Elevator_EventScript_SelectLobby
+	case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect
+	case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect
+	end
+
+TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90
+	setvar VAR_0x8006, 3
+	setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
+	compare VAR_ELEVATOR_FLOOR, 3
+	goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
+	call TrainerTower_Elevator_EventScript_MoveElevator
+	setvar VAR_ELEVATOR_FLOOR, 3
+	special Special_CloseElevatorCurrentFloorWindow
+	delay 25
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
+	waitmovement 0
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
+	waitstate
+	releaseall
+	end
+
+TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD
+	goto TrainerTower_Elevator_EventScript_CloseFloorSelect
+	end
+
+TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3
+	special Special_CloseElevatorCurrentFloorWindow
+	releaseall
+	end
+
+TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8
+	special Special_CloseElevatorCurrentFloorWindow
+	closemessage
+	waitse
+	special Special_AnimateElevator
+	waitstate
+	setflag FLAG_TEMP_2
+	return
+
+TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5
+	walk_in_place_fastest_down
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	step_end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json
index 3f553ce47..23e8456c0 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json
+++ b/data/maps/TrainerTower_Lobby/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
-  "name": "SevenIsland_TrainerTower_Lobby",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+  "id": "MAP_TRAINER_TOWER_LOBBY",
+  "name": "TrainerTower_Lobby",
+  "layout": "LAYOUT_TRAINER_TOWER_LOBBY",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D",
+      "script": "TrainerTower_Lobby_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992",
+      "script": "TrainerTower_Lobby_EventScript_MartClerk",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966",
+      "script": "TrainerTower_Lobby_EventScript_Receptionist",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6",
+      "script": "TrainerTower_Lobby_EventScript_CooltrainerF",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF",
+      "script": "TrainerTower_Lobby_EventScript_BaldingMan",
       "flag": "0"
     }
   ],
@@ -84,7 +84,7 @@
       "x": 9,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_map": "MAP_TRAINER_TOWER_1F",
       "dest_warp_id": 1
     },
     {
@@ -98,7 +98,7 @@
       "x": 17,
       "y": 8,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_TRAINER_TOWER",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE"
+      "script": "TrainerTower_Lobby_EventScript_EntryTrigger"
     }
   ],
   "bg_events": [
@@ -119,7 +119,7 @@
       "x": 8,
       "y": 10,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8"
+      "script": "TrainerTower_Lobby_EventScript_ShowRecords"
     }
   ]
 }
diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc
new file mode 100644
index 000000000..0fc2422b6
--- /dev/null
+++ b/data/maps/TrainerTower_Lobby/scripts.inc
@@ -0,0 +1,226 @@
+TrainerTower_Lobby_MapScripts:: @ 8164839
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition
+	map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame
+	.byte 0
+
+TrainerTower_Lobby_OnResume:: @ 8164853
+	setvar VAR_TEMP_2, 0
+	ttower_resumetimer
+	ttower_shouldexit
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_Lobby_OnResumeEnd
+	@ Never reached, above always FALSE
+	setvar VAR_TEMP_0, 0
+	setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+TrainerTower_Lobby_OnResumeEnd:: @ 8164886
+	end
+
+TrainerTower_Lobby_OnReturnToField:: @ 8164887
+	addobject 1
+	addobject 2
+	addobject 3
+	addobject 4
+	addobject 5
+	end
+
+TrainerTower_Lobby_OnLoad:: @ 8164897
+	compare VAR_TEMP_D, 17
+	call_if_eq TrainerTower_Lobby_OpenCounterBarrier
+	end
+
+TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3
+	setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0
+	return
+
+TrainerTower_Lobby_OnTransition:: @ 81648AD
+	setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY
+	getplayerxy VAR_TEMP_D, VAR_RESULT
+	end
+
+TrainerTower_Lobby_OnFrame:: @ 81648B6
+	map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter
+	map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator
+	.2byte 0
+
+TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8
+	lockall
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
+	waitmovement 0
+	setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	waitse
+	setvar VAR_TEMP_D, 0
+	releaseall
+	end
+
+TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA
+	walk_down
+	walk_down
+	step_end
+
+TrainerTower_Lobby_EventScript_Enter:: @ 81648ED
+	setvar VAR_TEMP_0, 1
+	ttower_getchallengestatus
+	switch VAR_RESULT
+	case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge
+	case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
+	case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
+
+TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920
+	lock
+	faceplayer
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain
+	goto TrainerTower_Lobby_EventScript_ExitChallenge
+
+@ Presumably E-Reader related
+TrainerTower_Lobby_EventScript_164938:: @ 8164938
+	lock
+	faceplayer
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
+TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
+	waitmovement 0
+	setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
+	release
+TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C
+	end
+
+TrainerTower_Lobby_EventScript_Nurse:: @ 816495D
+	lock
+	faceplayer
+	call EventScript_PkmnCenterNurse
+	release
+	end
+
+TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966
+	lock
+	faceplayer
+	ttower_getbeatchallenge
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting
+	msgbox TrainerTower_Lobby_Text_GiveItYourBest
+	goto TrainerTower_Lobby_EventScript_ReceptionistEnd
+
+TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988
+	msgbox TrainerTower_Lobby_Text_ThanksForCompeting
+TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990
+	release
+	end
+
+TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992
+	goto_if_questlog EventScript_ReleaseEnd
+	lock
+	faceplayer
+	message Text_MayIHelpYou
+	waitmessage
+	pokemart TrainerTower_Lobby_Mart_Items
+	msgbox Text_PleaseComeAgain
+	release
+	end
+
+	.align 2
+TrainerTower_Lobby_Mart_Items:: @ 81649B8
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE
+	lockall
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
+	ttower_getnumfloors
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed
+	msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum
+	goto TrainerTower_Lobby_EventScript_AskEnterChallenge
+
+TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00
+	msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor
+TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08
+	message TrainerTower_Lobby_Text_LikeToChallengeTrainers
+	waitmessage
+	multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
+	switch VAR_RESULT
+	case 0, TrainerTower_Lobby_EventScript_ChooseChallenge
+	case 1, TrainerTower_Lobby_EventScript_DeclineChallenge
+	case 2, TrainerTower_Lobby_EventScript_ChallengeInfo
+	case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
+	end
+
+TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45
+	msgbox TrainerTower_Lobby_Text_ExplainTrainerTower
+	goto TrainerTower_Lobby_EventScript_AskEnterChallenge
+	end
+
+TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53
+	multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
+	switch VAR_RESULT
+	case 0, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 1, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 2, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 3, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 4, TrainerTower_Lobby_EventScript_DeclineChallenge
+	case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
+	end
+
+TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0
+	copyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
+	special HealPlayerParty
+	msgbox TrainerTower_Lobby_Text_StartClockGetSetGo
+	ttower_startchallenge
+	releaseall
+	end
+
+TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF
+	msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
+	waitmovement 0
+	releaseall
+	end
+
+TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4
+	face_right
+	step_end
+
+TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6
+	walk_down
+	step_end
+
+TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
+	lockall
+	fadescreen FADE_TO_BLACK
+	setvar VAR_0x8004, 1
+	special Special_BattleRecords
+	waitstate
+	releaseall
+	end
+
+TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6
+	msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC
+	end
+
+TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF
+	msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc
index bf1e73b91..4e6bb8b07 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc
+++ b/data/maps/TrainerTower_Lobby/text.inc
@@ -1,50 +1,52 @@
-gUnknown_817C794:: @ 817C794
+@ All Trainer Tower text (Lobby and Roof) is interleaved here
+
+TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794
     .string "Hello!\p"
     .string "Welcome to TRAINER TOWER where\n"
     .string "TRAINERS gather from all over!$"
 
-gUnknown_817C7D9:: @ 817C7D9
+TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9
     .string "TRAINERS from all over the world\n"
     .string "gather here to battle.\p"
     .string "Let me see…\p"
     .string "Right now, there are TRAINERS only\n"
     .string "up to Floor {STR_VAR_1}.$"
 
-gUnknown_817C850:: @ 817C850
+TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850
     .string "TRAINERS are awaiting your\n"
     .string "challenge up to the eighth floor.$"
 
-Text_17C88D:: @ 817C88D
+TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D
     .string "Would you like to challenge the\n"
     .string "waiting TRAINERS?$"
 
-gUnknown_817C8BF:: @ 817C8BF
+TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF
     .string "Okay, I'll get the clock started,\n"
     .string "so give it everything you have.\p"
     .string "On your marks…\p"
     .string "Get set…\p"
     .string "Go!$"
 
-gUnknown_817C91D:: @ 817C91D
+TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D
     .string "Please do visit us again!$"
 
-gUnknown_817C937:: @ 817C937
+TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937
     .string "That was too bad.\p"
     .string "I think you put in a tremendous\n"
     .string "effort in your battling.\p"
     .string "Please come back and try again!$"
 
-gUnknown_817C9A2:: @ 817C9A2
+TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2
     .string "I hope you give it your best.$"
 
-gUnknown_817C9C0:: @ 817C9C0
+TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0
     .string "When the TRAINERS switch places,\n"
     .string "the movement can be hectic.\p"
     .string "To avoid the stampede, we moved\n"
     .string "the reception counter here.\p"
     .string "I'm sorry for the inconvenience.$"
 
-Text_17CA5A:: @ 817CA5A
+TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A
     .string "Hello…\p"
     .string "I am the owner of this TOWER…\p"
     .string "How the sky soars above this\n"
@@ -54,10 +56,10 @@ Text_17CA5A:: @ 817CA5A
     .string "The way you battled…\n"
     .string "It, too, was perfection…$"
 
-Text_17CB09:: @ 817CB09
+TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09
     .string "This is for you…$"
 
-Text_17CB1A:: @ 817CB1A
+TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A
     .string "Oh!\n"
     .string "Stupendous!\p"
     .string "It's marvelous how you've come up\n"
@@ -67,28 +69,28 @@ Text_17CB1A:: @ 817CB1A
     .string "I'll have your record posted at\n"
     .string "the reception counter.$"
 
-Text_17CBC0:: @ 817CBC0
+TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0
     .string "You seem to have taken your sweet\n"
     .string "time getting here…$"
 
-Text_17CBF5:: @ 817CBF5
+TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5
     .string "What I would like to see is a\n"
     .string "better time out of you…\p"
     .string "I'm counting on you.\p"
     .string "Until then, farewell…$"
 
-Text_17CC56:: @ 817CC56
+TrainerTower_Text_XMinYZSec:: @ 817CC56
     .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-Text_17CC69:: @ 817CC69
+TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69
     .string "せいせきひょうです$"
 
-Text_17CC73:: @ 817CC73
+TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73
     .string "This is a two-on-two battle.\p"
     .string "You may not battle unless you have\n"
     .string "at least two POKéMON.$"
 
-gUnknown_817CCC9:: @ 817CCC9
+TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9
     .string "Here at TRAINER TOWER, there is an\n"
     .string "event called TIME ATTACK.\p"
     .string "You will be timed on how quickly\n"
@@ -101,16 +103,16 @@ gUnknown_817CCC9:: @ 817CCC9
     .string "You will not earn any EXP. Points\n"
     .string "or money by beating TRAINERS here.$"
 
-gUnknown_817CE1F:: @ 817CE1F
+TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F
     .string "Thank you for competing!$"
 
-gUnknown_817CE38:: @ 817CE38
+TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38
     .string "I'm here to see how good I am.\p"
     .string "I wonder what kinds of TRAINERS\n"
     .string "are waiting for me?\p"
     .string "It's nerve-racking!$"
 
-gUnknown_817CE9F:: @ 817CE9F
+TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F
     .string "Gasp, gasp…\n"
     .string "Gasp…\p"
     .string "Never mind battling! These stairs…\n"
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json
index ee3dbe4c0..c9a98a144 100644
--- a/data/maps/SevenIsland_TrainerTower_Roof/map.json
+++ b/data/maps/TrainerTower_Roof/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-  "name": "SevenIsland_TrainerTower_Roof",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+  "id": "MAP_TRAINER_TOWER_ROOF",
+  "name": "TrainerTower_Roof",
+  "layout": "LAYOUT_TRAINER_TOWER_ROOF",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     }
   ],
@@ -32,14 +32,14 @@
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
+      "dest_map": "MAP_TRAINER_TOWER_8F",
       "dest_warp_id": 0
     }
   ],
diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc
new file mode 100644
index 000000000..b338e3a62
--- /dev/null
+++ b/data/maps/TrainerTower_Roof/scripts.inc
@@ -0,0 +1,10 @@
+TrainerTower_Roof_MapScripts:: @ 8164828
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below script is unused, the identical version in the 1F script is used instead
+
+TrainerTower_Roof_EventScript_Owner:: @ 8164833
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc
deleted file mode 100644
index 4e136faae..000000000
--- a/data/maps/UnknownMap_03_50/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_50_MapScripts:: @ 81687E0
-	.byte 0
diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc
deleted file mode 100644
index 7398062d8..000000000
--- a/data/maps/UnknownMap_03_51/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_51_MapScripts:: @ 81687E1
-	.byte 0
diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc
deleted file mode 100644
index 2e48ca113..000000000
--- a/data/maps/UnknownMap_03_52/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_52_MapScripts:: @ 81687E2
-	.byte 0
diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc
deleted file mode 100644
index 2dec9650e..000000000
--- a/data/maps/UnknownMap_03_53/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_53_MapScripts:: @ 81687E3
-	.byte 0
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 03b6b0cdd..9f5ddc540 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_1F_EventScript_160F7B",
+      "script": "VictoryRoad_1F_EventScript_Rolando",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_1F_EventScript_160F64",
+      "script": "VictoryRoad_1F_EventScript_Naomi",
       "flag": "0"
     },
     {
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F",
       "var_value": 99,
-      "script": "VictoryRoad_1F_EventScript_160F33"
+      "script": "VictoryRoad_1F_EventScript_FloorSwitch"
     }
   ],
   "bg_events": [
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 79d01278f..5bdc91202 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05
 
 VictoryRoad_1F_OnLoad:: @ 8160F10
 	compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
-	call_if_ne EventScript_160F1C
+	call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier
 	end
 
-EventScript_160F1C:: @ 8160F1C
-	setmetatile 12, 14, 775, 1
-	setmetatile 12, 15, 791, 1
+VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C
+	setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
 VictoryRoad_1F_OnTransition:: @ 8160F2F
 	setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F
 	end
 
-VictoryRoad_1F_EventScript_160F33:: @ 8160F33
+VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
-	goto_if_eq EventScript_160F62
-	setmetatile 12, 14, 721, 0
-	setmetatile 12, 15, 737, 0
+	goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
+	setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33
 	releaseall
 	end
 
-EventScript_160F62:: @ 8160F62
+VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62
 	releaseall
 	end
 
-VictoryRoad_1F_EventScript_160F64:: @ 8160F64
-	trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738
-	msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Naomi:: @ 8160F64
+	trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat
+	msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B
-	trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8
-	msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B
+	trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat
+	msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc
index 46cd136ad..d83abf202 100644
--- a/data/maps/VictoryRoad_1F/text.inc
+++ b/data/maps/VictoryRoad_1F/text.inc
@@ -1,22 +1,22 @@
-Text_174710:: @ 8174710
+VictoryRoad_1F_Text_NaomiIntro:: @ 8174710
     .string "I wonder if you are good enough\n"
     .string "for me?$"
 
-Text_174738:: @ 8174738
+VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738
     .string "I lost out…$"
 
-gUnknown_8174744:: @ 8174744
+VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744
     .string "I never wanted to lose to anybody,\n"
     .string "especially to a younger kid…$"
 
-Text_174784:: @ 8174784
+VictoryRoad_1F_Text_RolandoIntro:: @ 8174784
     .string "I can see you're good.\n"
     .string "Let me see exactly how good!$"
 
-Text_1747B8:: @ 81747B8
+VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8
     .string "I had a chance…$"
 
-gUnknown_81747C8:: @ 81747C8
+VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8
     .string "Tch!\n"
     .string "I concede, you are better than I!$"
 
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index bb44ea7d0..33024c025 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161037",
+      "script": "VictoryRoad_2F_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_16104E",
+      "script": "VictoryRoad_2F_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_161065",
+      "script": "VictoryRoad_2F_EventScript_Nelson",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161093",
+      "script": "VictoryRoad_2F_EventScript_Vincent",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "VictoryRoad_2F_EventScript_16107C",
+      "script": "VictoryRoad_2F_EventScript_Gregory",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_160FD5"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch1"
     },
     {
       "type": "trigger",
@@ -265,7 +265,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_161006"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc
index 49d21b7de..1dfd658ae 100644
--- a/data/maps/VictoryRoad_2F/scripts.inc
+++ b/data/maps/VictoryRoad_2F/scripts.inc
@@ -4,27 +4,27 @@ VictoryRoad_2F_MapScripts:: @ 8160F92
 
 VictoryRoad_2F_OnLoad:: @ 8160F98
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	call_if_ne EventScript_160FAF
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	call_if_ne EventScript_160FC2
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2
 	end
 
-EventScript_160FAF:: @ 8160FAF
-	setmetatile 13, 10, 775, 1
-	setmetatile 13, 11, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF
+	setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-EventScript_160FC2:: @ 8160FC2
-	setmetatile 33, 16, 775, 1
-	setmetatile 33, 17, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2
+	setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
+VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	goto_if_eq EventScript_161004
-	setmetatile 13, 10, 721, 0
-	setmetatile 13, 11, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
+	setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -33,16 +33,16 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
 	releaseall
 	end
 
-EventScript_161004:: @ 8161004
+VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161006:: @ 8161006
+VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	goto_if_eq EventScript_161035
-	setmetatile 33, 16, 721, 0
-	setmetatile 33, 17, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
+	setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006
 	releaseall
 	end
 
-EventScript_161035:: @ 8161035
+VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161037:: @ 8161037
-	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C
-	msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Dawson:: @ 8161037
+	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat
+	msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16104E:: @ 816104E
-	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4
-	msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Daisuke:: @ 816104E
+	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat
+	msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161065:: @ 8161065
-	trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B
-	msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Nelson:: @ 8161065
+	trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat
+	msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16107C:: @ 816107C
-	trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0
-	msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Gregory:: @ 816107C
+	trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat
+	msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161093:: @ 8161093
-	trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A
-	msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Vincent:: @ 8161093
+	trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat
+	msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc
index d125ef160..301a5f22b 100644
--- a/data/maps/VictoryRoad_2F/text.inc
+++ b/data/maps/VictoryRoad_2F/text.inc
@@ -1,54 +1,58 @@
-Text_1747EF:: @ 81747EF
+VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF
     .string "If you can get through here,\n"
     .string "you can go meet the ELITE FOUR.$"
 
-Text_17482C:: @ 817482C
+VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C
     .string "No!\n"
     .string "Unbelievable!$"
 
-gUnknown_817483E:: @ 817483E
+VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E
     .string "I can beat you when it comes to\n"
     .string "knowledge about POKéMON!$"
 
-Text_174877:: @ 8174877
+VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877
     .string "This here is VICTORY ROAD.\n"
     .string "It's the final test for TRAINERS!$"
 
-Text_1748B4:: @ 81748B4
+VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4
     .string "Atcho!$"
 
-gUnknown_81748BB:: @ 81748BB
+VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB
     .string "If you get stuck, try moving some\n"
     .string "boulders around.$"
 
-Text_1748EE:: @ 81748EE
+VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE
     .string "Ah, so you wish to challenge the\n"
     .string "ELITE FOUR?$"
 
-Text_17491B:: @ 817491B
+VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B
     .string "You got me!$"
 
-gUnknown_8174927:: @ 8174927
+VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927
     .string "{RIVAL} also came through here.$"
 
-Text_174942:: @ 8174942
+VictoryRoad_2F_Text_VincentIntro:: @ 8174942
     .string "Come on!\n"
     .string "I'll whip you!$"
 
-Text_17495A:: @ 817495A
+VictoryRoad_2F_Text_VincentDefeat:: @ 817495A
     .string "I got whipped!$"
 
-gUnknown_8174969:: @ 8174969
+VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969
     .string "You earned the right to be on\n"
     .string "VICTORY ROAD…$"
 
-Text_174995:: @ 8174995
+VictoryRoad_2F_Text_GregoryIntro:: @ 8174995
     .string "Is VICTORY ROAD too tough?$"
 
-Text_1749B0:: @ 81749B0
+VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0
     .string "Well done!$"
 
-gUnknown_81749BB:: @ 81749BB
+VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB
     .string "Many TRAINERS give up their\n"
     .string "challenge here and go home.$"
 
+@ Unused, old text for Moltres
+VictoryRoad_2F_Text_Gyaoo:: @ 81749F3
+    .string "ギヤーオ！$"
+
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index 9d2b982a9..ffde167e7 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_161103",
+      "script": "VictoryRoad_3F_EventScript_George",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_3F_EventScript_161148",
+      "script": "VictoryRoad_3F_EventScript_Alexa",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "VictoryRoad_3F_EventScript_16111A",
+      "script": "VictoryRoad_3F_EventScript_Colby",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "VictoryRoad_3F_EventScript_161131",
+      "script": "VictoryRoad_3F_EventScript_Caroline",
       "flag": "0"
     },
     {
@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_16115F",
+      "script": "VictoryRoad_3F_EventScript_Ray",
       "flag": "0"
     },
     {
@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_16117A",
+      "script": "VictoryRoad_3F_EventScript_Tyra",
       "flag": "0"
     }
   ],
@@ -215,7 +215,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F",
       "var_value": 99,
-      "script": "VictoryRoad_3F_EventScript_1610CF"
+      "script": "VictoryRoad_3F_EventScript_FloorSwitch"
     }
   ],
   "bg_events": []
diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc
index 4cd011f92..f601d83be 100644
--- a/data/maps/VictoryRoad_3F/scripts.inc
+++ b/data/maps/VictoryRoad_3F/scripts.inc
@@ -4,20 +4,20 @@ VictoryRoad_3F_MapScripts:: @ 81610AA
 
 VictoryRoad_3F_OnLoad:: @ 81610B0
 	compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
-	call_if_ne EventScript_1610BC
+	call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier
 	end
 
-EventScript_1610BC:: @ 81610BC
-	setmetatile 12, 12, 775, 1
-	setmetatile 12, 13, 791, 1
+VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC
+	setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
+VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
-	goto_if_eq EventScript_161101
-	setmetatile 12, 12, 721, 0
-	setmetatile 12, 13, 737, 0
+	goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed
+	setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
 	releaseall
 	end
 
-EventScript_161101:: @ 8161101
+VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101
 	releaseall
 	end
 
-VictoryRoad_3F_EventScript_161103:: @ 8161103
-	trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83
-	msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_George:: @ 8161103
+	trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat
+	msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16111A:: @ 816111A
-	trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9
-	msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Colby:: @ 816111A
+	trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat
+	msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_161131:: @ 8161131
-	trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A
-	msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Caroline:: @ 8161131
+	trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat
+	msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_161148:: @ 8161148
-	trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4
-	msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Alexa:: @ 8161148
+	trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat
+	msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16115F:: @ 816115F
-	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96
-	msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Ray:: @ 816115F
+	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons
+	msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16117A:: @ 816117A
-	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D
-	msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Tyra:: @ 816117A
+	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons
+	msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc
index 22c42342a..dd60180df 100644
--- a/data/maps/VictoryRoad_3F/text.inc
+++ b/data/maps/VictoryRoad_3F/text.inc
@@ -1,6 +1,3 @@
-Text_1749F3:: @ 81749F3
-    .string "ギヤーオ！$"
-
 Text_DoubleEdgeTeach:: @ 81749F9
     .string "You should be proud of yourself,\n"
     .string "having battled your way through\l"
@@ -24,80 +21,80 @@ Text_DoubleEdgeTaught:: @ 8174B0C
     .string "Take a run at them and knock 'em\n"
     .string "out!$"
 
-Text_174B60:: @ 8174B60
+VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60
     .string "I heard rumors of a child prodigy.$"
 
-Text_174B83:: @ 8174B83
+VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83
     .string "The rumors were true!$"
 
-gUnknown_8174B99:: @ 8174B99
+VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99
     .string "So, it was you who beat GIOVANNI\n"
     .string "of TEAM ROCKET?$"
 
-Text_174BCA:: @ 8174BCA
+VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA
     .string "TRAINERS live to seek stronger\n"
     .string "opponents.$"
 
-Text_174BF4:: @ 8174BF4
+VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4
     .string "Oh!\n"
     .string "So strong!$"
 
-gUnknown_8174C03:: @ 8174C03
+VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03
     .string "By fighting tough battles, you get\n"
     .string "stronger.$"
 
-Text_174C30:: @ 8174C30
+VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30
     .string "I'll show you just how good you\n"
     .string "are. Not!$"
 
-Text_174C5A:: @ 8174C5A
+VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A
     .string "I'm furious!$"
 
-gUnknown_8174C67:: @ 8174C67
+VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67
     .string "You showed me just how good\n"
     .string "I was…$"
 
-Text_174C8A:: @ 8174C8A
+VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A
     .string "Only the chosen can pass here!$"
 
-Text_174CA9:: @ 8174CA9
+VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9
     .string "I don't believe it!$"
 
-gUnknown_8174CBD:: @ 8174CBD
+VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD
     .string "All TRAINERS here are headed to\n"
     .string "the POKéMON LEAGUE.\p"
     .string "Don't let down your guard.$"
 
-Text_174D0C:: @ 8174D0C
+VictoryRoad_3F_Text_RayIntro:: @ 8174D0C
     .string "RAY: Together, the two of us are\n"
     .string "destined for greatness!$"
 
-Text_174D45:: @ 8174D45
+VictoryRoad_3F_Text_RayDefeat:: @ 8174D45
     .string "RAY: Ludicrous!\n"
     .string "This can't be!$"
 
-gUnknown_8174D64:: @ 8174D64
+VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64
     .string "RAY: You've beaten us.\n"
     .string "Greatness remains elusive…$"
 
-Text_174D96:: @ 8174D96
+VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96
     .string "RAY: Together, the two of us are\n"
     .string "striving for the pinnacle.\p"
     .string "We need you to bring two POKéMON\n"
     .string "into battle with us.$"
 
-Text_174E08:: @ 8174E08
+VictoryRoad_3F_Text_TyraIntro:: @ 8174E08
     .string "TYRA: We're trying to become\n"
     .string "champions together.$"
 
-Text_174E39:: @ 8174E39
+VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39
     .string "TYRA: Oh, but…$"
 
-gUnknown_8174E48:: @ 8174E48
+VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48
     .string "TYRA: You've taught me that power\n"
     .string "can be infinite in shape and form.$"
 
-Text_174E8D:: @ 8174E8D
+VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D
     .string "TYRA: You can't battle with us if\n"
     .string "you have only one POKéMON.$"
 
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index 5ad0d9a2f..cb458b682 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -8,8 +8,8 @@ ViridianCity_Mart_OnLoad:: @ 816A1DE
 	end
 
 ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8
-	setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1
-	setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1
+	setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1
+	setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1
 	end
 
 ViridianCity_Mart_OnFrame:: @ 816A1FB
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 463bc53f5..97f28ced9 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_T_MORI",
   "region_map_section": "MAPSEC_VIRIDIAN_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 05f1cd544..a7a468351 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -178,17 +178,17 @@
   ],
   "gMapGroup2": [
     "NavelRock_Exterior",
-    "SevenIsland_TrainerTower_1F",
-    "SevenIsland_TrainerTower_2F",
-    "SevenIsland_TrainerTower_3F",
-    "SevenIsland_TrainerTower_4F",
-    "SevenIsland_TrainerTower_5F",
-    "SevenIsland_TrainerTower_6F",
-    "SevenIsland_TrainerTower_7F",
-    "SevenIsland_TrainerTower_8F",
-    "SevenIsland_TrainerTower_Roof",
-    "SevenIsland_TrainerTower_Lobby",
-    "SevenIsland_TrainerTower_Elevator",
+    "TrainerTower_1F",
+    "TrainerTower_2F",
+    "TrainerTower_3F",
+    "TrainerTower_4F",
+    "TrainerTower_5F",
+    "TrainerTower_6F",
+    "TrainerTower_7F",
+    "TrainerTower_8F",
+    "TrainerTower_Roof",
+    "TrainerTower_Lobby",
+    "TrainerTower_Elevator",
     "FiveIsland_LostCave_Entrance",
     "FiveIsland_LostCave_Room1",
     "FiveIsland_LostCave_Room2",
@@ -250,7 +250,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -289,10 +289,10 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
-    "UnknownMap_03_52",
-    "UnknownMap_03_53",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
+    "Prototype_SeviiIsle_8",
+    "Prototype_SeviiIsle_9",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
@@ -409,15 +409,15 @@
     "IndigoPlateau_PokemonCenter_2F"
   ],
   "gMapGroup14": [
-    "SaffronCity_House1_1F",
-    "SaffronCity_House1_2F",
+    "SaffronCity_CopycatsHouse_1F",
+    "SaffronCity_CopycatsHouse_2F",
     "SaffronCity_Dojo",
     "SaffronCity_Gym",
-    "SaffronCity_House2",
+    "SaffronCity_House",
     "SaffronCity_Mart",
     "SaffronCity_PokemonCenter_1F",
     "SaffronCity_PokemonCenter_2F",
-    "SaffronCity_House3",
+    "SaffronCity_MrPsychicsHouse",
     "SaffronCity_PokemonTrainerFanClub"
   ],
   "gMapGroup15": [
@@ -567,7 +567,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -605,8 +605,8 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c75ebdcfd..c174eaf41 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8
 	goto_if_eq CableClub_EventScript_AdapterNotConnected
 	special HelpSystem_Disable
 	fadescreen FADE_TO_BLACK
-	special sub_814F1D4
+	special Special_WirelessCommunicationScreen
 	waitstate
 	msgbox CableClub_Text_ParticipantsStepUpToCounter
 	special HelpSystem_Enable
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 9741b2899..67d34232c 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -43,11 +43,11 @@ Route4_EventScript_Boy:: @ 81ACDEA
 	release
 	end
 
-MtMoon_1F_EventScript_1ACE03:: @ 81ACE03
+MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BROCK, 4
-	msgbox Text_172B00
+	msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils
 	release
 	end
 
@@ -92,12 +92,12 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83
 	releaseall
 	end
 
-CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
+CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D
 	lock
 	faceplayer
 	famechecker FAMECHECKER_ERIKA, 5
 	textcolor 3
-	msgbox gUnknown_81B161B
+	msgbox PokemonJournal_Text_SpecialFeatureErika
 	release
 	end
 
@@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
 	release
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
+SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_SABRINA, 4
 	textcolor 3
-	msgbox gUnknown_81B1753
+	msgbox PokemonJournal_Text_SpecialFeatureSabrina
 	release
 	end
 
@@ -160,12 +160,12 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
+SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 2
 	textcolor 3
-	msgbox gUnknown_81B1913
+	msgbox PokemonJournal_Text_SpecialFeatureBruno
 	release
 	end
 
@@ -177,12 +177,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
+IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 1
 	famechecker FAMECHECKER_AGATHA, 2
-	msgbox Text_19A9E7
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs
 	release
 	end
 
@@ -215,40 +215,40 @@ EventScript_1AD021:: @ 81AD021
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 1
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-SaffronCity_EventScript_1AD03A:: @ 81AD03A
+SaffronCity_EventScript_BattleGirl:: @ 81AD03A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 2
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
+CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 3
-	msgbox Text_19566B
+	msgbox CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
+IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 4
 	textcolor 3
-	msgbox gUnknown_81B1A31
+	msgbox PokemonJournal_Text_SpecialFeatureLance
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
+IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 5
-	msgbox Text_19AB16
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway
 	release
 	end
 
@@ -269,18 +269,18 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9
 	release
 	end
 
-SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
+SilphCo_5F_EventScript_Scientist:: @ 81AD0D4
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 1
-	msgbox Text_175E99
+	msgbox SilphCo_5F_Text_RocketBossLookingForStrongMons
 	release
 	end
 
-SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
+SilphCo_8F_EventScript_Scientist:: @ 81AD0ED
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 2
-	msgbox Text_176ACB
+	msgbox SilphCo_8F_Text_ToRocketBossMonsAreTools
 	release
 	end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index d47a2d06c..bfc9fbbbd 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -101,7 +101,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F
 
 EventScript_GiveProfile: @ 81BEF5A
 	setvar VAR_0x8004, 0
-	call EventScript_1A6AC0
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_0x8004, 0
diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc
new file mode 100644
index 000000000..806e0976a
--- /dev/null
+++ b/data/scripts/pokemon_league.inc
@@ -0,0 +1,64 @@
+PokemonLeague_EventScript_OpenDoor:: @ 81A7506
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	call PokemonLeague_EventScript_SetDoorOpen
+	special DrawWholeMapView
+	setflag FLAG_TEMP_4
+	return
+
+PokemonLeague_EventScript_EnterRoom:: @ 81A751F
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
+	waitmovement 0
+	setflag FLAG_TEMP_2
+	playse SE_KI_GASYAN
+	call PokemonLeague_EventScript_CloseEntry
+	special DrawWholeMapView
+	return
+
+PokemonLeague_EventScript_SetDoorOpen:: @ 81A7538
+	setmetatile 6, 1, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 2, METATILE_PokemonLeague_Door_Mid_Open, 0
+	return
+
+PokemonLeague_EventScript_PreventExit:: @ 81A754B
+	lockall
+	textcolor 0
+	msgbox Text_VoiceRangOutDontRunAway
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn
+	waitmovement 0
+	releaseall
+	end
+
+PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0
+	special DrawWholeMapView
+	setflag FLAG_TEMP_4
+	return
+
+PokemonLeague_EventScript_SetDoorOpenLance:: @ 81A7589
+	setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0
+	return
+
+PokemonLeague_EventScript_CloseEntry:: @ 81A759C
+	setmetatile 5, 11, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1
+	setmetatile 6, 11, METATILE_PokemonLeague_Entry_TopMid_Closed, 1
+	setmetatile 7, 11, METATILE_PokemonLeague_Entry_TopRight_Closed, 1
+	setmetatile 5, 12, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1
+	setmetatile 6, 12, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1
+	setmetatile 7, 12, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1
+	return
+
+PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3
+	walk_up
+	step_end
+
+PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5
+	special Special_PokemonLeagueLightingEffect
+	return
diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc
new file mode 100644
index 000000000..906744fa8
--- /dev/null
+++ b/data/scripts/trainer_card.inc
@@ -0,0 +1,384 @@
+CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867
+	lockall
+	showmoneybox 0, 0, 0
+	msgbox gUnknown_81B1D7D, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1B2926
+	checkmoney 50, 0
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_1B292B
+	playse SE_SHOP
+	removemoney 50, 0
+	updatemoneybox 0, 0, 0
+	waitse
+	message gUnknown_81B1E24
+	waitmessage
+	multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
+	switch VAR_RESULT
+	case 0, EventScript_1B28DB
+	case 1, EventScript_1B28E6
+	case 2, EventScript_1B28F1
+	case 3, EventScript_1B28FC
+	end
+
+EventScript_1B28DB:: @ 81B28DB
+	setvar VAR_0x8004, 0
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28E6:: @ 81B28E6
+	setvar VAR_0x8004, 1
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28F1:: @ 81B28F1
+	setvar VAR_0x8004, 2
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28FC:: @ 81B28FC
+	setvar VAR_0x8004, 3
+	goto EventScript_1B2907
+	end
+
+EventScript_1B2907:: @ 81B2907
+	message gUnknown_81B1E42
+	waitmessage
+	playse MUS_ME_PHOTO
+	dofieldeffect FLDEFF_UNK_45
+	delay 60
+	special Special_UpdateTrainerCardPhotoIcons
+	msgbox gUnknown_81B1E7D
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+EventScript_1B2926:: @ 81B2926
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+EventScript_1B292B:: @ 81B292B
+	msgbox gUnknown_81B1E07
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+FourIsland_House2_EventScript_1B2938:: @ 81B2938
+	lock
+	specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
+	goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
+	goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
+	end
+
+EventScript_1B2951:: @ 81B2951
+	setflag FLAG_MET_STICKER_LADY
+	msgbox gUnknown_81B1EB3
+	applymovement 1, Movement_FacePlayer
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Movement_ExclamationMark
+	waitmovement 0
+	applymovement 1, Movement_Delay48
+	waitmovement 0
+	compare VAR_0x8008, 0
+	goto_if_eq EventScript_1B2B8E
+	message gUnknown_81B1EF8
+	waitmessage
+	goto EventScript_1B29D0
+	end
+
+EventScript_1B2994:: @ 81B2994
+	applymovement 1, Movement_FacePlayer
+	waitmovement 0
+	goto_if_questlog EventScript_ReleaseEnd
+	special sub_8112364
+	compare VAR_0x8008, 0
+	goto_if_eq EventScript_1B29C6
+	message gUnknown_81B2025
+	waitmessage
+	goto EventScript_1B29D0
+	end
+
+EventScript_1B29C6:: @ 81B29C6
+	msgbox gUnknown_81B1FEF
+	release
+	end
+
+EventScript_1B29D0:: @ 81B29D0
+	switch VAR_0x8008
+	case 1, EventScript_1B2A23
+	case 2, EventScript_1B2A4F
+	case 4, EventScript_1B2A7B
+	case 3, EventScript_1B2AA7
+	case 5, EventScript_1B2ADE
+	case 6, EventScript_1B2B15
+	case 7, EventScript_1B2B4C
+	end
+
+EventScript_1B2A23:: @ 81B2A23
+	multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2A4F:: @ 81B2A4F
+	multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2C62
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2A7B:: @ 81B2A7B
+	multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2D2C
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2AA7:: @ 81B2AA7
+	multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2C62
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2ADE:: @ 81B2ADE
+	multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2D2C
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B15:: @ 81B2B15
+	multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2C62
+	case 1, EventScript_1B2D2C
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B4C:: @ 81B2B4C
+	multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2C62
+	case 2, EventScript_1B2D2C
+	case 3, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B8E:: @ 81B2B8E
+	msgbox gUnknown_81B1EF8
+	release
+	end
+
+EventScript_1B2B98:: @ 81B2B98
+	compare VAR_0x8004, 39
+	goto_if_le EventScript_1B2BC5
+	compare VAR_0x8004, 99
+	goto_if_le EventScript_1B2BE3
+	compare VAR_0x8004, 199
+	goto_if_le EventScript_1B2C01
+	compare VAR_0x8004, 200
+	goto_if_ge EventScript_1B2C1F
+	end
+
+EventScript_1B2BC5:: @ 81B2BC5
+	compare VAR_HOF_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 1
+	msgbox gUnknown_81B206E
+	goto EventScript_1B2C51
+
+EventScript_1B2BE2:: @ 81B2BE2
+	end
+
+EventScript_1B2BE3:: @ 81B2BE3
+	compare VAR_HOF_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 2
+	msgbox gUnknown_81B20CF
+	goto EventScript_1B2C51
+
+EventScript_1B2C00:: @ 81B2C00
+	end
+
+EventScript_1B2C01:: @ 81B2C01
+	compare VAR_HOF_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 3
+	msgbox gUnknown_81B2133
+	goto EventScript_1B2C51
+
+EventScript_1B2C1E:: @ 81B2C1E
+	end
+
+EventScript_1B2C1F:: @ 81B2C1F
+	compare VAR_HOF_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2C47
+	setvar VAR_HOF_BRAG_STATE, 4
+	msgbox gUnknown_81B21C4
+	goto EventScript_1B2C51
+
+EventScript_1B2C3C:: @ 81B2C3C
+	end
+
+EventScript_1B2C3D:: @ 81B2C3D
+	msgbox gUnknown_81B227C
+	release
+	end
+
+EventScript_1B2C47:: @ 81B2C47
+	msgbox gUnknown_81B22B0
+	release
+	end
+
+EventScript_1B2C51:: @ 81B2C51
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B2242
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2C62:: @ 81B2C62
+	compare VAR_0x8005, 99
+	goto_if_le EventScript_1B2C8F
+	compare VAR_0x8005, 199
+	goto_if_le EventScript_1B2CAD
+	compare VAR_0x8005, 299
+	goto_if_le EventScript_1B2CCB
+	compare VAR_0x8005, 300
+	goto_if_ge EventScript_1B2CE9
+	end
+
+EventScript_1B2C8F:: @ 81B2C8F
+	compare VAR_EGG_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 1
+	msgbox gUnknown_81B2308
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CAD:: @ 81B2CAD
+	compare VAR_EGG_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 2
+	msgbox gUnknown_81B2372
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CCB:: @ 81B2CCB
+	compare VAR_EGG_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 3
+	msgbox gUnknown_81B23E0
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CE9:: @ 81B2CE9
+	compare VAR_EGG_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2D11
+	setvar VAR_EGG_BRAG_STATE, 4
+	msgbox gUnknown_81B2448
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2D07:: @ 81B2D07
+	msgbox gUnknown_81B251B
+	release
+	end
+
+EventScript_1B2D11:: @ 81B2D11
+	msgbox gUnknown_81B254F
+	release
+	end
+
+EventScript_1B2D1B:: @ 81B2D1B
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B24EA
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2D2C:: @ 81B2D2C
+	compare VAR_0x8006, 19
+	goto_if_le EventScript_1B2D59
+	compare VAR_0x8006, 49
+	goto_if_le EventScript_1B2D77
+	compare VAR_0x8006, 99
+	goto_if_le EventScript_1B2D95
+	compare VAR_0x8006, 100
+	goto_if_ge EventScript_1B2DB3
+	end
+
+EventScript_1B2D59:: @ 81B2D59
+	compare VAR_LINK_WIN_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 1
+	msgbox gUnknown_81B25A7
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2D77:: @ 81B2D77
+	compare VAR_LINK_WIN_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 2
+	msgbox gUnknown_81B2609
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2D95:: @ 81B2D95
+	compare VAR_LINK_WIN_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 3
+	msgbox gUnknown_81B267B
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2DB3:: @ 81B2DB3
+	compare VAR_LINK_WIN_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2DDB
+	setvar VAR_LINK_WIN_BRAG_STATE, 4
+	msgbox gUnknown_81B26F6
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2DD1:: @ 81B2DD1
+	msgbox gUnknown_81B27DB
+	release
+	end
+
+EventScript_1B2DDB:: @ 81B2DDB
+	msgbox gUnknown_81B280F
+	release
+	end
+
+EventScript_1B2DE5:: @ 81B2DE5
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B27A6
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2DF6:: @ 81B2DF6
+	release
+	end
diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc
index 2a5a84f72..45ffc285d 100644
--- a/data/scripts/trainer_tower.inc
+++ b/data/scripts/trainer_tower.inc
@@ -1,320 +1,297 @@
-SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54
+@ Local IDs apply to all floors (not lobby or roof)
+.equ LOCALID_TRAINER_DOUBLES1, 2
+.equ LOCALID_TRAINER_SINGLES,  3
+.equ LOCALID_TRAINER_KNOCKOUT, 4
+.equ LOCALID_TRAINER_DOUBLES2, 5
+
+.equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2
+.equ HIDE_TRAINER_SINGLES,  FLAG_TEMP_3
+.equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4
+.equ HIDE_TRAINER_DOUBLES2, FLAG_TEMP_5
+.equ HIDE_OWNER,            FLAG_TEMP_6
+
+.equ DISABLE_SINGLES_TRIGGER,  VAR_TEMP_E
+.equ DISABLE_DOUBLES_TRIGGER,  VAR_TEMP_F
+
+
+@@ Map scripts
+
+TrainerTower_OnResume:: @ 81C4F54
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 10
-	special sub_815D9E8
+	ttower_resumetimer
 	end
 
-SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62
-	setvar VAR_0x8004, 0
-	special sub_815D9E8
+TrainerTower_OnTransition:: @ 81C4F62
+	ttower_initfloor
 	switch VAR_RESULT
-	case 0, EventScript_1C4FA7
-	case 1, EventScript_1C4FC5
-	case 2, EventScript_1C5019
-	setflag FLAG_TEMP_2
-	setflag FLAG_TEMP_3
-	setflag FLAG_TEMP_4
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_E, 1
-	setvar VAR_TEMP_F, 1
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SetObjectsDoubles
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_SetObjectsKnockout
+	setflag HIDE_TRAINER_DOUBLES1
+	setflag HIDE_TRAINER_SINGLES
+	setflag HIDE_TRAINER_KNOCKOUT
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
 	end
 
-EventScript_1C4FA7:: @ 81C4FA7
-	setflag FLAG_TEMP_2
-	setflag FLAG_TEMP_4
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_F, 1
-	setobjectxyperm 3, 15, 13
-	setobjectmovementtype 3, 9
-	goto EventScript_1C5042
-
-EventScript_1C4FC5:: @ 81C4FC5
-	setflag FLAG_TEMP_3
-	setflag FLAG_TEMP_4
-	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, 5
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1C4FFE
-	setobjectxyperm 2, 10, 12
-	setobjectmovementtype 2, 9
-	setobjectxyperm 5, 10, 13
-	setobjectmovementtype 5, 9
-	goto EventScript_1C5042
-
-EventScript_1C4FFE:: @ 81C4FFE
-	setobjectxyperm 2, 10, 12
-	setobjectmovementtype 2, 8
-	setobjectxyperm 5, 11, 12
-	setobjectmovementtype 5, 8
-	goto EventScript_1C5042
-
-EventScript_1C5019:: @ 81C5019
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_F, 1
-	setobjectxyperm 2, 10, 10
-	setobjectmovementtype 2, 8
-	setobjectxyperm 3, 14, 13
-	setobjectmovementtype 3, 9
-	setobjectxyperm 4, 10, 16
-	setobjectmovementtype 4, 7
-EventScript_1C5042:
-	setflag FLAG_TEMP_6
+TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7
+	setflag HIDE_TRAINER_DOUBLES1
+	setflag HIDE_TRAINER_KNOCKOUT
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	setobjectxyperm       LOCALID_TRAINER_SINGLES, 15, 13
+	setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
+	goto TrainerTower_EventScript_HideOwner
+
+TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5
+	setflag HIDE_TRAINER_SINGLES
+	setflag HIDE_TRAINER_KNOCKOUT
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	ttower_isfloorcleared
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES2, 10, 13
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT
+	goto TrainerTower_EventScript_HideOwner
+
+TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES2, 11, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN
+	goto TrainerTower_EventScript_HideOwner
+
+@ Knockout challenge re-uses trainer objects
+TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 10
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
+	setobjectxyperm       LOCALID_TRAINER_SINGLES, 14, 13
+	setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
+	setobjectxyperm       LOCALID_TRAINER_KNOCKOUT, 10, 16
+	setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP
+TrainerTower_EventScript_HideOwner:
+	setflag HIDE_OWNER
 	end
 
-SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046
-	map_script_2 VAR_TEMP_2, 0, EventScript_1C5050
+TrainerTower_OnFrame:: @ 81C5046
+	map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor
 	.2byte 0
 
-EventScript_1C5050:: @ 81C5050
+TrainerTower_EventScript_EnterFloor:: @ 81C5050
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 5
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1C5072
-	setvar VAR_TEMP_E, 1
-	setvar VAR_TEMP_F, 1
-EventScript_1C5072:
-	setvar VAR_0x8004, 18
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1C5086
+	ttower_isfloorcleared
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_EventScript_EndEnterFloor
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+TrainerTower_EventScript_EndEnterFloor:
+	ttower_shouldexit
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_EventScript_WarpToLobby
 	end
 
-EventScript_1C5086:: @ 81C5086
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
+@ Never reached
+TrainerTower_EventScript_WarpToLobby:: @ 81C5086
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
 	waitstate
-EventScript_1C508F::
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+
+
+@@ Battle scripts
+
+TrainerTower_EventScript_TriggerBattle::
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C50C2
-	case 1, EventScript_1C510D
-	case 2, EventScript_1C515C
-EventScript_1C50C2:
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 3, Movement_ExclamationMark
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoSingleBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoDoubleBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_DoKnockoutBattle
+
+TrainerTower_EventScript_DoSingleBattle:
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
 	waitmovement 0
-	setvar VAR_TEMP_E, 1
-	applymovement 3, Movement_1C5541
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
 	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_815D9E8
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0
 	msgbox gStringVar4
 	closemessage
-	goto EventScript_1C5219
+	goto TrainerTower_EventScript_DoBattle
 
-EventScript_1C510D:: @ 81C510D
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_TEMP_3
-	special sub_815D9E8
+TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3
 	msgbox gStringVar4
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
+	setvar VAR_0x8005, TRAINER_TOWER_TEXT_INTRO
 	addvar VAR_TEMP_3, 1
 	compare VAR_TEMP_3, 1
-	goto_if_eq EventScript_1C5146
+	goto_if_eq TrainerTower_EventScript_DoSecondTrainerIntro
 	setvar VAR_TEMP_3, 0
-EventScript_1C5146:
+TrainerTower_EventScript_DoSecondTrainerIntro:
 	copyvar VAR_0x8006, VAR_TEMP_3
-	special sub_815D9E8
+	special CallTrainerTowerFunc
 	msgbox gStringVar4
 	closemessage
-	goto EventScript_1C5219
+	goto TrainerTower_EventScript_DoBattle
 
-EventScript_1C515C:: @ 81C515C
+TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C
 	switch VAR_TEMP_1
-	case 0, EventScript_1C5182
-	case 1, EventScript_1C51AD
-	case 2, EventScript_1C51D8
-EventScript_1C5182:
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 4, Movement_ExclamationMark
+	case 0, TrainerTower_EventScript_DoKnockoutBattle1
+	case 1, TrainerTower_EventScript_DoKnockoutBattle2
+	case 2, TrainerTower_EventScript_DoKnockoutBattle3
+
+TrainerTower_EventScript_DoKnockoutBattle1:
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, Movement_Delay48
+	applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48
 	waitmovement 0
-	applymovement 4, Movement_1C5546
+	applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
 	waitmovement 0
-	goto EventScript_1C51FE
+	goto TrainerTower_EventScript_DoKnockoutBattleIntro
 
-EventScript_1C51AD:: @ 81C51AD
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 2, Movement_ExclamationMark
+TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Movement_Delay48
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
 	waitmovement 0
-	applymovement 2, Movement_1C5549
+	applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
 	waitmovement 0
-	goto EventScript_1C51FE
+	goto TrainerTower_EventScript_DoKnockoutBattleIntro
 
-EventScript_1C51D8:: @ 81C51D8
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 3, Movement_ExclamationMark
+TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
 	waitmovement 0
-	applymovement 3, Movement_1C5542
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
 	waitmovement 0
-EventScript_1C51FE:
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_TEMP_1
-	special sub_815D9E8
+TrainerTower_EventScript_DoKnockoutBattleIntro:
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1
 	msgbox gStringVar4
 	closemessage
-EventScript_1C5219:
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+TrainerTower_EventScript_DoBattle:
+	ttower_dobattle
 	waitstate
 	switch VAR_RESULT
-	case 1, EventScript_1C524D
-	case 2, EventScript_1C52E0
-	case 3, EventScript_1C52E0
-EventScript_1C524D:
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+	case B_OUTCOME_WON, TrainerTower_EventScript_WonBattle
+	case B_OUTCOME_LOST, TrainerTower_EventScript_WarpToLobbyLost
+	case B_OUTCOME_DREW, TrainerTower_EventScript_WarpToLobbyLost
+TrainerTower_EventScript_WonBattle:
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C52D7
-	case 1, EventScript_1C52BA
-	case 2, EventScript_1C5280
-EventScript_1C5280:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetFloorCleared
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_MoveDoublesTrainers
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_CheckNextKnockoutBattle
+
+TrainerTower_EventScript_CheckNextKnockoutBattle:
 	switch VAR_TEMP_1
-	case 0, EventScript_1C52A6
-	case 1, EventScript_1C52B0
-	case 2, EventScript_1C52D0
-EventScript_1C52A6:
+	case 0, TrainerTower_EventScript_DoSecondKnockoutBattle
+	case 1, TrainerTower_EventScript_DoThirdKnockoutBattle
+	case 2, TrainerTower_EventScript_MoveLastKnockoutTrainer
+
+TrainerTower_EventScript_DoSecondKnockoutBattle:
 	addvar VAR_TEMP_1, 1
-	goto EventScript_1C515C
+	goto TrainerTower_EventScript_DoKnockoutBattle
 
-EventScript_1C52B0:: @ 81C52B0
+TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0
 	addvar VAR_TEMP_1, 1
-	goto EventScript_1C515C
+	goto TrainerTower_EventScript_DoKnockoutBattle
 
-EventScript_1C52BA:: @ 81C52BA
-	applymovement 5, Movement_1C554C
+TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA
+	applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay
 	waitmovement 0
-	applymovement 2, Movement_1C5550
-	goto EventScript_1C52D7
-
-EventScript_1C52D0:: @ 81C52D0
-	applymovement 3, Movement_1C554D
-EventScript_1C52D7:
-	setvar VAR_0x8004, 4
-	special sub_815D9E8
+	applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown
+	goto TrainerTower_EventScript_SetFloorCleared
+
+TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay
+TrainerTower_EventScript_SetFloorCleared:
+	ttower_clearedfloor
 	end
 
-EventScript_1C52E0:: @ 81C52E0
+TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0
 	special HealPlayerParty
-	setvar VAR_0x8004, 11
-	special sub_815D9E8
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
+	ttower_setlost
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
 	waitstate
 
-EventScript_1C52F4:: @ 81C52F4
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+
+@@ Speaking to trainers after battle
+
+TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C5327
-	case 1, EventScript_1C5327
-	case 2, EventScript_1C5331
-EventScript_1C5327:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoublesTrainer1PostBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer2PostBattle
+TrainerTower_EventScript_DoublesTrainer1PostBattle:
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5331:: @ 81C5331
+TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331
 	setvar VAR_0x8006, 1
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C533B:: @ 81C533B
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C536E
-	case 1, EventScript_1C536E
-	case 2, EventScript_1C5378
-EventScript_1C536E:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SinglesTrainerPostBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer3PostBattle
+TrainerTower_EventScript_SinglesTrainerPostBattle:
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5378:: @ 81C5378
+TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378
 	setvar VAR_0x8006, 2
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5382:: @ 81C5382
+TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C538C:: @ 81C538C
+TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C
 	setvar VAR_0x8006, 1
-EventScript_1C5391:
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_815D9E8
+TrainerTower_EventScript_DoPostBattleText:
+	ttower_getspeech TRAINER_TOWER_TEXT_AFTER
 	lock
 	faceplayer
 	msgbox gStringVar4
 	release
 	return
 
-EventScript_1C53AA:: @ 81C53AA
+
+@@ Speaking to owner
+
+TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA
 	lock
 	faceplayer
-	setvar VAR_0x8004, 7
-	special sub_815D9E8
+	ttower_getownerstate
 	switch VAR_RESULT
-	case 0, EventScript_1C53DA
-	case 1, EventScript_1C53E2
-	case 2, EventScript_1C5492
-EventScript_1C53DA:
-	msgbox Text_17CA5A
-EventScript_1C53E2:
-	setvar VAR_0x8004, 8
-	special sub_815D9E8
+	case 0, TrainerTower_Roof_EventScript_Arrived
+	case 1, TrainerTower_Roof_EventScript_GivePrize
+	case 2, TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_Arrived:
+	msgbox TrainerTower_Roof_Text_ImOwnerBattledPerfectly
+TrainerTower_Roof_EventScript_GivePrize:
+	ttower_giveprize
 	switch VAR_RESULT
-	case 0, EventScript_1C5410
-	case 1, EventScript_1C543A
-	case 2, EventScript_1C544F
-EventScript_1C5410:
-	msgbox Text_17CB09
+	case 0, TrainerTower_Roof_EventScript_ReceivePrize
+	case 1, TrainerTower_Roof_EventScript_NoRoomForPrize
+	case 2, TrainerTower_Roof_EventScript_CheckFinalTime
+
+TrainerTower_Roof_EventScript_ReceivePrize:
+	msgbox TrainerTower_Roof_Text_ThisIsForYou
 	textcolor 3
 	playfanfare MUS_FANFA1
 	message Text_ObtainedTheX
@@ -323,128 +300,105 @@ EventScript_1C5410:
 	getstdstring 2, STDSTRING_ITEMS_POCKET
 	msgbox Text_PutItemAway
 	call EventScript_1A6675
-	goto EventScript_1C544F
+	goto TrainerTower_Roof_EventScript_CheckFinalTime
 
-EventScript_1C543A:: @ 81C543A
-	msgbox Text_17CB09
+TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A
+	msgbox TrainerTower_Roof_Text_ThisIsForYou
 	msgbox Text_BagIsFull
-	goto EventScript_1C544F
+	goto TrainerTower_Roof_EventScript_CheckFinalTime
 
-EventScript_1C544F:: @ 81C544F
-	setvar VAR_0x8004, 9
-	special sub_815D9E8
+TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F
+	ttower_checkfinaltime
 	switch VAR_RESULT
-	case 0, EventScript_1C547D
-	case 1, EventScript_1C548A
-	case 2, EventScript_1C5492
-EventScript_1C547D:
-	msgbox Text_17CB1A
-	goto EventScript_1C5492
-
-EventScript_1C548A:: @ 81C548A
-	msgbox Text_17CBC0
-EventScript_1C5492:
-	msgbox Text_17CBF5
+	case 0, TrainerTower_Roof_EventScript_NewRecord
+	case 1, TrainerTower_Roof_EventScript_NoNewRecord
+	case 2, TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_NewRecord:
+	msgbox TrainerTower_Roof_Text_DoneItInRecordTime
+	goto TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A
+	msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere
+TrainerTower_Roof_EventScript_OwnerEnd:
+	msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime
 	release
 	return
 
-EventScript_1C549C:: @ 81C549C
+TrainerTower_EventScript_ShowTime:: @ 81C549C
 	lockall
-	setvar VAR_0x8004, 13
-	special sub_815D9E8
-	msgbox Text_17CC56
+	ttower_gettime
+	msgbox TrainerTower_Text_XMinYZSec
 	releaseall
 	end
 
-SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF
-	goto EventScript_1C508F
-
-SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
+
+@@ Battle triggers
+
+TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF
+	goto TrainerTower_EventScript_TriggerBattle
+
+TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4
 	setvar VAR_TEMP_3, 0
-	setvar VAR_0x8004, 16
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_1C5528
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 2, Movement_ExclamationMark
+	ttower_checkdoubles
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Movement_Delay48
-	goto EventScript_1C551B
-
-SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
+	goto TrainerTower_EventScript_TriggerDoubleBattle
+
+TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA
 	setvar VAR_TEMP_3, 1
-	setvar VAR_0x8004, 16
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_1C5528
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 5, Movement_ExclamationMark
+	ttower_checkdoubles
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, Movement_Delay48
-EventScript_1C551B:
+	applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48
+TrainerTower_EventScript_TriggerDoubleBattle:
 	waitmovement 0
-	setvar VAR_TEMP_F, 1
-	goto EventScript_1C508F
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	goto TrainerTower_EventScript_TriggerBattle
 
-EventScript_1C5528:: @ 81C5528
+TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528
 	lockall
 	playse SE_PINPON
-	msgbox Text_17CC73
+	msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack
 	waitmovement 0
 	releaseall
 	end
 
-Movement_1C5541:
+TrainerTower_Movement_SingleTrainerApproach:
 	walk_left
-Movement_1C5542:: @ 81C5542
+TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542
 	walk_left
 	walk_left
-Movement_1C5544:
+TrainerTower_Movement_PushPlayerBack:
 	walk_left
 	step_end
 
-Movement_1C5546:: @ 81C5546
+TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546
 	walk_up
 	walk_up
 	step_end
 
-Movement_1C5549:: @ 81C5549
+TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549
 	walk_down
 	walk_down
 	step_end
 
-Movement_1C554C:: @ 81C554C
+TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C
 	walk_right
-Movement_1C554D:
+TrainerTower_Movement_LastKnockoutTrainerOutOfWay:
 	walk_up
 	face_down
 	step_end
 
-Movement_1C5550:: @ 81C5550
+TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550
 	face_down
 	step_end
diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc
index 68d7e1157..68e8154b1 100644
--- a/data/scripts/trainers.inc
+++ b/data/scripts/trainers.inc
@@ -2988,54 +2988,54 @@ EventScript_1ACC32:: @ 81ACC32
 	msgbox Text_18CE78, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D
-	trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A
+SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D
+	trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACC74
-	msgbox Text_18D061, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon
+	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACC74:: @ 81ACC74
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, Text_1C46D3, Text_18D02A
-	msgbox Text_18D061, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
+	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B
-	trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108
+SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B
+	trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACCB2
-	msgbox Text_18D125, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin
+	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACCB2:: @ 81ACCB2
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, Text_1C470A, Text_18D108
-	msgbox Text_18D125, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
+	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9
-	trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5
+SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9
+	trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACCF0
-	msgbox Text_18D1E3, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna
+	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACCF0:: @ 81ACCF0
-	trainerbattle_rematch TRAINER_PAINTER_EDNA, Text_1C4739, Text_18D1B5
-	msgbox Text_18D1E3, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0
+	trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
+	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07
-	trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D
+SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07
+	trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACD2E
-	msgbox Text_18D284, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford
+	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACD2E:: @ 81ACD2E
-	trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, Text_1C476A, Text_18D26D
-	msgbox Text_18D284, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E
+	trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
+	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 39ce252a4..4ed38160d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -103,7 +103,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8081128
 	def_special Field_AskSaveTheGame
 	def_special nullsub_56
-	def_special sub_80FEE44
+	def_special ShowEasyChatScreen
 	def_special Special_BufferEasyChatMessage
 	def_special nullsub_75
 	def_special nullsub_75
@@ -374,7 +374,7 @@ gSpecials:: @ 815FD60
 	def_special TryBecomeLinkLeader
 	def_special TryJoinLinkGroup
 	def_special UnionRoomSpecial
-	def_special sub_814F1D4
+	def_special Special_WirelessCommunicationScreen
 	def_special EnableNationalPokedex
 	def_special sub_80699E0
 	def_special sub_80699BC
@@ -412,7 +412,7 @@ gSpecials:: @ 815FD60
 	def_special Special_SSAnneDepartureCutscene
 	def_special IsPokemonJumpSpeciesInParty
 	def_special IsNationalPokedexEnabled
-	def_special sub_815D9E8
+	def_special CallTrainerTowerFunc
 	def_special ShowPokemonJumpRecords
 	def_special Special_ItemIsTM_GetMoveName
 	def_special Special_DaisyMassageServices
@@ -439,7 +439,7 @@ gSpecials:: @ 815FD60
 	def_special Special_SetDeoxysTriangleObjectPal
 	def_special IsPlayerLeftOfVermilionSailor
 	def_special Special_BadEggInParty
-	def_special sub_815D834
+	def_special ReadTrainerTowerAndValidate
 	def_special HasAllMons
 	def_special Special_PlayerIsNotInTrainerTowerLobby
 	def_special Special_BrailleCursorToggle
diff --git a/data/strings.s b/data/strings.s
index 5cff90fcd..f595170ff 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4230,51 +4230,51 @@ gJPText_MysteryGift:: @ 841DE50
 gJPText_DecideStop:: @ 841DE51
 	.string "$"
 
-gUnknown_841DE52:: @ 841DE52
+gJPText_ReceiveMysteryGiftWithEReader:: @ 841DE52
 	.string "$"
 
-gUnknown_841DE53:: @ 841DE53
+gJPText_SelectConnectFromEReaderMenu:: @ 841DE53
 	.string "$"
 
-gUnknown_841DE54:: @ 841DE54
+gJPText_SelectConnectWithGBA:: @ 841DE54
 	.string "$"
 
-gUnknown_841DE55:: @ 841DE55
+gJPText_SelectConnectAndPressA:: @ 841DE55
 	.string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n"
 	.string "えらんで Aボタンを おしてください$"
 
-gUnknown_841DE7C:: @ 841DE7C
+gJPText_LinkIsIncorrect:: @ 841DE7C
 	.string "$"
 
-gUnknown_841DE7D:: @ 841DE7D
+gJPText_CardReadingHasBeenHalted:: @ 841DE7D
 	.string "$"
 
-gUnknown_841DE7E:: @ 841DE7E
+gJPText_UnableConnectWithEReader:: @ 841DE7E
 	.string "カ-ドeリ-ダ-{PLUS}と\n"
 	.string "つうしん できません$"
 
-gUnknown_841DE95:: @ 841DE95
+gJPText_Connecting:: @ 841DE95
 	.string "$"
 
-gUnknown_841DE96:: @ 841DE96
+gJPText_ConnectionErrorCheckLink:: @ 841DE96
 	.string "$"
 
-gUnknown_841DE97:: @ 841DE97
+gJPText_ConnectionErrorTryAgain:: @ 841DE97
 	.string "$"
 
-gUnknown_841DE98:: @ 841DE98
+gJPText_AllowEReaderToLoadCard:: @ 841DE98
 	.string "$"
 
-gUnknown_841DE99:: @ 841DE99
+gJPText_ConnectionComplete:: @ 841DE99
 	.string "$"
 
-gUnknown_841DE9A:: @ 841DE9A
+gJPText_NewTrainerHasComeToSevii:: @ 841DE9A
 	.string "$"
 
-gUnknown_841DE9B:: @ 841DE9B
+gJPText_PleaseWaitAMoment:: @ 841DE9B
 	.string "$"
 
-gUnknown_841DE9C:: @ 841DE9C
+gJPText_WriteErrorUnableToSaveData:: @ 841DE9C
 	.string "$"
 
 gText_CommErrorCheckConnections:: @ 841DE9D
@@ -4498,19 +4498,19 @@ gUnknown_841E243:: @ 841E243
 gUnknown_841E244:: @ 841E244
 	.string "$"
 
-gUnknown_841E245:: @ 841E245
+gText_WirelessCommunicationStatus:: @ 841E245
 	.string "Wireless Communication Status$"
 
-gUnknown_841E263:: @ 841E263
+gText_PeopleTrading:: @ 841E263
 	.string "People trading:$"
 
-gUnknown_841E273:: @ 841E273
+gText_PeopleBattling:: @ 841E273
 	.string "People battling:$"
 
-gUnknown_841E284:: @ 841E284
+gText_PeopleInUnionRoom:: @ 841E284
 	.string "People in the UNION ROOM:$"
 
-gUnknown_841E29E:: @ 841E29E
+gText_PeopleCommunicating:: @ 841E29E
 	.string "People communicating:$"
 
 gUnknown_841E2B4:: @ 841E2B4
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index 0705caffe..a8226df05 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1396,7 +1396,7 @@ PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558
 	.string "He used the electricity generated\n"
 	.string "by POKéMON to power his plane.$"
 
-gUnknown_81B161B:: @ 81B161B
+PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature: CELADON GYM\n"
 	.string "LEADER ERIKA!\p"
@@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8
 	.string "He even concocts medicine to nurse\n"
 	.string "his POKéMON to health.$"
 
-gUnknown_81B1753:: @ 81B1753
+PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature: SAFFRON GYM\n"
 	.string "LEADER SABRINA!\p"
@@ -1437,7 +1437,7 @@ gUnknown_81B187F:: @ 81B187F
 	.string "and cool battling style, LORELEI\l"
 	.string "has a surprising secret!$"
 
-gUnknown_81B1913:: @ 81B1913
+PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
 	.string "ELITE FOUR's BRUNO!\p"
@@ -1453,7 +1453,7 @@ gUnknown_81B19A8:: @ 81B19A8
 	.string "OAK were rivals who vied for\l"
 	.string "supremacy as TRAINERS.$"
 
-gUnknown_81B1A31:: @ 81B1A31
+PokemonJournal_Text_SpecialFeatureLance:: @ 81B1A31
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
 	.string "ELITE FOUR's LANCE!\p"
@@ -1485,198 +1485,3 @@ PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1
 	.string "down our interview requests.\p"
 	.string "He is a kindly man who is adored\n"
 	.string "and respected in LAVENDER TOWN.$"
-
-gUnknown_81B1C8B:: @ 81B1C8B
-	.string "Hmm…\n"
-	.string "Is that right…$"
-
-gUnknown_81B1C9F:: @ 81B1C9F
-	.string "Oh!\n"
-	.string "Look, look!$"
-
-gUnknown_81B1CAF:: @ 81B1CAF
-	.string "Read it, read it!$"
-
-gUnknown_81B1CC1:: @ 81B1CC1
-	.string "TRAINER TIPS\p"
-	.string "Press START to open the MENU!$"
-
-gUnknown_81B1CEC:: @ 81B1CEC
-	.string "Signs are useful, aren't they?$"
-
-gUnknown_81B1D0B:: @ 81B1D0B
-	.string "Look, look!\p"
-	.string "I copied what it said on one of\n"
-	.string "those TRAINER TIPS signs!$"
-
-gUnknown_81B1D51:: @ 81B1D51
-	.string "TRAINER TIPS!\p"
-	.string "Press START to open the MENU!$"
-
-gUnknown_81B1D7D:: @ 81B1D7D
-	.string "It's a POKéMON PRINTER!\p"
-	.string "It can put a print of your POKéMON\n"
-	.string "on the back of your TRAINER CARD.\p"
-	.string "It costs only ¥50.\n"
-	.string "Would you like to try it?$"
-
-gUnknown_81B1E07:: @ 81B1E07
-	.string "You don't have enough money.$"
-
-gUnknown_81B1E24:: @ 81B1E24
-	.string "Please choose the print type.$"
-
-gUnknown_81B1E42:: @ 81B1E42
-	.string "A big smile for the photo, please!\n"
-	.string "Three… Two… One…\p"
-	.string "Flash!$"
-
-gUnknown_81B1E7D:: @ 81B1E7D
-	.string "Your POKéMON print is ready!\n"
-	.string "Check your TRAINER CARD.$"
-
-gUnknown_81B1EB3:: @ 81B1EB3
-	.string "Giggle…\n"
-	.string "I collected a ton of STICKERS.\l"
-	.string "I wish I could show them off…$"
-
-gUnknown_81B1EF8:: @ 81B1EF8
-	.string "Oh, excellent!\n"
-	.string "You've come to the right place!\p"
-	.string "Look, look! See? See?\n"
-	.string "These are my STICKERS!\l"
-	.string "Look how many I got!\p"
-	.string "I bet you want some.\n"
-	.string "I bet you do!\p"
-	.string "I'll give a STICKER if you can tell\n"
-	.string "me something awesome about\l"
-	.string "yourself.\p"
-	.string "What will you brag about?$"
-
-gUnknown_81B1FEF:: @ 81B1FEF
-	.string "Brag about something for me.\n"
-	.string "I'll give you a STICKER.$"
-
-gUnknown_81B2025:: @ 81B2025
-	.string "Oh, hi!\n"
-	.string "Here comes the braggart.\p"
-	.string "What are you going to brag about\n"
-	.string "today?$"
-
-gUnknown_81B206E:: @ 81B206E
-	.string "Oh, wow, you made it into the\n"
-	.string "HALL OF FAME.\p"
-	.string "That's pretty good, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B20CF:: @ 81B20CF
-	.string "Oh, wow, you've entered the\n"
-	.string "HALL OF FAME often!\p"
-	.string "That's impressive, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2133:: @ 81B2133
-	.string "Whoa! You've made it into the\n"
-	.string "HALL OF FAME that often?\l"
-	.string "That's seriously incredible, yup!\p"
-	.string "You own the POKéMON LEAGUE!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B21C4:: @ 81B21C4
-	.string "No way! You've gone into the\n"
-	.string "HALL OF FAME that many times?\p"
-	.string "You're beyond incredible, yup!\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B2242:: @ 81B2242
-	.string "The HALL OF FAME STICKER was\n"
-	.string "applied to the TRAINER CARD.$"
-
-gUnknown_81B227C:: @ 81B227C
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B22B0:: @ 81B22B0
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
-
-gUnknown_81B2308:: @ 81B2308
-	.string "Oh, wow, there are POKéMON EGGS?\n"
-	.string "I didn't know that!\p"
-	.string "That's pretty good, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2372:: @ 81B2372
-	.string "You've hatched that many EGGS?\n"
-	.string "You really must like them!\p"
-	.string "That's impressive, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B23E0:: @ 81B23E0
-	.string "Whoa! You've hatched a whole\n"
-	.string "bunch of EGGS!\p"
-	.string "You're an EGG-hatching machine!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2448:: @ 81B2448
-	.string "Wh… You hatched that many EGGS?\p"
-	.string "What's behind your love of EGGS?\n"
-	.string "It's beyond incredible, yup!\p"
-	.string "You're too awesome, I tell you.\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B24EA:: @ 81B24EA
-	.string "The EGG STICKER was applied\n"
-	.string "to the TRAINER CARD.$"
-
-gUnknown_81B251B:: @ 81B251B
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B254F:: @ 81B254F
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
-
-gUnknown_81B25A7:: @ 81B25A7
-	.string "Oh, wow, you've had success\n"
-	.string "link battling?\p"
-	.string "You're pretty strong, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2609:: @ 81B2609
-	.string "You've beaten your friends a lot\n"
-	.string "link battling, huh?\p"
-	.string "You're impressively strong, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B267B:: @ 81B267B
-	.string "Whoa! You've beaten your friends\n"
-	.string "a frightful number of times.\p"
-	.string "Have you lost friends over this?\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B26F6:: @ 81B26F6
-	.string "Wh… Wickedly whoa!\n"
-	.string "You've won mind-blowingly often!\p"
-	.string "It just knocks me out thinking\n"
-	.string "about how tough you are.\p"
-	.string "You're the stuff of nightmares!\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B27A6:: @ 81B27A6
-	.string "The VICTORY STICKER was applied\n"
-	.string "to the TRAINER CARD.$"
-
-gUnknown_81B27DB:: @ 81B27DB
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B280F:: @ 81B280F
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc
new file mode 100644
index 000000000..3a6557cca
--- /dev/null
+++ b/data/text/trainer_card.inc
@@ -0,0 +1,167 @@
+gUnknown_81B1D7D:: @ 81B1D7D
+	.string "It's a POKéMON PRINTER!\p"
+	.string "It can put a print of your POKéMON\n"
+	.string "on the back of your TRAINER CARD.\p"
+	.string "It costs only ¥50.\n"
+	.string "Would you like to try it?$"
+
+gUnknown_81B1E07:: @ 81B1E07
+	.string "You don't have enough money.$"
+
+gUnknown_81B1E24:: @ 81B1E24
+	.string "Please choose the print type.$"
+
+gUnknown_81B1E42:: @ 81B1E42
+	.string "A big smile for the photo, please!\n"
+	.string "Three… Two… One…\p"
+	.string "Flash!$"
+
+gUnknown_81B1E7D:: @ 81B1E7D
+	.string "Your POKéMON print is ready!\n"
+	.string "Check your TRAINER CARD.$"
+
+gUnknown_81B1EB3:: @ 81B1EB3
+	.string "Giggle…\n"
+	.string "I collected a ton of STICKERS.\l"
+	.string "I wish I could show them off…$"
+
+gUnknown_81B1EF8:: @ 81B1EF8
+	.string "Oh, excellent!\n"
+	.string "You've come to the right place!\p"
+	.string "Look, look! See? See?\n"
+	.string "These are my STICKERS!\l"
+	.string "Look how many I got!\p"
+	.string "I bet you want some.\n"
+	.string "I bet you do!\p"
+	.string "I'll give a STICKER if you can tell\n"
+	.string "me something awesome about\l"
+	.string "yourself.\p"
+	.string "What will you brag about?$"
+
+gUnknown_81B1FEF:: @ 81B1FEF
+	.string "Brag about something for me.\n"
+	.string "I'll give you a STICKER.$"
+
+gUnknown_81B2025:: @ 81B2025
+	.string "Oh, hi!\n"
+	.string "Here comes the braggart.\p"
+	.string "What are you going to brag about\n"
+	.string "today?$"
+
+gUnknown_81B206E:: @ 81B206E
+	.string "Oh, wow, you made it into the\n"
+	.string "HALL OF FAME.\p"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B20CF:: @ 81B20CF
+	.string "Oh, wow, you've entered the\n"
+	.string "HALL OF FAME often!\p"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2133:: @ 81B2133
+	.string "Whoa! You've made it into the\n"
+	.string "HALL OF FAME that often?\l"
+	.string "That's seriously incredible, yup!\p"
+	.string "You own the POKéMON LEAGUE!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B21C4:: @ 81B21C4
+	.string "No way! You've gone into the\n"
+	.string "HALL OF FAME that many times?\p"
+	.string "You're beyond incredible, yup!\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B2242:: @ 81B2242
+	.string "The HALL OF FAME STICKER was\n"
+	.string "applied to the TRAINER CARD.$"
+
+gUnknown_81B227C:: @ 81B227C
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B22B0:: @ 81B22B0
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
+
+gUnknown_81B2308:: @ 81B2308
+	.string "Oh, wow, there are POKéMON EGGS?\n"
+	.string "I didn't know that!\p"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2372:: @ 81B2372
+	.string "You've hatched that many EGGS?\n"
+	.string "You really must like them!\p"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B23E0:: @ 81B23E0
+	.string "Whoa! You've hatched a whole\n"
+	.string "bunch of EGGS!\p"
+	.string "You're an EGG-hatching machine!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2448:: @ 81B2448
+	.string "Wh… You hatched that many EGGS?\p"
+	.string "What's behind your love of EGGS?\n"
+	.string "It's beyond incredible, yup!\p"
+	.string "You're too awesome, I tell you.\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B24EA:: @ 81B24EA
+	.string "The EGG STICKER was applied\n"
+	.string "to the TRAINER CARD.$"
+
+gUnknown_81B251B:: @ 81B251B
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B254F:: @ 81B254F
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
+
+gUnknown_81B25A7:: @ 81B25A7
+	.string "Oh, wow, you've had success\n"
+	.string "link battling?\p"
+	.string "You're pretty strong, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2609:: @ 81B2609
+	.string "You've beaten your friends a lot\n"
+	.string "link battling, huh?\p"
+	.string "You're impressively strong, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B267B:: @ 81B267B
+	.string "Whoa! You've beaten your friends\n"
+	.string "a frightful number of times.\p"
+	.string "Have you lost friends over this?\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B26F6:: @ 81B26F6
+	.string "Wh… Wickedly whoa!\n"
+	.string "You've won mind-blowingly often!\p"
+	.string "It just knocks me out thinking\n"
+	.string "about how tough you are.\p"
+	.string "You're the stuff of nightmares!\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B27A6:: @ 81B27A6
+	.string "The VICTORY STICKER was applied\n"
+	.string "to the TRAINER CARD.$"
+
+gUnknown_81B27DB:: @ 81B27DB
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B280F:: @ 81B280F
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index a4184c58e..ddeb2040f 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -989,18 +989,18 @@ Text_1C4699:: @ 81C4699
 	.string "NYA: I won't drag down my mentor\n"
 	.string "LEX! We're going to win!$"
 
-Text_1C46D3:: @ 81C46D3
+SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3
 	.string "Have you discovered anything about\n"
 	.string "this stone chamber?$"
 
-Text_1C470A:: @ 81C470A
+SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A
 	.string "A mystic POKéMON is said to sleep\n"
 	.string "inside here.$"
 
-Text_1C4739:: @ 81C4739
+SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739
 	.string "My teacher is showing me how to\n"
 	.string "paint some more.$"
 
-Text_1C476A:: @ 81C476A
+SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A
 	.string "Today, in addition to our lesson,\n"
 	.string "we came to see the chamber again.$"
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index a23f73322..6fc9a48f6 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -1,1471 +1,1471 @@
 	.align 2
-gTilesetTiles_826D37C:: @ 826D37C
-	.incbin "data/tilesets/secondary/82D4AAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826D7C0:: @ 826D7C0
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826D9C0:: @ 826D9C0
-	.incbin "data/tilesets/secondary/82D4AC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826DFC0:: @ 826DFC0
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826E1C0:: @ 826E1C0
-	.incbin "data/tilesets/secondary/82D4ADC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826EAB8:: @ 826EAB8
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826ECB8:: @ 826ECB8
-	.incbin "data/tilesets/secondary/82D4AF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826F4B8:: @ 826F4B8
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826F6B8:: @ 826F6B8
-	.incbin "data/tilesets/secondary/82D4B0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270438:: @ 8270438
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270638:: @ 8270638
-	.incbin "data/tilesets/secondary/82D4B24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270DA0:: @ 8270DA0
-	.incbin "data/tilesets/secondary/82D4B24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270FA0:: @ 8270FA0
-	.incbin "data/tilesets/secondary/82D4B3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8271C74:: @ 8271C74
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8271E74:: @ 8271E74
-	.incbin "data/tilesets/secondary/82D4B54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8272A5C:: @ 8272A5C
-	.incbin "data/tilesets/secondary/82D4B54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8272C5C:: @ 8272C5C
-	.incbin "data/tilesets/secondary/82D4B6C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8273358:: @ 8273358
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8273558:: @ 8273558
-	.incbin "data/tilesets/secondary/82D4B84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82742D0:: @ 82742D0
-	.incbin "data/tilesets/secondary/82D4B84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82744D0:: @ 82744D0
-	.incbin "data/tilesets/secondary/82D4B9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8275094:: @ 8275094
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8275294:: @ 8275294
-	.incbin "data/tilesets/primary/82D4BB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277694:: @ 8277694
-	.incbin "data/tilesets/primary/82D4BB4/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277894:: @ 8277894
-	.incbin "data/tilesets/secondary/82D4BCC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277A5C:: @ 8277A5C
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277C5C:: @ 8277C5C
-	.incbin "data/tilesets/secondary/82D4BE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8278CC4:: @ 8278CC4
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8278EC4:: @ 8278EC4
-	.incbin "data/tilesets/secondary/82D4BFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A1A8:: @ 827A1A8
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A3A8:: @ 827A3A8
-	.incbin "data/tilesets/secondary/82D4C14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A3B8:: @ 827A3B8
-	.incbin "data/tilesets/secondary/82D4C14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A5B8:: @ 827A5B8
-	.incbin "data/tilesets/secondary/82D4C2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827AE14:: @ 827AE14
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827B014:: @ 827B014
-	.incbin "data/tilesets/secondary/82D4C44/tiles.4bpp"
-
-	.align 2
-gTilesetPalettes_827FF14:: @ 827FF14
-	.incbin "data/tilesets/secondary/82D4C44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280114:: @ 8280114
-	.incbin "data/tilesets/secondary/82D4C5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82804EC:: @ 82804EC
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82806EC:: @ 82806EC
-	.incbin "data/tilesets/secondary/82D4C8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8280D00:: @ 8280D00
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280F00:: @ 8280F00
-	.incbin "data/tilesets/secondary/82D4CD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82823A4:: @ 82823A4
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82825A4:: @ 82825A4
-	.incbin "data/tilesets/secondary/82D4CEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8282FBC:: @ 8282FBC
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82831BC:: @ 82831BC
-	.incbin "data/tilesets/secondary/82D4D04/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82839B0:: @ 82839B0
-	.incbin "data/tilesets/secondary/82D4D04/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8283BB0:: @ 8283BB0
-	.incbin "data/tilesets/secondary/82D4D1C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8283FF8:: @ 8283FF8
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82841F8:: @ 82841F8
-	.incbin "data/tilesets/secondary/82D4D34/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82849B8:: @ 82849B8
-	.incbin "data/tilesets/secondary/82D4D34/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8284BB8:: @ 8284BB8
-	.incbin "data/tilesets/secondary/82D4D4C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285150:: @ 8285150
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285350:: @ 8285350
-	.incbin "data/tilesets/secondary/82D4CA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82857A4:: @ 82857A4
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82859A4:: @ 82859A4
-	.incbin "data/tilesets/secondary/82D4D64/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285D90:: @ 8285D90
-	.incbin "data/tilesets/secondary/82D4D64/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285F90:: @ 8285F90
-	.incbin "data/tilesets/secondary/82D4D7C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82865D4:: @ 82865D4
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82867D4:: @ 82867D4
-	.incbin "data/tilesets/secondary/82D4CBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8286BC8:: @ 8286BC8
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8286DC8:: @ 8286DC8
-	.incbin "data/tilesets/secondary/82D4D94/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287B80:: @ 8287B80
-	.incbin "data/tilesets/secondary/82D4D94/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287D80:: @ 8287D80
-	.incbin "data/tilesets/secondary/82D4DAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287D94:: @ 8287D94
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287F94:: @ 8287F94
-	.incbin "data/tilesets/secondary/82D4DC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288444:: @ 8288444
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288644:: @ 8288644
-	.incbin "data/tilesets/secondary/82D4DDC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288C60:: @ 8288C60
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288E60:: @ 8288E60
-	.incbin "data/tilesets/secondary/82D4DF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8289FC8:: @ 8289FC8
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828A1C8:: @ 828A1C8
-	.incbin "data/tilesets/secondary/82D4E0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828B250:: @ 828B250
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828B450:: @ 828B450
-	.incbin "data/tilesets/secondary/82D4E24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828CAA0:: @ 828CAA0
-	.incbin "data/tilesets/secondary/82D4E24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828CCA0:: @ 828CCA0
-	.incbin "data/tilesets/secondary/82D4E3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828D2BC:: @ 828D2BC
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828D4BC:: @ 828D4BC
-	.incbin "data/tilesets/secondary/82D4E54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828E3A4:: @ 828E3A4
-	.incbin "data/tilesets/secondary/82D4E54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828E5A4:: @ 828E5A4
-	.incbin "data/tilesets/secondary/82D4E84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828EC70:: @ 828EC70
-	.incbin "data/tilesets/secondary/82D4E84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828EE70:: @ 828EE70
-	.incbin "data/tilesets/secondary/82D4E9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F378:: @ 828F378
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828F578:: @ 828F578
-	.incbin "data/tilesets/secondary/82D4EB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F9D8:: @ 828F9D8
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828FBD8:: @ 828FBD8
-	.incbin "data/tilesets/secondary/82D4F8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8290DD0:: @ 8290DD0
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8290FD0:: @ 8290FD0
-	.incbin "data/tilesets/secondary/82D4EE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291274:: @ 8291274
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291474:: @ 8291474
-	.incbin "data/tilesets/secondary/82D4EFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291AFC:: @ 8291AFC
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291CFC:: @ 8291CFC
-	.incbin "data/tilesets/secondary/82D4F14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82920F0:: @ 82920F0
-	.incbin "data/tilesets/secondary/82D4F14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82922F0:: @ 82922F0
-	.incbin "data/tilesets/secondary/82D4F2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8292FF0:: @ 8292FF0
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82931F0:: @ 82931F0
-	.incbin "data/tilesets/secondary/82D4F44/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293660:: @ 8293660
-	.incbin "data/tilesets/secondary/82D4F44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293860:: @ 8293860
-	.incbin "data/tilesets/secondary/82D4F5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293B0C:: @ 8293B0C
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293D0C:: @ 8293D0C
-	.incbin "data/tilesets/secondary/82D4F74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294144:: @ 8294144
-	.incbin "data/tilesets/secondary/82D4F74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294344:: @ 8294344
-	.incbin "data/tilesets/secondary/82D4FA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294D08:: @ 8294D08
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294F08:: @ 8294F08
-	.incbin "data/tilesets/secondary/82D4FBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294F18:: @ 8294F18
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8295118:: @ 8295118
-	.incbin "data/tilesets/secondary/82D4FD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829512C:: @ 829512C
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829532C:: @ 829532C
-	.incbin "data/tilesets/secondary/82D4FEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82967D4:: @ 82967D4
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82969D4:: @ 82969D4
-	.incbin "data/tilesets/secondary/82D5004/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8296E90:: @ 8296E90
-	.incbin "data/tilesets/secondary/82D5004/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8297090:: @ 8297090
-	.incbin "data/tilesets/secondary/82D501C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82983BC:: @ 82983BC
-	.incbin "data/tilesets/secondary/82D501C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82985BC:: @ 82985BC
-	.incbin "data/tilesets/secondary/82D5034/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8298970:: @ 8298970
-	.incbin "data/tilesets/secondary/82D5034/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8298B70:: @ 8298B70
-	.incbin "data/tilesets/secondary/82D504C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8299AA4:: @ 8299AA4
-	.incbin "data/tilesets/secondary/82D504C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8299CA4:: @ 8299CA4
-	.incbin "data/tilesets/secondary/82D5064/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829AB04:: @ 829AB04
-	.incbin "data/tilesets/secondary/82D5064/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829AD04:: @ 829AD04
-	.incbin "data/tilesets/secondary/82D507C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829BD64:: @ 829BD64
-	.incbin "data/tilesets/secondary/82D507C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829BF64:: @ 829BF64
-	.incbin "data/tilesets/secondary/82D5094/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829CEE4:: @ 829CEE4
-	.incbin "data/tilesets/secondary/82D5094/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829D0E4:: @ 829D0E4
-	.incbin "data/tilesets/secondary/82D50AC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829D894:: @ 829D894
-	.incbin "data/tilesets/secondary/82D50AC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829DA94:: @ 829DA94
-	.incbin "data/tilesets/secondary/82D50C4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829EA50:: @ 829EA50
-	.incbin "data/tilesets/secondary/82D50C4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829EC50:: @ 829EC50
-	.incbin "data/tilesets/secondary/82D50DC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829F4C8:: @ 829F4C8
-	.incbin "data/tilesets/secondary/82D50DC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/15.gbapal"
+gTilesetTiles_PalletTown:: @ 826D37C
+	.incbin "data/tilesets/secondary/pallet_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PalletTown:: @ 826D7C0
+	.incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianCity:: @ 826D9C0
+	.incbin "data/tilesets/secondary/viridian_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianCity:: @ 826DFC0
+	.incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterCity:: @ 826E1C0
+	.incbin "data/tilesets/secondary/pewter_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterCity:: @ 826EAB8
+	.incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCity:: @ 826ECB8
+	.incbin "data/tilesets/secondary/cerulean_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCity:: @ 826F4B8
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_LavenderTown:: @ 826F6B8
+	.incbin "data/tilesets/secondary/lavender_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_LavenderTown:: @ 8270438
+	.incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionCity:: @ 8270638
+	.incbin "data/tilesets/secondary/vermilion_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionCity:: @ 8270DA0
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonCity:: @ 8270FA0
+	.incbin "data/tilesets/secondary/celadon_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonCity:: @ 8271C74
+	.incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaCity:: @ 8271E74
+	.incbin "data/tilesets/secondary/fuchsia_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaCity:: @ 8272A5C
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarIsland:: @ 8272C5C
+	.incbin "data/tilesets/secondary/cinnabar_island/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarIsland:: @ 8273358
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IndigoPlateau:: @ 8273558
+	.incbin "data/tilesets/secondary/indigo_plateau/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IndigoPlateau:: @ 82742D0
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronCity:: @ 82744D0
+	.incbin "data/tilesets/secondary/saffron_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronCity:: @ 8275094
+	.incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Mart:: @ 8277894
+	.incbin "data/tilesets/secondary/mart/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Mart:: @ 8277A5C
+	.incbin "data/tilesets/secondary/mart/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonCenter:: @ 8277C5C
+	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonCenter:: @ 8278CC4
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Cave:: @ 8278EC4
+	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Cave:: @ 827A1A8
+	.incbin "data/tilesets/secondary/cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy1:: @ 827A3A8
+	.incbin "data/tilesets/secondary/dummy1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy1:: @ 827A3B8
+	.incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Museum:: @ 827A5B8
+	.incbin "data/tilesets/secondary/museum/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Museum:: @ 827AE14
+	.incbin "data/tilesets/secondary/museum/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CableClub:: @ 827B014
+	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
+
+	.align 2
+gTilesetPalettes_CableClub:: @ 827FF14
+	.incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BikeShop:: @ 8280114
+	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BikeShop:: @ 82804EC
+	.incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Lab:: @ 82806EC
+	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Lab:: @ 8280D00
+	.incbin "data/tilesets/secondary/lab/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HoennBuilding:: @ 8280F00
+	.incbin "data/tilesets/secondary/hoenn_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HoennBuilding:: @ 82823A4
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GameCorner:: @ 82825A4
+	.incbin "data/tilesets/secondary/game_corner/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GameCorner:: @ 8282FBC
+	.incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterGym:: @ 82831BC
+	.incbin "data/tilesets/secondary/pewter_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterGym:: @ 82839B0
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanGym:: @ 8283BB0
+	.incbin "data/tilesets/secondary/cerulean_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanGym:: @ 8283FF8
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionGym:: @ 82841F8
+	.incbin "data/tilesets/secondary/vermilion_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionGym:: @ 82849B8
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonGym:: @ 8284BB8
+	.incbin "data/tilesets/secondary/celadon_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonGym:: @ 8285150
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaGym:: @ 8285350
+	.incbin "data/tilesets/secondary/fuchsia_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaGym:: @ 82857A4
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronGym:: @ 82859A4
+	.incbin "data/tilesets/secondary/saffron_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronGym:: @ 8285D90
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarGym:: @ 8285F90
+	.incbin "data/tilesets/secondary/cinnabar_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarGym:: @ 82865D4
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianGym:: @ 82867D4
+	.incbin "data/tilesets/secondary/viridian_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianGym:: @ 8286BC8
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SSAnne:: @ 8286DC8
+	.incbin "data/tilesets/secondary/ss_anne/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SSAnne:: @ 8287B80
+	.incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy2:: @ 8287D80
+	.incbin "data/tilesets/secondary/dummy2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy2:: @ 8287D94
+	.incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianForest:: @ 8287F94
+	.incbin "data/tilesets/secondary/viridian_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianForest:: @ 8288444
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse1:: @ 8288644
+	.incbin "data/tilesets/secondary/unused_gatehouse1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse1:: @ 8288C60
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RockTunnel:: @ 8288E60
+	.incbin "data/tilesets/secondary/rock_tunnel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RockTunnel:: @ 8289FC8
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_DiglettsCave:: @ 828A1C8
+	.incbin "data/tilesets/secondary/digletts_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DiglettsCave:: @ 828B250
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeafoamIslands:: @ 828B450
+	.incbin "data/tilesets/secondary/seafoam_islands/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeafoamIslands:: @ 828CAA0
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse2:: @ 828CCA0
+	.incbin "data/tilesets/secondary/unused_gatehouse2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCave:: @ 828D4BC
+	.incbin "data/tilesets/secondary/cerulean_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCave:: @ 828E3A4
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding2:: @ 828E5A4
+	.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GenericBuilding2:: @ 828EC70
+	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PowerPlant:: @ 828EE70
+	.incbin "data/tilesets/secondary/power_plant/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PowerPlant:: @ 828F378
+	.incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeaCottage:: @ 828F578
+	.incbin "data/tilesets/secondary/sea_cottage/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeaCottage:: @ 828F9D8
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SilphCo:: @ 828FBD8
+	.incbin "data/tilesets/secondary/condominiums/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SilphCo:: @ 8290DD0
+	.incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UndergroundPath:: @ 8290FD0
+	.incbin "data/tilesets/secondary/underground_path/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UndergroundPath:: @ 8291274
+	.incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonTower:: @ 8291474
+	.incbin "data/tilesets/secondary/pokemon_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonTower:: @ 8291AFC
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SafariZoneBuilding:: @ 8291CFC
+	.incbin "data/tilesets/secondary/safari_zone_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SafariZoneBuilding:: @ 82920F0
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonMansion:: @ 82922F0
+	.incbin "data/tilesets/secondary/pokemon_mansion/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonMansion:: @ 8292FF0
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RestaurantHotel:: @ 82931F0
+	.incbin "data/tilesets/secondary/restaurant_hotel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RestaurantHotel:: @ 8293660
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_School:: @ 8293860
+	.incbin "data/tilesets/secondary/school/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_School:: @ 8293B0C
+	.incbin "data/tilesets/secondary/school/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FanClubDaycare:: @ 8293D0C
+	.incbin "data/tilesets/secondary/fan_club_daycare/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FanClubDaycare:: @ 8294144
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BurgledHouse:: @ 8294344
+	.incbin "data/tilesets/secondary/burgled_house/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BurgledHouse:: @ 8294D08
+	.incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy3:: @ 8294F08
+	.incbin "data/tilesets/secondary/dummy3/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy3:: @ 8294F18
+	.incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy4:: @ 8295118
+	.incbin "data/tilesets/secondary/dummy4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy4:: @ 829512C
+	.incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_MtEmber:: @ 829532C
+	.incbin "data/tilesets/secondary/mt_ember/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_MtEmber:: @ 82967D4
+	.incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BerryForest:: @ 82969D4
+	.incbin "data/tilesets/secondary/berry_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BerryForest:: @ 8296E90
+	.incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_NavelRock:: @ 8297090
+	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_NavelRock:: @ 82983BC
+	.incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TanobyRuins:: @ 82985BC
+	.incbin "data/tilesets/secondary/tanoby_ruins/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TanobyRuins:: @ 8298970
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands123:: @ 8298B70
+	.incbin "data/tilesets/secondary/sevii_islands_123/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands123:: @ 8299AA4
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands45:: @ 8299CA4
+	.incbin "data/tilesets/secondary/sevii_islands_45/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands45:: @ 829AB04
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands67:: @ 829AD04
+	.incbin "data/tilesets/secondary/sevii_islands_67/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands67:: @ 829BD64
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TrainerTower:: @ 829BF64
+	.incbin "data/tilesets/secondary/trainer_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TrainerTower:: @ 829CEE4
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IslandHarbor:: @ 829D0E4
+	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IslandHarbor:: @ 829D894
+	.incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonLeague:: @ 829DA94
+	.incbin "data/tilesets/secondary/pokemon_league/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonLeague:: @ 829EA50
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HallOfFame:: @ 829EC50
+	.incbin "data/tilesets/secondary/hall_of_fame/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HallOfFame:: @ 829F4C8
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/15.gbapal"
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index d40b3a5e6..cac3cf82f 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -1,749 +1,749 @@
 
 	.align 2
-gTileset_82D4A94::
+gTileset_General::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA1D68
-	.4byte gTilesetPalettes_8EA1B68
-	.4byte gMetatiles_829F6C8
-	.4byte sub_8070154
-	.4byte gMetatileAttributes_82A1EC8
+	.4byte gTilesetTiles_General
+	.4byte gTilesetPalettes_General
+	.4byte gMetatiles_General
+	.4byte InitTilesetAnim_General
+	.4byte gMetatileAttributes_General
 
 	.align 2
-gTileset_82D4AAC::
+gTileset_PalletTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D37C
-	.4byte gTilesetPalettes_826D7C0
-	.4byte gMetatiles_82A28C8
+	.4byte gTilesetTiles_PalletTown
+	.4byte gTilesetPalettes_PalletTown
+	.4byte gMetatiles_PalletTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A2E58
+	.4byte gMetatileAttributes_PalletTown
 
 	.align 2
-gTileset_82D4AC4::
+gTileset_ViridianCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D9C0
-	.4byte gTilesetPalettes_826DFC0
-	.4byte gMetatiles_82A2FBC
+	.4byte gTilesetTiles_ViridianCity
+	.4byte gTilesetPalettes_ViridianCity
+	.4byte gMetatiles_ViridianCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A35AC
+	.4byte gMetatileAttributes_ViridianCity
 
 	.align 2
-gTileset_82D4ADC::
+gTileset_PewterCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826E1C0
-	.4byte gTilesetPalettes_826EAB8
-	.4byte gMetatiles_82A3728
+	.4byte gTilesetTiles_PewterCity
+	.4byte gTilesetPalettes_PewterCity
+	.4byte gMetatiles_PewterCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A3C18
+	.4byte gMetatileAttributes_PewterCity
 
 	.align 2
-gTileset_82D4AF4::
+gTileset_CeruleanCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826ECB8
-	.4byte gTilesetPalettes_826F4B8
-	.4byte gMetatiles_82A3D54
+	.4byte gTilesetTiles_CeruleanCity
+	.4byte gTilesetPalettes_CeruleanCity
+	.4byte gMetatiles_CeruleanCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A45B4
+	.4byte gMetatileAttributes_CeruleanCity
 
 	.align 2
-gTileset_82D4B0C::
+gTileset_LavenderTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826F6B8
-	.4byte gTilesetPalettes_8270438
-	.4byte gMetatiles_82A47CC
+	.4byte gTilesetTiles_LavenderTown
+	.4byte gTilesetPalettes_LavenderTown
+	.4byte gMetatiles_LavenderTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A556C
+	.4byte gMetatileAttributes_LavenderTown
 
 	.align 2
-gTileset_82D4B24::
+gTileset_VermilionCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270638
-	.4byte gTilesetPalettes_8270DA0
-	.4byte gMetatiles_82A58D4
+	.4byte gTilesetTiles_VermilionCity
+	.4byte gTilesetPalettes_VermilionCity
+	.4byte gMetatiles_VermilionCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A6354
+	.4byte gMetatileAttributes_VermilionCity
 
 	.align 2
-gTileset_82D4B3C::
+gTileset_CeladonCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270FA0
-	.4byte gTilesetPalettes_8271C74
-	.4byte gMetatiles_82A65F4
-	.4byte sub_80701D8
-	.4byte gMetatileAttributes_82A74F4
+	.4byte gTilesetTiles_CeladonCity
+	.4byte gTilesetPalettes_CeladonCity
+	.4byte gMetatiles_CeladonCity
+	.4byte InitTilesetAnim_CeladonCity
+	.4byte gMetatileAttributes_CeladonCity
 
 	.align 2
-gTileset_82D4B54::
+gTileset_FuchsiaCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8271E74
-	.4byte gTilesetPalettes_8272A5C
-	.4byte gMetatiles_82A78B4
+	.4byte gTilesetTiles_FuchsiaCity
+	.4byte gTilesetPalettes_FuchsiaCity
+	.4byte gMetatiles_FuchsiaCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A84B4
+	.4byte gMetatileAttributes_FuchsiaCity
 
 	.align 2
-gTileset_82D4B6C::
+gTileset_CinnabarIsland::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8272C5C
-	.4byte gTilesetPalettes_8273358
-	.4byte gMetatiles_82A87B4
+	.4byte gTilesetTiles_CinnabarIsland
+	.4byte gTilesetPalettes_CinnabarIsland
+	.4byte gMetatiles_CinnabarIsland
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A8BB4
+	.4byte gMetatileAttributes_CinnabarIsland
 
 	.align 2
-gTileset_82D4B84::
+gTileset_IndigoPlateau::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8273558
-	.4byte gTilesetPalettes_82742D0
-	.4byte gMetatiles_82A8CB4
+	.4byte gTilesetTiles_IndigoPlateau
+	.4byte gTilesetPalettes_IndigoPlateau
+	.4byte gMetatiles_IndigoPlateau
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A97B4
+	.4byte gMetatileAttributes_IndigoPlateau
 
 	.align 2
-gTileset_82D4B9C::
+gTileset_SaffronCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82744D0
-	.4byte gTilesetPalettes_8275094
-	.4byte gMetatiles_82A9A74
+	.4byte gTilesetTiles_SaffronCity
+	.4byte gTilesetPalettes_SaffronCity
+	.4byte gMetatiles_SaffronCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AA6F4
+	.4byte gMetatileAttributes_SaffronCity
 
 	.align 2
-gTileset_82D4BB4::
+gTileset_Building::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8275294
-	.4byte gTilesetPalettes_8277694
-	.4byte gMetatiles_82AD7B4
+	.4byte gTilesetTiles_Building
+	.4byte gTilesetPalettes_Building
+	.4byte gMetatiles_Building
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AFFB4
+	.4byte gMetatileAttributes_Building
 
 	.align 2
-gTileset_82D4BCC::
+gTileset_Mart::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277894
-	.4byte gTilesetPalettes_8277A5C
-	.4byte gMetatiles_82B3524
+	.4byte gTilesetTiles_Mart
+	.4byte gTilesetPalettes_Mart
+	.4byte gMetatiles_Mart
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B3954
+	.4byte gMetatileAttributes_Mart
 
 	.align 2
-gTileset_82D4BE4::
+gTileset_PokemonCenter::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277C5C
-	.4byte gTilesetPalettes_8278CC4
-	.4byte gMetatiles_82B3A60
+	.4byte gTilesetTiles_PokemonCenter
+	.4byte gTilesetPalettes_PokemonCenter
+	.4byte gMetatiles_PokemonCenter
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4A50
+	.4byte gMetatileAttributes_PokemonCenter
 
 	.align 2
-gTileset_82D4BFC::
+gTileset_Cave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8278EC4
-	.4byte gTilesetPalettes_827A1A8
-	.4byte gMetatiles_82B502C
+	.4byte gTilesetTiles_Cave
+	.4byte gTilesetPalettes_Cave
+	.4byte gMetatiles_Cave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B5A3C
+	.4byte gMetatileAttributes_Cave
 
 	.align 2
-gTileset_82D4C14::
+gTileset_Dummy1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A3A8
-	.4byte gTilesetPalettes_827A3B8
-	.4byte gMetatiles_82B09B4
+	.4byte gTilesetTiles_Dummy1
+	.4byte gTilesetPalettes_Dummy1
+	.4byte gMetatiles_Dummy1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B09D4
+	.4byte gMetatileAttributes_Dummy1
 
 	.align 2
-gTileset_82D4C2C::
+gTileset_Museum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A5B8
-	.4byte gTilesetPalettes_827AE14
-	.4byte gMetatiles_82C5738
+	.4byte gTilesetTiles_Museum
+	.4byte gTilesetPalettes_Museum
+	.4byte gMetatiles_Museum
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5FA8
+	.4byte gMetatileAttributes_Museum
 
 	.align 2
-gTileset_82D4C44::
+gTileset_CableClub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827B014
-	.4byte gTilesetPalettes_827FF14
-	.4byte gMetatiles_82C61C4
+	.4byte gTilesetTiles_CableClub
+	.4byte gTilesetPalettes_CableClub
+	.4byte gMetatiles_CableClub
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C71C4
+	.4byte gMetatileAttributes_CableClub
 
 	.align 2
-gTileset_82D4C5C::
+gTileset_BikeShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280114
-	.4byte gTilesetPalettes_82804EC
-	.4byte gMetatiles_82B31DC
+	.4byte gTilesetTiles_BikeShop
+	.4byte gTilesetPalettes_BikeShop
+	.4byte gMetatiles_BikeShop
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B347C
+	.4byte gMetatileAttributes_BikeShop
 
 	.align 2
-gTileset_82D4C74::
+gTileset_GenericBuilding1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA99F4
-	.4byte gTilesetPalettes_8EA97F4
-	.4byte gMetatiles_82B4E4C
+	.4byte gTilesetTiles_GenericBuilding1
+	.4byte gTilesetPalettes_GenericBuilding1
+	.4byte gMetatiles_GenericBuilding1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4FCC
+	.4byte gMetatileAttributes_GenericBuilding1
 
 	.align 2
-gTileset_82D4C8C::
+gTileset_Lab::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82806EC
-	.4byte gTilesetPalettes_8280D00
-	.4byte gMetatiles_82B68A0
+	.4byte gTilesetTiles_Lab
+	.4byte gTilesetPalettes_Lab
+	.4byte gMetatiles_Lab
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B7390
+	.4byte gMetatileAttributes_Lab
 
 	.align 2
-gTileset_82D4CA4::
+gTileset_FuchsiaGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285350
-	.4byte gTilesetPalettes_82857A4
-	.4byte gMetatiles_82AC364
+	.4byte gTilesetTiles_FuchsiaGym
+	.4byte gTilesetPalettes_FuchsiaGym
+	.4byte gMetatiles_FuchsiaGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC584
+	.4byte gMetatileAttributes_FuchsiaGym
 
 	.align 2
-gTileset_82D4CBC::
+gTileset_ViridianGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82867D4
-	.4byte gTilesetPalettes_8286BC8
-	.4byte gMetatiles_82AD124
+	.4byte gTilesetTiles_ViridianGym
+	.4byte gTilesetPalettes_ViridianGym
+	.4byte gMetatiles_ViridianGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AD664
+	.4byte gMetatileAttributes_ViridianGym
 
 	.align 2
-gTileset_82D4CD4::
+gTileset_HoennBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280F00
-	.4byte gTilesetPalettes_82823A4
-	.4byte gMetatiles_82B09DC
+	.4byte gTilesetTiles_HoennBuilding
+	.4byte gTilesetPalettes_HoennBuilding
+	.4byte gMetatiles_HoennBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B29DC
+	.4byte gMetatileAttributes_HoennBuilding
 
 	.align 2
-gTileset_82D4CEC::
+gTileset_GameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82825A4
-	.4byte gTilesetPalettes_8282FBC
-	.4byte gMetatiles_82B5CC0
+	.4byte gTilesetTiles_GameCorner
+	.4byte gTilesetPalettes_GameCorner
+	.4byte gMetatiles_GameCorner
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B6640
+	.4byte gMetatileAttributes_GameCorner
 
 	.align 2
-gTileset_82D4D04::
+gTileset_PewterGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82831BC
-	.4byte gTilesetPalettes_82839B0
-	.4byte gMetatiles_82AAA14
+	.4byte gTilesetTiles_PewterGym
+	.4byte gTilesetPalettes_PewterGym
+	.4byte gMetatiles_PewterGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB064
+	.4byte gMetatileAttributes_PewterGym
 
 	.align 2
-gTileset_82D4D1C::
+gTileset_CeruleanGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8283BB0
-	.4byte gTilesetPalettes_8283FF8
-	.4byte gMetatiles_82AB1F8
+	.4byte gTilesetTiles_CeruleanGym
+	.4byte gTilesetPalettes_CeruleanGym
+	.4byte gMetatiles_CeruleanGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB738
+	.4byte gMetatileAttributes_CeruleanGym
 
 	.align 2
-gTileset_82D4D34::
+gTileset_VermilionGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82841F8
-	.4byte gTilesetPalettes_82849B8
-	.4byte gMetatiles_82AB888
-	.4byte sub_807031C
-	.4byte gMetatileAttributes_82ABD38
+	.4byte gTilesetTiles_VermilionGym
+	.4byte gTilesetPalettes_VermilionGym
+	.4byte gMetatiles_VermilionGym
+	.4byte InitTilesetAnim_VermilionGym
+	.4byte gMetatileAttributes_VermilionGym
 
 	.align 2
-gTileset_82D4D4C::
+gTileset_CeladonGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8284BB8
-	.4byte gTilesetPalettes_8285150
-	.4byte gMetatiles_82ABE64
-	.4byte sub_8070380
-	.4byte gMetatileAttributes_82AC264
+	.4byte gTilesetTiles_CeladonGym
+	.4byte gTilesetPalettes_CeladonGym
+	.4byte gMetatiles_CeladonGym
+	.4byte InitTilesetAnim_CeladonGym
+	.4byte gMetatileAttributes_CeladonGym
 
 	.align 2
-gTileset_82D4D64::
+gTileset_SaffronGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82859A4
-	.4byte gTilesetPalettes_8285D90
-	.4byte gMetatiles_82AC60C
+	.4byte gTilesetTiles_SaffronGym
+	.4byte gTilesetPalettes_SaffronGym
+	.4byte gMetatiles_SaffronGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC8EC
+	.4byte gMetatileAttributes_SaffronGym
 
 	.align 2
-gTileset_82D4D7C::
+gTileset_CinnabarGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285F90
-	.4byte gTilesetPalettes_82865D4
-	.4byte gMetatiles_82AC9A4
+	.4byte gTilesetTiles_CinnabarGym
+	.4byte gTilesetPalettes_CinnabarGym
+	.4byte gMetatiles_CinnabarGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82ACFA4
+	.4byte gMetatileAttributes_CinnabarGym
 
 	.align 2
-gTileset_82D4D94::
+gTileset_SSAnne::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8286DC8
-	.4byte gTilesetPalettes_8287B80
-	.4byte gMetatiles_82B764C
+	.4byte gTilesetTiles_SSAnne
+	.4byte gTilesetPalettes_SSAnne
+	.4byte gMetatiles_SSAnne
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B8B4C
+	.4byte gMetatileAttributes_SSAnne
 
 	.align 2
-gTileset_82D4DAC::
+gTileset_Dummy2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287D80
-	.4byte gTilesetPalettes_8287D94
-	.4byte gMetatiles_82B908C
+	.4byte gTilesetTiles_Dummy2
+	.4byte gTilesetPalettes_Dummy2
+	.4byte gMetatiles_Dummy2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B90AC
+	.4byte gMetatileAttributes_Dummy2
 
 	.align 2
-gTileset_82D4DC4::
+gTileset_ViridianForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287F94
-	.4byte gTilesetPalettes_8288444
-	.4byte gMetatiles_82B90B4
+	.4byte gTilesetTiles_ViridianForest
+	.4byte gTilesetPalettes_ViridianForest
+	.4byte gMetatiles_ViridianForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9364
+	.4byte gMetatileAttributes_ViridianForest
 
 	.align 2
-gTileset_82D4DDC::
+gTileset_UnusedGatehouse1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288644
-	.4byte gTilesetPalettes_8288C60
-	.4byte gMetatiles_82B9410
+	.4byte gTilesetTiles_UnusedGatehouse1
+	.4byte gTilesetPalettes_UnusedGatehouse1
+	.4byte gMetatiles_UnusedGatehouse1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9B30
+	.4byte gMetatileAttributes_UnusedGatehouse1
 
 	.align 2
-gTileset_82D4DF4::
+gTileset_RockTunnel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288E60
-	.4byte gTilesetPalettes_8289FC8
-	.4byte gMetatiles_82B9CF8
+	.4byte gTilesetTiles_RockTunnel
+	.4byte gTilesetPalettes_RockTunnel
+	.4byte gMetatiles_RockTunnel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BA678
+	.4byte gMetatileAttributes_RockTunnel
 
 	.align 2
-gTileset_82D4E0C::
+gTileset_DiglettsCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828A1C8
-	.4byte gTilesetPalettes_828B250
-	.4byte gMetatiles_82BA8D8
+	.4byte gTilesetTiles_DiglettsCave
+	.4byte gTilesetPalettes_DiglettsCave
+	.4byte gMetatiles_DiglettsCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BB2A8
+	.4byte gMetatileAttributes_DiglettsCave
 
 	.align 2
-gTileset_82D4E24::
+gTileset_SeafoamIslands::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828B450
-	.4byte gTilesetPalettes_828CAA0
-	.4byte gMetatiles_82BB51C
+	.4byte gTilesetTiles_SeafoamIslands
+	.4byte gTilesetPalettes_SeafoamIslands
+	.4byte gMetatiles_SeafoamIslands
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BC49C
+	.4byte gMetatileAttributes_SeafoamIslands
 
 	.align 2
-gTileset_82D4E3C::
+gTileset_UnusedGatehouse2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828CCA0
-	.4byte gTilesetPalettes_828D2BC
-	.4byte gMetatiles_82BC87C
+	.4byte gTilesetTiles_UnusedGatehouse2
+	.4byte gTilesetPalettes_UnusedGatehouse2
+	.4byte gMetatiles_UnusedGatehouse2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BCF9C
+	.4byte gMetatileAttributes_UnusedGatehouse2
 
 	.align 2
-gTileset_82D4E54::
+gTileset_CeruleanCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828D4BC
-	.4byte gTilesetPalettes_828E3A4
-	.4byte gMetatiles_82BD164
+	.4byte gTilesetTiles_CeruleanCave
+	.4byte gTilesetPalettes_CeruleanCave
+	.4byte gMetatiles_CeruleanCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BD9C4
+	.4byte gMetatileAttributes_CeruleanCave
 
 	.align 2
-gTileset_82D4E6C::
+gTileset_DepartmentStore::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA9F88
-	.4byte gTilesetPalettes_8EA9D88
-	.4byte gMetatiles_82BDBDC
+	.4byte gTilesetTiles_DepartmentStore
+	.4byte gTilesetPalettes_DepartmentStore
+	.4byte gMetatiles_DepartmentStore
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BEB3C
+	.4byte gMetatileAttributes_DepartmentStore
 
 	.align 2
-gTileset_82D4E84::
+gTileset_GenericBuilding2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828E5A4
-	.4byte gTilesetPalettes_828EC70
-	.4byte gMetatiles_82BEF14
+	.4byte gTilesetTiles_GenericBuilding2
+	.4byte gTilesetPalettes_GenericBuilding2
+	.4byte gMetatiles_GenericBuilding2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BFA94
+	.4byte gMetatileAttributes_GenericBuilding2
 
 	.align 2
-gTileset_82D4E9C::
+gTileset_PowerPlant::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828EE70
-	.4byte gTilesetPalettes_828F378
-	.4byte gMetatiles_82BFD74
+	.4byte gTilesetTiles_PowerPlant
+	.4byte gTilesetPalettes_PowerPlant
+	.4byte gMetatiles_PowerPlant
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0704
+	.4byte gMetatileAttributes_PowerPlant
 
 	.align 2
-gTileset_82D4EB4::
+gTileset_SeaCottage::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828F578
-	.4byte gTilesetPalettes_828F9D8
-	.4byte gMetatiles_82C0968
+	.4byte gTilesetTiles_SeaCottage
+	.4byte gTilesetPalettes_SeaCottage
+	.4byte gMetatiles_SeaCottage
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0D18
+	.4byte gMetatileAttributes_SeaCottage
 
 	.align 2
-gTileset_82D4ECC::
+gTileset_SilphCo::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C0E04
-	.4byte sub_8070250
-	.4byte gMetatileAttributes_82C25A4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_SilphCo
+	.4byte InitTilesetAnim_SilphCo
+	.4byte gMetatileAttributes_SilphCo
 
 	.align 2
-gTileset_82D4EE4::
+gTileset_UndergroundPath::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8290FD0
-	.4byte gTilesetPalettes_8291274
-	.4byte gMetatiles_82C2B8C
+	.4byte gTilesetTiles_UndergroundPath
+	.4byte gTilesetPalettes_UndergroundPath
+	.4byte gMetatiles_UndergroundPath
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C300C
+	.4byte gMetatileAttributes_UndergroundPath
 
 	.align 2
-gTileset_82D4EFC::
+gTileset_PokemonTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291474
-	.4byte gTilesetPalettes_8291AFC
-	.4byte gMetatiles_82C312C
+	.4byte gTilesetTiles_PokemonTower
+	.4byte gTilesetPalettes_PokemonTower
+	.4byte gMetatiles_PokemonTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C377C
+	.4byte gMetatileAttributes_PokemonTower
 
 	.align 2
-gTileset_82D4F14::
+gTileset_SafariZoneBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291CFC
-	.4byte gTilesetPalettes_82920F0
-	.4byte gMetatiles_82C3910
+	.4byte gTilesetTiles_SafariZoneBuilding
+	.4byte gTilesetPalettes_SafariZoneBuilding
+	.4byte gMetatiles_SafariZoneBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C4110
+	.4byte gMetatileAttributes_SafariZoneBuilding
 
 	.align 2
-gTileset_82D4F2C::
+gTileset_PokemonMansion::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82922F0
-	.4byte gTilesetPalettes_8292FF0
-	.4byte gMetatiles_82C4310
+	.4byte gTilesetTiles_PokemonMansion
+	.4byte gTilesetPalettes_PokemonMansion
+	.4byte gMetatiles_PokemonMansion
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5330
+	.4byte gMetatileAttributes_PokemonMansion
 
 	.align 2
-gTileset_82D4F44::
+gTileset_RestaurantHotel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82931F0
-	.4byte gTilesetPalettes_8293660
-	.4byte gMetatiles_82C75C4
+	.4byte gTilesetTiles_RestaurantHotel
+	.4byte gTilesetPalettes_RestaurantHotel
+	.4byte gMetatiles_RestaurantHotel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C7C44
+	.4byte gMetatileAttributes_RestaurantHotel
 
 	.align 2
-gTileset_82D4F5C::
+gTileset_School::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293860
-	.4byte gTilesetPalettes_8293B0C
-	.4byte gMetatiles_82C7DE4
+	.4byte gTilesetTiles_School
+	.4byte gTilesetPalettes_School
+	.4byte gMetatiles_School
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C80C4
+	.4byte gMetatileAttributes_School
 
 	.align 2
-gTileset_82D4F74::
+gTileset_FanClubDaycare::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293D0C
-	.4byte gTilesetPalettes_8294144
-	.4byte gMetatiles_82C817C
+	.4byte gTilesetTiles_FanClubDaycare
+	.4byte gTilesetPalettes_FanClubDaycare
+	.4byte gMetatiles_FanClubDaycare
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C8C1C
+	.4byte gMetatileAttributes_FanClubDaycare
 
 	.align 2
-gTileset_82D4F8C::
+gTileset_Condominiums::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C8EC4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_Condominiums
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C9C34
+	.4byte gMetatileAttributes_Condominiums
 
 	.align 2
-gTileset_82D4FA4::
+gTileset_BurgledHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294344
-	.4byte gTilesetPalettes_8294D08
-	.4byte gMetatiles_82C9F90
+	.4byte gTilesetTiles_BurgledHouse
+	.4byte gTilesetPalettes_BurgledHouse
+	.4byte gMetatiles_BurgledHouse
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA320
+	.4byte gMetatileAttributes_BurgledHouse
 
 	.align 2
-gTileset_82D4FBC::
+gTileset_Dummy3::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294F08
-	.4byte gTilesetPalettes_8294F18
-	.4byte gMetatiles_82CA404
+	.4byte gTilesetTiles_Dummy3
+	.4byte gTilesetPalettes_Dummy3
+	.4byte gMetatiles_Dummy3
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA424
+	.4byte gMetatileAttributes_Dummy3
 
 	.align 2
-gTileset_82D4FD4::
+gTileset_Dummy4::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8295118
-	.4byte gTilesetPalettes_829512C
-	.4byte gMetatiles_82CA42C
+	.4byte gTilesetTiles_Dummy4
+	.4byte gTilesetPalettes_Dummy4
+	.4byte gMetatiles_Dummy4
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA44C
+	.4byte gMetatileAttributes_Dummy4
 
 	.align 2
-gTileset_82D4FEC::
+gTileset_MtEmber::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829532C
-	.4byte gTilesetPalettes_82967D4
-	.4byte gMetatiles_82CA454
-	.4byte sub_80702B4
-	.4byte gMetatileAttributes_82CB274
+	.4byte gTilesetTiles_MtEmber
+	.4byte gTilesetPalettes_MtEmber
+	.4byte gMetatiles_MtEmber
+	.4byte InitTilesetAnim_MtEmber
+	.4byte gMetatileAttributes_MtEmber
 
 	.align 2
-gTileset_82D5004::
+gTileset_BerryForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82969D4
-	.4byte gTilesetPalettes_8296E90
-	.4byte gMetatiles_82CB5FC
+	.4byte gTilesetTiles_BerryForest
+	.4byte gTilesetPalettes_BerryForest
+	.4byte gMetatiles_BerryForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CB89C
+	.4byte gMetatileAttributes_BerryForest
 
 	.align 2
-gTileset_82D501C::
+gTileset_NavelRock::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8297090
-	.4byte gTilesetPalettes_82983BC
-	.4byte gMetatiles_82CB944
+	.4byte gTilesetTiles_NavelRock
+	.4byte gTilesetPalettes_NavelRock
+	.4byte gMetatiles_NavelRock
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CC704
+	.4byte gMetatileAttributes_NavelRock
 
 	.align 2
-gTileset_82D5034::
+gTileset_TanobyRuins::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82985BC
-	.4byte gTilesetPalettes_8298970
-	.4byte gMetatiles_82CCA74
+	.4byte gTilesetTiles_TanobyRuins
+	.4byte gTilesetPalettes_TanobyRuins
+	.4byte gMetatiles_TanobyRuins
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CD054
+	.4byte gMetatileAttributes_TanobyRuins
 
 	.align 2
-gTileset_82D504C::
+gTileset_SeviiIslands123::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8298B70
-	.4byte gTilesetPalettes_8299AA4
-	.4byte gMetatiles_82CD1CC
+	.4byte gTilesetTiles_SeviiIslands123
+	.4byte gTilesetPalettes_SeviiIslands123
+	.4byte gMetatiles_SeviiIslands123
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CE39C
+	.4byte gMetatileAttributes_SeviiIslands123
 
 	.align 2
-gTileset_82D5064::
+gTileset_SeviiIslands45::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8299CA4
-	.4byte gTilesetPalettes_829AB04
-	.4byte gMetatiles_82CE810
+	.4byte gTilesetTiles_SeviiIslands45
+	.4byte gTilesetPalettes_SeviiIslands45
+	.4byte gMetatiles_SeviiIslands45
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CF190
+	.4byte gMetatileAttributes_SeviiIslands45
 
 	.align 2
-gTileset_82D507C::
+gTileset_SeviiIslands67::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829AD04
-	.4byte gTilesetPalettes_829BD64
-	.4byte gMetatiles_82CF3F0
+	.4byte gTilesetTiles_SeviiIslands67
+	.4byte gTilesetPalettes_SeviiIslands67
+	.4byte gMetatiles_SeviiIslands67
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D02F0
+	.4byte gMetatileAttributes_SeviiIslands67
 
 	.align 2
-gTileset_82D5094::
+gTileset_TrainerTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829BF64
-	.4byte gTilesetPalettes_829CEE4
-	.4byte gMetatiles_82D06B0
+	.4byte gTilesetTiles_TrainerTower
+	.4byte gTilesetPalettes_TrainerTower
+	.4byte gMetatiles_TrainerTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D18B0
+	.4byte gMetatileAttributes_TrainerTower
 
 	.align 2
-gTileset_82D50AC::
+gTileset_IslandHarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829D0E4
-	.4byte gTilesetPalettes_829D894
-	.4byte gMetatiles_82D1D30
+	.4byte gTilesetTiles_IslandHarbor
+	.4byte gTilesetPalettes_IslandHarbor
+	.4byte gMetatiles_IslandHarbor
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D2220
+	.4byte gMetatileAttributes_IslandHarbor
 
 	.align 2
-gTileset_82D50C4::
+gTileset_PokemonLeague::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829DA94
-	.4byte gTilesetPalettes_829EA50
-	.4byte gMetatiles_82D235C
+	.4byte gTilesetTiles_PokemonLeague
+	.4byte gTilesetPalettes_PokemonLeague
+	.4byte gMetatiles_PokemonLeague
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D3B5C
+	.4byte gMetatileAttributes_PokemonLeague
 
 	.align 2
-gTileset_82D50DC::
+gTileset_HallOfFame::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829EC50
-	.4byte gTilesetPalettes_829F4C8
-	.4byte gMetatiles_82D415C
+	.4byte gTilesetTiles_HallOfFame
+	.4byte gTilesetPalettes_HallOfFame
+	.4byte gMetatiles_HallOfFame
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D48BC
+	.4byte gMetatileAttributes_HallOfFame
 
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index 50c849648..7475f8117 100644
--- a/data/tilesets/metatiles.inc
+++ b/data/tilesets/metatiles.inc
@@ -1,543 +1,543 @@
 	.align 1
-gMetatiles_829F6C8:: @ 829F6C8
-	.incbin "data/tilesets/primary/82D4A94/metatiles.bin"
+gMetatiles_General:: @ 829F6C8
+	.incbin "data/tilesets/primary/general/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A1EC8:: @ 82A1EC8
-	.incbin "data/tilesets/primary/82D4A94/metatile_attributes.bin"
+gMetatileAttributes_General:: @ 82A1EC8
+	.incbin "data/tilesets/primary/general/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A28C8:: @ 82A28C8
-	.incbin "data/tilesets/secondary/82D4AAC/metatiles.bin"
+gMetatiles_PalletTown:: @ 82A28C8
+	.incbin "data/tilesets/secondary/pallet_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A2E58:: @ 82A2E58
-	.incbin "data/tilesets/secondary/82D4AAC/metatile_attributes.bin"
+gMetatileAttributes_PalletTown:: @ 82A2E58
+	.incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A2FBC:: @ 82A2FBC
-	.incbin "data/tilesets/secondary/82D4AC4/metatiles.bin"
+gMetatiles_ViridianCity:: @ 82A2FBC
+	.incbin "data/tilesets/secondary/viridian_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A35AC:: @ 82A35AC
-	.incbin "data/tilesets/secondary/82D4AC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianCity:: @ 82A35AC
+	.incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3728:: @ 82A3728
-	.incbin "data/tilesets/secondary/82D4ADC/metatiles.bin"
+gMetatiles_PewterCity:: @ 82A3728
+	.incbin "data/tilesets/secondary/pewter_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A3C18:: @ 82A3C18
-	.incbin "data/tilesets/secondary/82D4ADC/metatile_attributes.bin"
+gMetatileAttributes_PewterCity:: @ 82A3C18
+	.incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3D54:: @ 82A3D54
-	.incbin "data/tilesets/secondary/82D4AF4/metatiles.bin"
+gMetatiles_CeruleanCity:: @ 82A3D54
+	.incbin "data/tilesets/secondary/cerulean_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A45B4:: @ 82A45B4
-	.incbin "data/tilesets/secondary/82D4AF4/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCity:: @ 82A45B4
+	.incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A47CC:: @ 82A47CC
-	.incbin "data/tilesets/secondary/82D4B0C/metatiles.bin"
+gMetatiles_LavenderTown:: @ 82A47CC
+	.incbin "data/tilesets/secondary/lavender_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A556C:: @ 82A556C
-	.incbin "data/tilesets/secondary/82D4B0C/metatile_attributes.bin"
+gMetatileAttributes_LavenderTown:: @ 82A556C
+	.incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A58D4:: @ 82A58D4
-	.incbin "data/tilesets/secondary/82D4B24/metatiles.bin"
+gMetatiles_VermilionCity:: @ 82A58D4
+	.incbin "data/tilesets/secondary/vermilion_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A6354:: @ 82A6354
-	.incbin "data/tilesets/secondary/82D4B24/metatile_attributes.bin"
+gMetatileAttributes_VermilionCity:: @ 82A6354
+	.incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A65F4:: @ 82A65F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatiles.bin"
+gMetatiles_CeladonCity:: @ 82A65F4
+	.incbin "data/tilesets/secondary/celadon_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A74F4:: @ 82A74F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatile_attributes.bin"
+gMetatileAttributes_CeladonCity:: @ 82A74F4
+	.incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A78B4:: @ 82A78B4
-	.incbin "data/tilesets/secondary/82D4B54/metatiles.bin"
+gMetatiles_FuchsiaCity:: @ 82A78B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A84B4:: @ 82A84B4
-	.incbin "data/tilesets/secondary/82D4B54/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaCity:: @ 82A84B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A87B4:: @ 82A87B4
-	.incbin "data/tilesets/secondary/82D4B6C/metatiles.bin"
+gMetatiles_CinnabarIsland:: @ 82A87B4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A8BB4:: @ 82A8BB4
-	.incbin "data/tilesets/secondary/82D4B6C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarIsland:: @ 82A8BB4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A8CB4:: @ 82A8CB4
-	.incbin "data/tilesets/secondary/82D4B84/metatiles.bin"
+gMetatiles_IndigoPlateau:: @ 82A8CB4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A97B4:: @ 82A97B4
-	.incbin "data/tilesets/secondary/82D4B84/metatile_attributes.bin"
+gMetatileAttributes_IndigoPlateau:: @ 82A97B4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A9A74:: @ 82A9A74
-	.incbin "data/tilesets/secondary/82D4B9C/metatiles.bin"
+gMetatiles_SaffronCity:: @ 82A9A74
+	.incbin "data/tilesets/secondary/saffron_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AA6F4:: @ 82AA6F4
-	.incbin "data/tilesets/secondary/82D4B9C/metatile_attributes.bin"
+gMetatileAttributes_SaffronCity:: @ 82AA6F4
+	.incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AAA14:: @ 82AAA14
-	.incbin "data/tilesets/secondary/82D4D04/metatiles.bin"
+gMetatiles_PewterGym:: @ 82AAA14
+	.incbin "data/tilesets/secondary/pewter_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB064:: @ 82AB064
-	.incbin "data/tilesets/secondary/82D4D04/metatile_attributes.bin"
+gMetatileAttributes_PewterGym:: @ 82AB064
+	.incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB1F8:: @ 82AB1F8
-	.incbin "data/tilesets/secondary/82D4D1C/metatiles.bin"
+gMetatiles_CeruleanGym:: @ 82AB1F8
+	.incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB738:: @ 82AB738
-	.incbin "data/tilesets/secondary/82D4D1C/metatile_attributes.bin"
+gMetatileAttributes_CeruleanGym:: @ 82AB738
+	.incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB888:: @ 82AB888
-	.incbin "data/tilesets/secondary/82D4D34/metatiles.bin"
+gMetatiles_VermilionGym:: @ 82AB888
+	.incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ABD38:: @ 82ABD38
-	.incbin "data/tilesets/secondary/82D4D34/metatile_attributes.bin"
+gMetatileAttributes_VermilionGym:: @ 82ABD38
+	.incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82ABE64:: @ 82ABE64
-	.incbin "data/tilesets/secondary/82D4D4C/metatiles.bin"
+gMetatiles_CeladonGym:: @ 82ABE64
+	.incbin "data/tilesets/secondary/celadon_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC264:: @ 82AC264
-	.incbin "data/tilesets/secondary/82D4D4C/metatile_attributes.bin"
+gMetatileAttributes_CeladonGym:: @ 82AC264
+	.incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC364:: @ 82AC364
-	.incbin "data/tilesets/secondary/82D4CA4/metatiles.bin"
+gMetatiles_FuchsiaGym:: @ 82AC364
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC584:: @ 82AC584
-	.incbin "data/tilesets/secondary/82D4CA4/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaGym:: @ 82AC584
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC60C:: @ 82AC60C
-	.incbin "data/tilesets/secondary/82D4D64/metatiles.bin"
+gMetatiles_SaffronGym:: @ 82AC60C
+	.incbin "data/tilesets/secondary/saffron_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC8EC:: @ 82AC8EC
-	.incbin "data/tilesets/secondary/82D4D64/metatile_attributes.bin"
+gMetatileAttributes_SaffronGym:: @ 82AC8EC
+	.incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC9A4:: @ 82AC9A4
-	.incbin "data/tilesets/secondary/82D4D7C/metatiles.bin"
+gMetatiles_CinnabarGym:: @ 82AC9A4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ACFA4:: @ 82ACFA4
-	.incbin "data/tilesets/secondary/82D4D7C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarGym:: @ 82ACFA4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD124:: @ 82AD124
-	.incbin "data/tilesets/secondary/82D4CBC/metatiles.bin"
+gMetatiles_ViridianGym:: @ 82AD124
+	.incbin "data/tilesets/secondary/viridian_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AD664:: @ 82AD664
-	.incbin "data/tilesets/secondary/82D4CBC/metatile_attributes.bin"
+gMetatileAttributes_ViridianGym:: @ 82AD664
+	.incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD7B4:: @ 82AD7B4
-	.incbin "data/tilesets/primary/82D4BB4/metatiles.bin"
+gMetatiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AFFB4:: @ 82AFFB4
-	.incbin "data/tilesets/primary/82D4BB4/metatile_attributes.bin"
+gMetatileAttributes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09B4:: @ 82B09B4
-	.incbin "data/tilesets/secondary/82D4C14/metatiles.bin"
+gMetatiles_Dummy1:: @ 82B09B4
+	.incbin "data/tilesets/secondary/dummy1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B09D4:: @ 82B09D4
-	.incbin "data/tilesets/secondary/82D4C14/metatile_attributes.bin"
+gMetatileAttributes_Dummy1:: @ 82B09D4
+	.incbin "data/tilesets/secondary/dummy1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09DC:: @ 82B09DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatiles.bin"
+gMetatiles_HoennBuilding:: @ 82B09DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B29DC:: @ 82B29DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatile_attributes.bin"
+gMetatileAttributes_HoennBuilding:: @ 82B29DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B31DC:: @ 82B31DC
-	.incbin "data/tilesets/secondary/82D4C5C/metatiles.bin"
+gMetatiles_BikeShop:: @ 82B31DC
+	.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B347C:: @ 82B347C
-	.incbin "data/tilesets/secondary/82D4C5C/metatile_attributes.bin"
+gMetatileAttributes_BikeShop:: @ 82B347C
+	.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3524:: @ 82B3524
-	.incbin "data/tilesets/secondary/82D4BCC/metatiles.bin"
+gMetatiles_Mart:: @ 82B3524
+	.incbin "data/tilesets/secondary/mart/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B3954:: @ 82B3954
-	.incbin "data/tilesets/secondary/82D4BCC/metatile_attributes.bin"
+gMetatileAttributes_Mart:: @ 82B3954
+	.incbin "data/tilesets/secondary/mart/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3A60:: @ 82B3A60
-	.incbin "data/tilesets/secondary/82D4BE4/metatiles.bin"
+gMetatiles_PokemonCenter:: @ 82B3A60
+	.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4A50:: @ 82B4A50
-	.incbin "data/tilesets/secondary/82D4BE4/metatile_attributes.bin"
+gMetatileAttributes_PokemonCenter:: @ 82B4A50
+	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B4E4C:: @ 82B4E4C
-	.incbin "data/tilesets/secondary/82D4C74/metatiles.bin"
+gMetatiles_GenericBuilding1:: @ 82B4E4C
+	.incbin "data/tilesets/secondary/generic_building1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4FCC:: @ 82B4FCC
-	.incbin "data/tilesets/secondary/82D4C74/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding1:: @ 82B4FCC
+	.incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B502C:: @ 82B502C
-	.incbin "data/tilesets/secondary/82D4BFC/metatiles.bin"
+gMetatiles_Cave:: @ 82B502C
+	.incbin "data/tilesets/secondary/cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B5A3C:: @ 82B5A3C
-	.incbin "data/tilesets/secondary/82D4BFC/metatile_attributes.bin"
+gMetatileAttributes_Cave:: @ 82B5A3C
+	.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B5CC0:: @ 82B5CC0
-	.incbin "data/tilesets/secondary/82D4CEC/metatiles.bin"
+gMetatiles_GameCorner:: @ 82B5CC0
+	.incbin "data/tilesets/secondary/game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B6640:: @ 82B6640
-	.incbin "data/tilesets/secondary/82D4CEC/metatile_attributes.bin"
+gMetatileAttributes_GameCorner:: @ 82B6640
+	.incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B68A0:: @ 82B68A0
-	.incbin "data/tilesets/secondary/82D4C8C/metatiles.bin"
+gMetatiles_Lab:: @ 82B68A0
+	.incbin "data/tilesets/secondary/lab/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B7390:: @ 82B7390
-	.incbin "data/tilesets/secondary/82D4C8C/metatile_attributes.bin"
+gMetatileAttributes_Lab:: @ 82B7390
+	.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B764C:: @ 82B764C
-	.incbin "data/tilesets/secondary/82D4D94/metatiles.bin"
+gMetatiles_SSAnne:: @ 82B764C
+	.incbin "data/tilesets/secondary/ss_anne/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B8B4C:: @ 82B8B4C
-	.incbin "data/tilesets/secondary/82D4D94/metatile_attributes.bin"
+gMetatileAttributes_SSAnne:: @ 82B8B4C
+	.incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B908C:: @ 82B908C
-	.incbin "data/tilesets/secondary/82D4DAC/metatiles.bin"
+gMetatiles_Dummy2:: @ 82B908C
+	.incbin "data/tilesets/secondary/dummy2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B90AC:: @ 82B90AC
-	.incbin "data/tilesets/secondary/82D4DAC/metatile_attributes.bin"
+gMetatileAttributes_Dummy2:: @ 82B90AC
+	.incbin "data/tilesets/secondary/dummy2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B90B4:: @ 82B90B4
-	.incbin "data/tilesets/secondary/82D4DC4/metatiles.bin"
+gMetatiles_ViridianForest:: @ 82B90B4
+	.incbin "data/tilesets/secondary/viridian_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9364:: @ 82B9364
-	.incbin "data/tilesets/secondary/82D4DC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianForest:: @ 82B9364
+	.incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9410:: @ 82B9410
-	.incbin "data/tilesets/secondary/82D4DDC/metatiles.bin"
+gMetatiles_UnusedGatehouse1:: @ 82B9410
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9B30:: @ 82B9B30
-	.incbin "data/tilesets/secondary/82D4DDC/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9CF8:: @ 82B9CF8
-	.incbin "data/tilesets/secondary/82D4DF4/metatiles.bin"
+gMetatiles_RockTunnel:: @ 82B9CF8
+	.incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BA678:: @ 82BA678
-	.incbin "data/tilesets/secondary/82D4DF4/metatile_attributes.bin"
+gMetatileAttributes_RockTunnel:: @ 82BA678
+	.incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BA8D8:: @ 82BA8D8
-	.incbin "data/tilesets/secondary/82D4E0C/metatiles.bin"
+gMetatiles_DiglettsCave:: @ 82BA8D8
+	.incbin "data/tilesets/secondary/digletts_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BB2A8:: @ 82BB2A8
-	.incbin "data/tilesets/secondary/82D4E0C/metatile_attributes.bin"
+gMetatileAttributes_DiglettsCave:: @ 82BB2A8
+	.incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BB51C:: @ 82BB51C
-	.incbin "data/tilesets/secondary/82D4E24/metatiles.bin"
+gMetatiles_SeafoamIslands:: @ 82BB51C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BC49C:: @ 82BC49C
-	.incbin "data/tilesets/secondary/82D4E24/metatile_attributes.bin"
+gMetatileAttributes_SeafoamIslands:: @ 82BC49C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BC87C:: @ 82BC87C
-	.incbin "data/tilesets/secondary/82D4E3C/metatiles.bin"
+gMetatiles_UnusedGatehouse2:: @ 82BC87C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BCF9C:: @ 82BCF9C
-	.incbin "data/tilesets/secondary/82D4E3C/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BD164:: @ 82BD164
-	.incbin "data/tilesets/secondary/82D4E54/metatiles.bin"
+gMetatiles_CeruleanCave:: @ 82BD164
+	.incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BD9C4:: @ 82BD9C4
-	.incbin "data/tilesets/secondary/82D4E54/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCave:: @ 82BD9C4
+	.incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BDBDC:: @ 82BDBDC
-	.incbin "data/tilesets/secondary/82D4E6C/metatiles.bin"
+gMetatiles_DepartmentStore:: @ 82BDBDC
+	.incbin "data/tilesets/secondary/department_store/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BEB3C:: @ 82BEB3C
-	.incbin "data/tilesets/secondary/82D4E6C/metatile_attributes.bin"
+gMetatileAttributes_DepartmentStore:: @ 82BEB3C
+	.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BEF14:: @ 82BEF14
-	.incbin "data/tilesets/secondary/82D4E84/metatiles.bin"
+gMetatiles_GenericBuilding2:: @ 82BEF14
+	.incbin "data/tilesets/secondary/generic_building2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BFA94:: @ 82BFA94
-	.incbin "data/tilesets/secondary/82D4E84/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding2:: @ 82BFA94
+	.incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BFD74:: @ 82BFD74
-	.incbin "data/tilesets/secondary/82D4E9C/metatiles.bin"
+gMetatiles_PowerPlant:: @ 82BFD74
+	.incbin "data/tilesets/secondary/power_plant/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0704:: @ 82C0704
-	.incbin "data/tilesets/secondary/82D4E9C/metatile_attributes.bin"
+gMetatileAttributes_PowerPlant:: @ 82C0704
+	.incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0968:: @ 82C0968
-	.incbin "data/tilesets/secondary/82D4EB4/metatiles.bin"
+gMetatiles_SeaCottage:: @ 82C0968
+	.incbin "data/tilesets/secondary/sea_cottage/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0D18:: @ 82C0D18
-	.incbin "data/tilesets/secondary/82D4EB4/metatile_attributes.bin"
+gMetatileAttributes_SeaCottage:: @ 82C0D18
+	.incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0E04:: @ 82C0E04
-	.incbin "data/tilesets/secondary/82D4ECC/metatiles.bin"
+gMetatiles_SilphCo:: @ 82C0E04
+	.incbin "data/tilesets/secondary/silph_co/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C25A4:: @ 82C25A4
-	.incbin "data/tilesets/secondary/82D4ECC/metatile_attributes.bin"
+gMetatileAttributes_SilphCo:: @ 82C25A4
+	.incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C2B8C:: @ 82C2B8C
-	.incbin "data/tilesets/secondary/82D4EE4/metatiles.bin"
+gMetatiles_UndergroundPath:: @ 82C2B8C
+	.incbin "data/tilesets/secondary/underground_path/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C300C:: @ 82C300C
-	.incbin "data/tilesets/secondary/82D4EE4/metatile_attributes.bin"
+gMetatileAttributes_UndergroundPath:: @ 82C300C
+	.incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C312C:: @ 82C312C
-	.incbin "data/tilesets/secondary/82D4EFC/metatiles.bin"
+gMetatiles_PokemonTower:: @ 82C312C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C377C:: @ 82C377C
-	.incbin "data/tilesets/secondary/82D4EFC/metatile_attributes.bin"
+gMetatileAttributes_PokemonTower:: @ 82C377C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C3910:: @ 82C3910
-	.incbin "data/tilesets/secondary/82D4F14/metatiles.bin"
+gMetatiles_SafariZoneBuilding:: @ 82C3910
+	.incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C4110:: @ 82C4110
-	.incbin "data/tilesets/secondary/82D4F14/metatile_attributes.bin"
+gMetatileAttributes_SafariZoneBuilding:: @ 82C4110
+	.incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C4310:: @ 82C4310
-	.incbin "data/tilesets/secondary/82D4F2C/metatiles.bin"
+gMetatiles_PokemonMansion:: @ 82C4310
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5330:: @ 82C5330
-	.incbin "data/tilesets/secondary/82D4F2C/metatile_attributes.bin"
+gMetatileAttributes_PokemonMansion:: @ 82C5330
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C5738:: @ 82C5738
-	.incbin "data/tilesets/secondary/82D4C2C/metatiles.bin"
+gMetatiles_Museum:: @ 82C5738
+	.incbin "data/tilesets/secondary/museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5FA8:: @ 82C5FA8
-	.incbin "data/tilesets/secondary/82D4C2C/metatile_attributes.bin"
+gMetatileAttributes_Museum:: @ 82C5FA8
+	.incbin "data/tilesets/secondary/museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C61C4:: @ 82C61C4
-	.incbin "data/tilesets/secondary/82D4C44/metatiles.bin"
+gMetatiles_CableClub:: @ 82C61C4
+	.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C71C4:: @ 82C71C4
-	.incbin "data/tilesets/secondary/82D4C44/metatile_attributes.bin"
+gMetatileAttributes_CableClub:: @ 82C71C4
+	.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C75C4:: @ 82C75C4
-	.incbin "data/tilesets/secondary/82D4F44/metatiles.bin"
+gMetatiles_RestaurantHotel:: @ 82C75C4
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C7C44:: @ 82C7C44
-	.incbin "data/tilesets/secondary/82D4F44/metatile_attributes.bin"
+gMetatileAttributes_RestaurantHotel:: @ 82C7C44
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C7DE4:: @ 82C7DE4
-	.incbin "data/tilesets/secondary/82D4F5C/metatiles.bin"
+gMetatiles_School:: @ 82C7DE4
+	.incbin "data/tilesets/secondary/school/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C80C4:: @ 82C80C4
-	.incbin "data/tilesets/secondary/82D4F5C/metatile_attributes.bin"
+gMetatileAttributes_School:: @ 82C80C4
+	.incbin "data/tilesets/secondary/school/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C817C:: @ 82C817C
-	.incbin "data/tilesets/secondary/82D4F74/metatiles.bin"
+gMetatiles_FanClubDaycare:: @ 82C817C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C8C1C:: @ 82C8C1C
-	.incbin "data/tilesets/secondary/82D4F74/metatile_attributes.bin"
+gMetatileAttributes_FanClubDaycare:: @ 82C8C1C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C8EC4:: @ 82C8EC4
-	.incbin "data/tilesets/secondary/82D4F8C/metatiles.bin"
+gMetatiles_Condominiums:: @ 82C8EC4
+	.incbin "data/tilesets/secondary/condominiums/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C9C34:: @ 82C9C34
-	.incbin "data/tilesets/secondary/82D4F8C/metatile_attributes.bin"
+gMetatileAttributes_Condominiums:: @ 82C9C34
+	.incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C9F90:: @ 82C9F90
-	.incbin "data/tilesets/secondary/82D4FA4/metatiles.bin"
+gMetatiles_BurgledHouse:: @ 82C9F90
+	.incbin "data/tilesets/secondary/burgled_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA320:: @ 82CA320
-	.incbin "data/tilesets/secondary/82D4FA4/metatile_attributes.bin"
+gMetatileAttributes_BurgledHouse:: @ 82CA320
+	.incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA404:: @ 82CA404
-	.incbin "data/tilesets/secondary/82D4FBC/metatiles.bin"
+gMetatiles_Dummy3:: @ 82CA404
+	.incbin "data/tilesets/secondary/dummy3/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA424:: @ 82CA424
-	.incbin "data/tilesets/secondary/82D4FBC/metatile_attributes.bin"
+gMetatileAttributes_Dummy3:: @ 82CA424
+	.incbin "data/tilesets/secondary/dummy3/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA42C:: @ 82CA42C
-	.incbin "data/tilesets/secondary/82D4FD4/metatiles.bin"
+gMetatiles_Dummy4:: @ 82CA42C
+	.incbin "data/tilesets/secondary/dummy4/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA44C:: @ 82CA44C
-	.incbin "data/tilesets/secondary/82D4FD4/metatile_attributes.bin"
+gMetatileAttributes_Dummy4:: @ 82CA44C
+	.incbin "data/tilesets/secondary/dummy4/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA454:: @ 82CA454
-	.incbin "data/tilesets/secondary/82D4FEC/metatiles.bin"
+gMetatiles_MtEmber:: @ 82CA454
+	.incbin "data/tilesets/secondary/mt_ember/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB274:: @ 82CB274
-	.incbin "data/tilesets/secondary/82D4FEC/metatile_attributes.bin"
+gMetatileAttributes_MtEmber:: @ 82CB274
+	.incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB5FC:: @ 82CB5FC
-	.incbin "data/tilesets/secondary/82D5004/metatiles.bin"
+gMetatiles_BerryForest:: @ 82CB5FC
+	.incbin "data/tilesets/secondary/berry_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB89C:: @ 82CB89C
-	.incbin "data/tilesets/secondary/82D5004/metatile_attributes.bin"
+gMetatileAttributes_BerryForest:: @ 82CB89C
+	.incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB944:: @ 82CB944
-	.incbin "data/tilesets/secondary/82D501C/metatiles.bin"
+gMetatiles_NavelRock:: @ 82CB944
+	.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CC704:: @ 82CC704
-	.incbin "data/tilesets/secondary/82D501C/metatile_attributes.bin"
+gMetatileAttributes_NavelRock:: @ 82CC704
+	.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CCA74:: @ 82CCA74
-	.incbin "data/tilesets/secondary/82D5034/metatiles.bin"
+gMetatiles_TanobyRuins:: @ 82CCA74
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CD054:: @ 82CD054
-	.incbin "data/tilesets/secondary/82D5034/metatile_attributes.bin"
+gMetatileAttributes_TanobyRuins:: @ 82CD054
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CD1CC:: @ 82CD1CC
-	.incbin "data/tilesets/secondary/82D504C/metatiles.bin"
+gMetatiles_SeviiIslands123:: @ 82CD1CC
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CE39C:: @ 82CE39C
-	.incbin "data/tilesets/secondary/82D504C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands123:: @ 82CE39C
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CE810:: @ 82CE810
-	.incbin "data/tilesets/secondary/82D5064/metatiles.bin"
+gMetatiles_SeviiIslands45:: @ 82CE810
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CF190:: @ 82CF190
-	.incbin "data/tilesets/secondary/82D5064/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands45:: @ 82CF190
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CF3F0:: @ 82CF3F0
-	.incbin "data/tilesets/secondary/82D507C/metatiles.bin"
+gMetatiles_SeviiIslands67:: @ 82CF3F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D02F0:: @ 82D02F0
-	.incbin "data/tilesets/secondary/82D507C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands67:: @ 82D02F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D06B0:: @ 82D06B0
-	.incbin "data/tilesets/secondary/82D5094/metatiles.bin"
+gMetatiles_TrainerTower:: @ 82D06B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D18B0:: @ 82D18B0
-	.incbin "data/tilesets/secondary/82D5094/metatile_attributes.bin"
+gMetatileAttributes_TrainerTower:: @ 82D18B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D1D30:: @ 82D1D30
-	.incbin "data/tilesets/secondary/82D50AC/metatiles.bin"
+gMetatiles_IslandHarbor:: @ 82D1D30
+	.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D2220:: @ 82D2220
-	.incbin "data/tilesets/secondary/82D50AC/metatile_attributes.bin"
+gMetatileAttributes_IslandHarbor:: @ 82D2220
+	.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D235C:: @ 82D235C
-	.incbin "data/tilesets/secondary/82D50C4/metatiles.bin"
+gMetatiles_PokemonLeague:: @ 82D235C
+	.incbin "data/tilesets/secondary/pokemon_league/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D3B5C:: @ 82D3B5C
-	.incbin "data/tilesets/secondary/82D50C4/metatile_attributes.bin"
+gMetatileAttributes_PokemonLeague:: @ 82D3B5C
+	.incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D415C:: @ 82D415C
-	.incbin "data/tilesets/secondary/82D50DC/metatiles.bin"
+gMetatiles_HallOfFame:: @ 82D415C
+	.incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D48BC:: @ 82D48BC
-	.incbin "data/tilesets/secondary/82D50DC/metatile_attributes.bin"
+gMetatileAttributes_HallOfFame:: @ 82D48BC
+	.incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin"
diff --git a/data/tilesets/primary/82D4BB4/metatile_attributes.bin b/data/tilesets/primary/building/metatile_attributes.bin
index 3dbc31883..3dbc31883 100644
--- a/data/tilesets/primary/82D4BB4/metatile_attributes.bin
+++ b/data/tilesets/primary/building/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4BB4/metatiles.bin b/data/tilesets/primary/building/metatiles.bin
index 024797c8e..024797c8e 100644
--- a/data/tilesets/primary/82D4BB4/metatiles.bin
+++ b/data/tilesets/primary/building/metatiles.bin
diff --git a/data/tilesets/primary/82D4BB4/palettes/0.pal b/data/tilesets/primary/building/palettes/0.pal
index 3b6416376..3b6416376 100644
--- a/data/tilesets/primary/82D4BB4/palettes/0.pal
+++ b/data/tilesets/primary/building/palettes/0.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/1.pal b/data/tilesets/primary/building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/primary/82D4BB4/palettes/1.pal
+++ b/data/tilesets/primary/building/palettes/1.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/10.pal b/data/tilesets/primary/building/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/10.pal
+++ b/data/tilesets/primary/building/palettes/10.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/11.pal b/data/tilesets/primary/building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/11.pal
+++ b/data/tilesets/primary/building/palettes/11.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/12.pal b/data/tilesets/primary/building/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/12.pal
+++ b/data/tilesets/primary/building/palettes/12.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/13.pal b/data/tilesets/primary/building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/13.pal
+++ b/data/tilesets/primary/building/palettes/13.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/14.pal b/data/tilesets/primary/building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/14.pal
+++ b/data/tilesets/primary/building/palettes/14.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/15.pal b/data/tilesets/primary/building/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/primary/82D4BB4/palettes/15.pal
+++ b/data/tilesets/primary/building/palettes/15.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/2.pal b/data/tilesets/primary/building/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/primary/82D4BB4/palettes/2.pal
+++ b/data/tilesets/primary/building/palettes/2.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/3.pal b/data/tilesets/primary/building/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/primary/82D4BB4/palettes/3.pal
+++ b/data/tilesets/primary/building/palettes/3.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/4.pal b/data/tilesets/primary/building/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/primary/82D4BB4/palettes/4.pal
+++ b/data/tilesets/primary/building/palettes/4.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/5.pal b/data/tilesets/primary/building/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/primary/82D4BB4/palettes/5.pal
+++ b/data/tilesets/primary/building/palettes/5.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/6.pal b/data/tilesets/primary/building/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/primary/82D4BB4/palettes/6.pal
+++ b/data/tilesets/primary/building/palettes/6.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/7.pal b/data/tilesets/primary/building/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/7.pal
+++ b/data/tilesets/primary/building/palettes/7.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/8.pal b/data/tilesets/primary/building/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/8.pal
+++ b/data/tilesets/primary/building/palettes/8.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/9.pal b/data/tilesets/primary/building/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/9.pal
+++ b/data/tilesets/primary/building/palettes/9.pal
diff --git a/data/tilesets/primary/82D4BB4/tiles.png b/data/tilesets/primary/building/tiles.png
index 8d864f27e..8d864f27e 100644
--- a/data/tilesets/primary/82D4BB4/tiles.png
+++ b/data/tilesets/primary/building/tiles.png
diff --git a/data/tilesets/primary/82D4A94/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin
index 45f6f352e..45f6f352e 100644
--- a/data/tilesets/primary/82D4A94/metatile_attributes.bin
+++ b/data/tilesets/primary/general/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4A94/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index 7a228eeae..7a228eeae 100644
--- a/data/tilesets/primary/82D4A94/metatiles.bin
+++ b/data/tilesets/primary/general/metatiles.bin
diff --git a/data/tilesets/primary/82D4A94/palettes/0.pal b/data/tilesets/primary/general/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/primary/82D4A94/palettes/0.pal
+++ b/data/tilesets/primary/general/palettes/0.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/1.pal b/data/tilesets/primary/general/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/primary/82D4A94/palettes/1.pal
+++ b/data/tilesets/primary/general/palettes/1.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/10.pal b/data/tilesets/primary/general/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/10.pal
+++ b/data/tilesets/primary/general/palettes/10.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/11.pal b/data/tilesets/primary/general/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/11.pal
+++ b/data/tilesets/primary/general/palettes/11.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/12.pal b/data/tilesets/primary/general/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/12.pal
+++ b/data/tilesets/primary/general/palettes/12.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/13.pal
+++ b/data/tilesets/primary/general/palettes/13.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/14.pal b/data/tilesets/primary/general/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/14.pal
+++ b/data/tilesets/primary/general/palettes/14.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/15.pal b/data/tilesets/primary/general/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/15.pal
+++ b/data/tilesets/primary/general/palettes/15.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/2.pal b/data/tilesets/primary/general/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/primary/82D4A94/palettes/2.pal
+++ b/data/tilesets/primary/general/palettes/2.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/3.pal b/data/tilesets/primary/general/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/primary/82D4A94/palettes/3.pal
+++ b/data/tilesets/primary/general/palettes/3.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/4.pal b/data/tilesets/primary/general/palettes/4.pal
index 9b094a6aa..9b094a6aa 100644
--- a/data/tilesets/primary/82D4A94/palettes/4.pal
+++ b/data/tilesets/primary/general/palettes/4.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/5.pal b/data/tilesets/primary/general/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/primary/82D4A94/palettes/5.pal
+++ b/data/tilesets/primary/general/palettes/5.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/6.pal b/data/tilesets/primary/general/palettes/6.pal
index cdf41b298..cdf41b298 100644
--- a/data/tilesets/primary/82D4A94/palettes/6.pal
+++ b/data/tilesets/primary/general/palettes/6.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/7.pal b/data/tilesets/primary/general/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/7.pal
+++ b/data/tilesets/primary/general/palettes/7.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/8.pal b/data/tilesets/primary/general/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/8.pal
+++ b/data/tilesets/primary/general/palettes/8.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/9.pal b/data/tilesets/primary/general/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/9.pal
+++ b/data/tilesets/primary/general/palettes/9.pal
diff --git a/data/tilesets/primary/82D4A94/tiles.png b/data/tilesets/primary/general/tiles.png
index 84ba7b2f9..84ba7b2f9 100644
--- a/data/tilesets/primary/82D4A94/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
index 6d6c6d544..6d6c6d544 100644
--- a/data/tilesets/secondary/82D5004/metatile_attributes.bin
+++ b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/berry_forest/metatiles.bin
index fb47747c4..fb47747c4 100644
--- a/data/tilesets/secondary/82D5004/metatiles.bin
+++ b/data/tilesets/secondary/berry_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/0.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/1.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/berry_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/10.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/berry_forest/palettes/11.pal
index 6fe747b2d..6fe747b2d 100644
--- a/data/tilesets/secondary/82D5004/palettes/11.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/berry_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/12.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/berry_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/13.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/berry_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/14.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/berry_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/15.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/2.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/3.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/4.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/5.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/6.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4B84/palettes/7.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/8.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/9.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/berry_forest/tiles.png
index dacbc0120..dacbc0120 100644
--- a/data/tilesets/secondary/82D5004/tiles.png
+++ b/data/tilesets/secondary/berry_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
index d1a4900c5..d1a4900c5 100644
--- a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/bike_shop/metatiles.bin
index f1c0ab02d..f1c0ab02d 100644
--- a/data/tilesets/secondary/82D4C5C/metatiles.bin
+++ b/data/tilesets/secondary/bike_shop/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/0.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/1.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/10.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/11.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/12.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/13.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/14.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/15.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/2.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/3.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/4.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/5.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/6.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal
index a71b8fee2..a71b8fee2 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/7.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal
index 0a666a9c9..0a666a9c9 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/8.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/9.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index 90124ff4a..90124ff4a 100644
--- a/data/tilesets/secondary/82D4C5C/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
index db0f7817e..db0f7817e 100644
--- a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/burgled_house/metatiles.bin
index dfe78c910..dfe78c910 100644
--- a/data/tilesets/secondary/82D4FA4/metatiles.bin
+++ b/data/tilesets/secondary/burgled_house/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/0.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4D04/palettes/1.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/burgled_house/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/10.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/burgled_house/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/11.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/burgled_house/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/12.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/burgled_house/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/13.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/burgled_house/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/14.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/burgled_house/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/15.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4D04/palettes/2.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4D04/palettes/3.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4D04/palettes/4.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4D04/palettes/5.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/6.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4C74/palettes/7.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/8.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/9.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/burgled_house/tiles.png
index 9fcf94314..9fcf94314 100644
--- a/data/tilesets/secondary/82D4FA4/tiles.png
+++ b/data/tilesets/secondary/burgled_house/tiles.png
diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/cable_club/metatile_attributes.bin
index 53505839d..53505839d 100644
--- a/data/tilesets/secondary/82D4C44/metatile_attributes.bin
+++ b/data/tilesets/secondary/cable_club/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/cable_club/metatiles.bin
index 0e2f2a6c3..0e2f2a6c3 100644
--- a/data/tilesets/secondary/82D4C44/metatiles.bin
+++ b/data/tilesets/secondary/cable_club/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/0.pal
+++ b/data/tilesets/secondary/cable_club/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/1.pal
+++ b/data/tilesets/secondary/cable_club/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal
index ab8f75e5a..ab8f75e5a 100644
--- a/data/tilesets/secondary/82D4C44/palettes/10.pal
+++ b/data/tilesets/secondary/cable_club/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal
index 468d7212c..468d7212c 100644
--- a/data/tilesets/secondary/82D4C44/palettes/11.pal
+++ b/data/tilesets/secondary/cable_club/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal
index 05794ac82..05794ac82 100644
--- a/data/tilesets/secondary/82D4C44/palettes/12.pal
+++ b/data/tilesets/secondary/cable_club/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/13.pal
+++ b/data/tilesets/secondary/cable_club/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/14.pal
+++ b/data/tilesets/secondary/cable_club/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/15.pal
+++ b/data/tilesets/secondary/cable_club/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/2.pal
+++ b/data/tilesets/secondary/cable_club/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/3.pal
+++ b/data/tilesets/secondary/cable_club/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/4.pal
+++ b/data/tilesets/secondary/cable_club/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/5.pal
+++ b/data/tilesets/secondary/cable_club/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/6.pal
+++ b/data/tilesets/secondary/cable_club/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal
index 00ca6903f..00ca6903f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/7.pal
+++ b/data/tilesets/secondary/cable_club/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal
index 43d6db90d..43d6db90d 100644
--- a/data/tilesets/secondary/82D4C44/palettes/8.pal
+++ b/data/tilesets/secondary/cable_club/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal
index 87857607f..87857607f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/9.pal
+++ b/data/tilesets/secondary/cable_club/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index f71f29432..f71f29432 100644
--- a/data/tilesets/secondary/82D4C44/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/cave/metatile_attributes.bin
index 510f0fdf1..510f0fdf1 100644
--- a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/cave/metatiles.bin
index 9f35adc11..9f35adc11 100644
--- a/data/tilesets/secondary/82D4BFC/metatiles.bin
+++ b/data/tilesets/secondary/cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/0.pal
+++ b/data/tilesets/secondary/cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4B24/palettes/1.pal
+++ b/data/tilesets/secondary/cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/10.pal
+++ b/data/tilesets/secondary/cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/11.pal
+++ b/data/tilesets/secondary/cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/12.pal
+++ b/data/tilesets/secondary/cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/13.pal
+++ b/data/tilesets/secondary/cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/14.pal
+++ b/data/tilesets/secondary/cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/15.pal
+++ b/data/tilesets/secondary/cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/2.pal
+++ b/data/tilesets/secondary/cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal
index ef7460f41..ef7460f41 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/3.pal
+++ b/data/tilesets/secondary/cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal
index e83c6b367..e83c6b367 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/4.pal
+++ b/data/tilesets/secondary/cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/5.pal
+++ b/data/tilesets/secondary/cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4B24/palettes/6.pal
+++ b/data/tilesets/secondary/cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/7.pal
+++ b/data/tilesets/secondary/cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal
index 1c8d33fac..1c8d33fac 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/8.pal
+++ b/data/tilesets/secondary/cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/9.pal
+++ b/data/tilesets/secondary/cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/cave/tiles.png
index 8e0f64a78..8e0f64a78 100644
--- a/data/tilesets/secondary/82D4BFC/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
index 5dd139155..5dd139155 100644
--- a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/celadon_city/metatiles.bin
index 3bfb9d239..3bfb9d239 100644
--- a/data/tilesets/secondary/82D4B3C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B54/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/celadon_city/palettes/10.pal
index 361b133e6..361b133e6 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/celadon_city/palettes/11.pal
index 00caf8dfc..00caf8dfc 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/celadon_city/palettes/12.pal
index 4257575ae..4257575ae 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/celadon_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/celadon_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/celadon_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal
index 86930c1d1..86930c1d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal
index 5dc82505a..5dc82505a 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/celadon_city/tiles.png
index db18cb938..db18cb938 100644
--- a/data/tilesets/secondary/82D4B3C/tiles.png
+++ b/data/tilesets/secondary/celadon_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
index def1ee695..def1ee695 100644
--- a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/celadon_gym/metatiles.bin
index f3f58a44d..f3f58a44d 100644
--- a/data/tilesets/secondary/82D4D4C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/celadon_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/celadon_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/celadon_gym/palettes/12.pal
index 041512724..041512724 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/celadon_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/celadon_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/celadon_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal
index 9d84ecaba..9d84ecaba 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal
index 085c49344..085c49344 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/celadon_gym/tiles.png
index ef08ccc83..ef08ccc83 100644
--- a/data/tilesets/secondary/82D4D4C/tiles.png
+++ b/data/tilesets/secondary/celadon_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
index 45b5bef90..45b5bef90 100644
--- a/data/tilesets/secondary/82D4E54/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/cerulean_cave/metatiles.bin
index 249addbc7..249addbc7 100644
--- a/data/tilesets/secondary/82D4E54/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
index eb9198b0a..eb9198b0a 100644
--- a/data/tilesets/secondary/82D4E54/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
index 9afe8750d..9afe8750d 100644
--- a/data/tilesets/secondary/82D4E54/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
index aced117f7..aced117f7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B54/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B54/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B24/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
index db2216a05..db2216a05 100644
--- a/data/tilesets/secondary/82D4E54/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
index c1a5d4f29..c1a5d4f29 100644
--- a/data/tilesets/secondary/82D4E54/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/cerulean_cave/tiles.png
index d53a0cf17..d53a0cf17 100644
--- a/data/tilesets/secondary/82D4E54/tiles.png
+++ b/data/tilesets/secondary/cerulean_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
index 7de4de077..7de4de077 100644
--- a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/cerulean_city/metatiles.bin
index b810e7996..b810e7996 100644
--- a/data/tilesets/secondary/82D4AF4/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal
index 31a636983..31a636983 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/cerulean_city/palettes/10.pal
index 536972f8f..536972f8f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/cerulean_city/palettes/11.pal
index 986335b74..986335b74 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/cerulean_city/palettes/12.pal
index c44bc32b5..c44bc32b5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/cerulean_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/cerulean_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/cerulean_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal
index ae3dd3f0d..ae3dd3f0d 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal
index 3ed18e08f..3ed18e08f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/cerulean_city/tiles.png
index 737d3dd7f..737d3dd7f 100644
--- a/data/tilesets/secondary/82D4AF4/tiles.png
+++ b/data/tilesets/secondary/cerulean_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
index 84b5e2049..84b5e2049 100644
--- a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/cerulean_gym/metatiles.bin
index c026eb65a..c026eb65a 100644
--- a/data/tilesets/secondary/82D4D1C/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
index 419c00911..419c00911 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
index aac016a72..aac016a72 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/cerulean_gym/tiles.png
index 44b7c0c34..44b7c0c34 100644
--- a/data/tilesets/secondary/82D4D1C/tiles.png
+++ b/data/tilesets/secondary/cerulean_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
index 1d68a40a4..1d68a40a4 100644
--- a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
index 7a5532619..7a5532619 100644
--- a/data/tilesets/secondary/82D4D7C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C74/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
index 3f9aa94d6..3f9aa94d6 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
index 5b659ef1b..5b659ef1b 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
index f5a4ee678..f5a4ee678 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/cinnabar_gym/tiles.png
index 213799158..213799158 100644
--- a/data/tilesets/secondary/82D4D7C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
index d2c655c41..d2c655c41 100644
--- a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/cinnabar_island/metatiles.bin
index 0abe4b18d..0abe4b18d 100644
--- a/data/tilesets/secondary/82D4B6C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B24/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B54/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
index f734cd166..f734cd166 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
index ca26d1b08..ca26d1b08 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/cinnabar_island/tiles.png
index ddb9ad0cb..ddb9ad0cb 100644
--- a/data/tilesets/secondary/82D4B6C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_island/tiles.png
diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/condominiums/metatile_attributes.bin
index aa43d15ee..aa43d15ee 100644
--- a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/condominiums/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/condominiums/metatiles.bin
index 117c036fa..117c036fa 100644
--- a/data/tilesets/secondary/82D4F8C/metatiles.bin
+++ b/data/tilesets/secondary/condominiums/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal
index 5867e5ba6..5867e5ba6 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/0.pal
+++ b/data/tilesets/secondary/condominiums/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/1.pal
+++ b/data/tilesets/secondary/condominiums/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/condominiums/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/10.pal
+++ b/data/tilesets/secondary/condominiums/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/condominiums/palettes/11.pal
index 79494336b..79494336b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/11.pal
+++ b/data/tilesets/secondary/condominiums/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/condominiums/palettes/12.pal
index b9b1e6061..b9b1e6061 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/12.pal
+++ b/data/tilesets/secondary/condominiums/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/condominiums/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/13.pal
+++ b/data/tilesets/secondary/condominiums/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/condominiums/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/14.pal
+++ b/data/tilesets/secondary/condominiums/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/condominiums/palettes/15.pal
index 093fbdd6c..093fbdd6c 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/15.pal
+++ b/data/tilesets/secondary/condominiums/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/2.pal
+++ b/data/tilesets/secondary/condominiums/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/3.pal
+++ b/data/tilesets/secondary/condominiums/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/4.pal
+++ b/data/tilesets/secondary/condominiums/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/5.pal
+++ b/data/tilesets/secondary/condominiums/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/6.pal
+++ b/data/tilesets/secondary/condominiums/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal
index 35987db53..35987db53 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/7.pal
+++ b/data/tilesets/secondary/condominiums/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal
index 7f33e006f..7f33e006f 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/8.pal
+++ b/data/tilesets/secondary/condominiums/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal
index 75022050d..75022050d 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/9.pal
+++ b/data/tilesets/secondary/condominiums/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/condominiums/tiles.png
index 324b42c9f..324b42c9f 100644
--- a/data/tilesets/secondary/82D4F8C/tiles.png
+++ b/data/tilesets/secondary/condominiums/tiles.png
diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/department_store/metatile_attributes.bin
index 5eca0b5c7..5eca0b5c7 100644
--- a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/department_store/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/department_store/metatiles.bin
index 053045190..053045190 100644
--- a/data/tilesets/secondary/82D4E6C/metatiles.bin
+++ b/data/tilesets/secondary/department_store/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/0.pal
+++ b/data/tilesets/secondary/department_store/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/1.pal
+++ b/data/tilesets/secondary/department_store/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/department_store/palettes/10.pal
index c6e769ccc..c6e769ccc 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/10.pal
+++ b/data/tilesets/secondary/department_store/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/department_store/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/11.pal
+++ b/data/tilesets/secondary/department_store/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/department_store/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/12.pal
+++ b/data/tilesets/secondary/department_store/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/department_store/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/13.pal
+++ b/data/tilesets/secondary/department_store/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/department_store/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/14.pal
+++ b/data/tilesets/secondary/department_store/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/department_store/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/15.pal
+++ b/data/tilesets/secondary/department_store/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/2.pal
+++ b/data/tilesets/secondary/department_store/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/3.pal
+++ b/data/tilesets/secondary/department_store/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/4.pal
+++ b/data/tilesets/secondary/department_store/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/5.pal
+++ b/data/tilesets/secondary/department_store/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/6.pal
+++ b/data/tilesets/secondary/department_store/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/7.pal
+++ b/data/tilesets/secondary/department_store/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4C74/palettes/8.pal
+++ b/data/tilesets/secondary/department_store/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal
index dd18b9d07..dd18b9d07 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/9.pal
+++ b/data/tilesets/secondary/department_store/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/department_store/tiles.png
index 421932118..421932118 100644
--- a/data/tilesets/secondary/82D4E6C/tiles.png
+++ b/data/tilesets/secondary/department_store/tiles.png
diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
index 2b24a5266..2b24a5266 100644
--- a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/digletts_cave/metatiles.bin
index 37ef8fe34..37ef8fe34 100644
--- a/data/tilesets/secondary/82D4E0C/metatiles.bin
+++ b/data/tilesets/secondary/digletts_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E54/palettes/0.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/1.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/digletts_cave/palettes/10.pal
index 5ccabc5a0..5ccabc5a0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/10.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/digletts_cave/palettes/11.pal
index fa0038726..fa0038726 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/11.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/digletts_cave/palettes/12.pal
index c19d59bd0..c19d59bd0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/12.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/digletts_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/13.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/digletts_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/14.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/digletts_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/15.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/2.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/3.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/4.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/5.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/6.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/7.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal
index 74cbc54c6..74cbc54c6 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/8.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal
index def7acffc..def7acffc 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/9.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/digletts_cave/tiles.png
index 77b767b79..77b767b79 100644
--- a/data/tilesets/secondary/82D4E0C/tiles.png
+++ b/data/tilesets/secondary/digletts_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/dummy1/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4C14/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/dummy1/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4C14/metatiles.bin
+++ b/data/tilesets/secondary/dummy1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/0.pal
+++ b/data/tilesets/secondary/dummy1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/1.pal
+++ b/data/tilesets/secondary/dummy1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/dummy1/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/10.pal
+++ b/data/tilesets/secondary/dummy1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/dummy1/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/11.pal
+++ b/data/tilesets/secondary/dummy1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/dummy1/palettes/12.pal
index 97d3f20bd..97d3f20bd 100644
--- a/data/tilesets/secondary/82D4C14/palettes/12.pal
+++ b/data/tilesets/secondary/dummy1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/dummy1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/dummy1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/dummy1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/15.pal
+++ b/data/tilesets/secondary/dummy1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/2.pal
+++ b/data/tilesets/secondary/dummy1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/3.pal
+++ b/data/tilesets/secondary/dummy1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/6.pal
+++ b/data/tilesets/secondary/dummy1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal
index 4172436d0..4172436d0 100644
--- a/data/tilesets/secondary/82D4C14/palettes/7.pal
+++ b/data/tilesets/secondary/dummy1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal
index 7fd087b3b..7fd087b3b 100644
--- a/data/tilesets/secondary/82D4C14/palettes/8.pal
+++ b/data/tilesets/secondary/dummy1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/9.pal
+++ b/data/tilesets/secondary/dummy1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/dummy1/tiles.png
index d4b21f3e4..d4b21f3e4 100644
--- a/data/tilesets/secondary/82D4C14/tiles.png
+++ b/data/tilesets/secondary/dummy1/tiles.png
diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/dummy2/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/dummy2/metatiles.bin
index c15edf653..c15edf653 100644
--- a/data/tilesets/secondary/82D4DAC/metatiles.bin
+++ b/data/tilesets/secondary/dummy2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal
index 0fd74602e..0fd74602e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/0.pal
+++ b/data/tilesets/secondary/dummy2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/1.pal
+++ b/data/tilesets/secondary/dummy2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/dummy2/palettes/10.pal
index cd86ca4ae..cd86ca4ae 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/dummy2/palettes/11.pal
index ec8e2f42d..ec8e2f42d 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/dummy2/palettes/12.pal
index 5caa038ad..5caa038ad 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/dummy2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/13.pal
+++ b/data/tilesets/secondary/dummy2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/dummy2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/14.pal
+++ b/data/tilesets/secondary/dummy2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/dummy2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal
index 4c41030f6..4c41030f6 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal
index 5665ddc22..5665ddc22 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/3.pal
+++ b/data/tilesets/secondary/dummy2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/4.pal
+++ b/data/tilesets/secondary/dummy2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal
index 4e684594c..4e684594c 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/5.pal
+++ b/data/tilesets/secondary/dummy2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/6.pal
+++ b/data/tilesets/secondary/dummy2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/7.pal
+++ b/data/tilesets/secondary/dummy2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal
index 42a3483c0..42a3483c0 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/dummy2/tiles.png
index c00ba0d61..c00ba0d61 100644
--- a/data/tilesets/secondary/82D4DAC/tiles.png
+++ b/data/tilesets/secondary/dummy2/tiles.png
diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/dummy3/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy3/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/dummy3/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4FBC/metatiles.bin
+++ b/data/tilesets/secondary/dummy3/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/0.pal
+++ b/data/tilesets/secondary/dummy3/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/1.pal
+++ b/data/tilesets/secondary/dummy3/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/dummy3/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy3/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/dummy3/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy3/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/dummy3/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy3/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/dummy3/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy3/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/dummy3/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy3/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/dummy3/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy3/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy3/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/3.pal
+++ b/data/tilesets/secondary/dummy3/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy3/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy3/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/6.pal
+++ b/data/tilesets/secondary/dummy3/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/7.pal
+++ b/data/tilesets/secondary/dummy3/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy3/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy3/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/dummy3/tiles.png
index b2d960c60..b2d960c60 100644
--- a/data/tilesets/secondary/82D4FBC/tiles.png
+++ b/data/tilesets/secondary/dummy3/tiles.png
diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/dummy4/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/dummy4/metatiles.bin
index 8f740f6af..8f740f6af 100644
--- a/data/tilesets/secondary/82D4FD4/metatiles.bin
+++ b/data/tilesets/secondary/dummy4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B24/palettes/0.pal
+++ b/data/tilesets/secondary/dummy4/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E24/palettes/1.pal
+++ b/data/tilesets/secondary/dummy4/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/dummy4/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/10.pal
+++ b/data/tilesets/secondary/dummy4/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/dummy4/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/11.pal
+++ b/data/tilesets/secondary/dummy4/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/dummy4/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/12.pal
+++ b/data/tilesets/secondary/dummy4/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/dummy4/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/13.pal
+++ b/data/tilesets/secondary/dummy4/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/dummy4/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/14.pal
+++ b/data/tilesets/secondary/dummy4/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/dummy4/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/15.pal
+++ b/data/tilesets/secondary/dummy4/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/2.pal
+++ b/data/tilesets/secondary/dummy4/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/3.pal
+++ b/data/tilesets/secondary/dummy4/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy4/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/5.pal
+++ b/data/tilesets/secondary/dummy4/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/6.pal
+++ b/data/tilesets/secondary/dummy4/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/7.pal
+++ b/data/tilesets/secondary/dummy4/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/8.pal
+++ b/data/tilesets/secondary/dummy4/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/9.pal
+++ b/data/tilesets/secondary/dummy4/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/dummy4/tiles.png
index 201df80fb..201df80fb 100644
--- a/data/tilesets/secondary/82D4FD4/tiles.png
+++ b/data/tilesets/secondary/dummy4/tiles.png
diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
index 8255cca20..8255cca20 100644
--- a/data/tilesets/secondary/82D4F74/metatile_attributes.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
index 63ddd975b..63ddd975b 100644
--- a/data/tilesets/secondary/82D4F74/metatiles.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/0.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/1.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
index afe462f8e..afe462f8e 100644
--- a/data/tilesets/secondary/82D4F74/palettes/10.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/11.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/12.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/13.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/14.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/15.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/2.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/3.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/4.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/5.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/6.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/7.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
index 4b7de8012..4b7de8012 100644
--- a/data/tilesets/secondary/82D4F74/palettes/8.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
index 8fe0861de..8fe0861de 100644
--- a/data/tilesets/secondary/82D4F74/palettes/9.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/fan_club_daycare/tiles.png
index b8a2a1a4f..b8a2a1a4f 100644
--- a/data/tilesets/secondary/82D4F74/tiles.png
+++ b/data/tilesets/secondary/fan_club_daycare/tiles.png
diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
index 3e370a747..3e370a747 100644
--- a/data/tilesets/secondary/82D4B54/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/fuchsia_city/metatiles.bin
index 0e0e722da..0e0e722da 100644
--- a/data/tilesets/secondary/82D4B54/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
index 5fb8bdb01..5fb8bdb01 100644
--- a/data/tilesets/secondary/82D4B54/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
index d82bb0391..d82bb0391 100644
--- a/data/tilesets/secondary/82D4B54/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
index cc0cf52cf..cc0cf52cf 100644
--- a/data/tilesets/secondary/82D4B54/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
index ebcfeb596..ebcfeb596 100644
--- a/data/tilesets/secondary/82D4B54/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4B54/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
index 8a0a9a1e0..8a0a9a1e0 100644
--- a/data/tilesets/secondary/82D4B54/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
index d39bbb454..d39bbb454 100644
--- a/data/tilesets/secondary/82D4B54/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/fuchsia_city/tiles.png
index a9e9e13e8..a9e9e13e8 100644
--- a/data/tilesets/secondary/82D4B54/tiles.png
+++ b/data/tilesets/secondary/fuchsia_city/tiles.png
diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
index 1b7a02c1f..1b7a02c1f 100644
--- a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
index 25e3b6297..25e3b6297 100644
--- a/data/tilesets/secondary/82D4CA4/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C74/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
index ebfedc7d5..ebfedc7d5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
index 1873ad439..1873ad439 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/fuchsia_gym/tiles.png
index cf2fa4ff7..cf2fa4ff7 100644
--- a/data/tilesets/secondary/82D4CA4/tiles.png
+++ b/data/tilesets/secondary/fuchsia_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/game_corner/metatile_attributes.bin
index a2bcd959e..a2bcd959e 100644
--- a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/game_corner/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/game_corner/metatiles.bin
index 1529f8582..1529f8582 100644
--- a/data/tilesets/secondary/82D4CEC/metatiles.bin
+++ b/data/tilesets/secondary/game_corner/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/0.pal
+++ b/data/tilesets/secondary/game_corner/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/1.pal
+++ b/data/tilesets/secondary/game_corner/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/game_corner/palettes/10.pal
index 6d76050a9..6d76050a9 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/10.pal
+++ b/data/tilesets/secondary/game_corner/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/game_corner/palettes/11.pal
index 9359b8858..9359b8858 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/11.pal
+++ b/data/tilesets/secondary/game_corner/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/game_corner/palettes/12.pal
index 61b3764be..61b3764be 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/12.pal
+++ b/data/tilesets/secondary/game_corner/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/game_corner/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/13.pal
+++ b/data/tilesets/secondary/game_corner/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/game_corner/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/14.pal
+++ b/data/tilesets/secondary/game_corner/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/game_corner/palettes/15.pal
index 3bb14e445..3bb14e445 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/15.pal
+++ b/data/tilesets/secondary/game_corner/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/2.pal
+++ b/data/tilesets/secondary/game_corner/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/3.pal
+++ b/data/tilesets/secondary/game_corner/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/4.pal
+++ b/data/tilesets/secondary/game_corner/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/5.pal
+++ b/data/tilesets/secondary/game_corner/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/6.pal
+++ b/data/tilesets/secondary/game_corner/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal
index b3612e537..b3612e537 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/7.pal
+++ b/data/tilesets/secondary/game_corner/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal
index e58f94305..e58f94305 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/8.pal
+++ b/data/tilesets/secondary/game_corner/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal
index 75f1d81b5..75f1d81b5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/9.pal
+++ b/data/tilesets/secondary/game_corner/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/game_corner/tiles.png
index b5b249d0a..b5b249d0a 100644
--- a/data/tilesets/secondary/82D4CEC/tiles.png
+++ b/data/tilesets/secondary/game_corner/tiles.png
diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
index be95e451c..be95e451c 100644
--- a/data/tilesets/secondary/82D4C74/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin
index 806d040ce..806d040ce 100644
--- a/data/tilesets/secondary/82D4C74/metatiles.bin
+++ b/data/tilesets/secondary/generic_building1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4C74/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4C74/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png
index 191287197..191287197 100644
--- a/data/tilesets/secondary/82D4C74/tiles.png
+++ b/data/tilesets/secondary/generic_building1/tiles.png
diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
index 18d7517d9..18d7517d9 100644
--- a/data/tilesets/secondary/82D4E84/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin
index 0943dc7af..0943dc7af 100644
--- a/data/tilesets/secondary/82D4E84/metatiles.bin
+++ b/data/tilesets/secondary/generic_building2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E84/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/82D4E84/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png
index ca6e21f03..ca6e21f03 100644
--- a/data/tilesets/secondary/82D4E84/tiles.png
+++ b/data/tilesets/secondary/generic_building2/tiles.png
diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
index 2fa59412a..2fa59412a 100644
--- a/data/tilesets/secondary/82D50DC/metatile_attributes.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/hall_of_fame/metatiles.bin
index 6f4e8a22e..6f4e8a22e 100644
--- a/data/tilesets/secondary/82D50DC/metatiles.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4D04/palettes/0.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F14/palettes/1.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
index 6ea570459..6ea570459 100644
--- a/data/tilesets/secondary/82D50DC/palettes/10.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
index 008f150c7..008f150c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/11.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D50DC/palettes/12.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/13.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/14.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/15.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/2.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/3.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/4.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5034/palettes/5.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/6.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
index f0c97cf87..f0c97cf87 100644
--- a/data/tilesets/secondary/82D50DC/palettes/7.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
index 33b52bbbd..33b52bbbd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/8.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
index 3a2cf3b7a..3a2cf3b7a 100644
--- a/data/tilesets/secondary/82D50DC/palettes/9.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/hall_of_fame/tiles.png
index f5ab3a9cb..f5ab3a9cb 100644
--- a/data/tilesets/secondary/82D50DC/tiles.png
+++ b/data/tilesets/secondary/hall_of_fame/tiles.png
diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
index 6c4ffed21..6c4ffed21 100644
--- a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/hoenn_building/metatiles.bin
index af8effb11..af8effb11 100644
--- a/data/tilesets/secondary/82D4CD4/metatiles.bin
+++ b/data/tilesets/secondary/hoenn_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/0.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/1.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/hoenn_building/palettes/10.pal
index 432f42149..432f42149 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/10.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/hoenn_building/palettes/11.pal
index 8c2460403..8c2460403 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/11.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/hoenn_building/palettes/12.pal
index 920ad12c9..920ad12c9 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/12.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/hoenn_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/13.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/hoenn_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/14.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/hoenn_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/15.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/2.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/3.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/4.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/5.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/6.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal
index 533778712..533778712 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/7.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/8.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal
index 371e5a211..371e5a211 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/9.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/hoenn_building/tiles.png
index ef8a943fa..ef8a943fa 100644
--- a/data/tilesets/secondary/82D4CD4/tiles.png
+++ b/data/tilesets/secondary/hoenn_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
index f840f6486..f840f6486 100644
--- a/data/tilesets/secondary/82D4B84/metatile_attributes.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/indigo_plateau/metatiles.bin
index bbb7ffbee..bbb7ffbee 100644
--- a/data/tilesets/secondary/82D4B84/metatiles.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B84/palettes/0.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/1.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4B84/palettes/10.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
index 7b47acf60..7b47acf60 100644
--- a/data/tilesets/secondary/82D4B84/palettes/11.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
index f5ff3dddf..f5ff3dddf 100644
--- a/data/tilesets/secondary/82D4B84/palettes/12.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/13.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/14.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/15.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/2.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/3.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/4.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/5.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/6.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/7.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4B84/palettes/8.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
index 3ff6139ac..3ff6139ac 100644
--- a/data/tilesets/secondary/82D4B84/palettes/9.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/indigo_plateau/tiles.png
index 4a938b4c5..4a938b4c5 100644
--- a/data/tilesets/secondary/82D4B84/tiles.png
+++ b/data/tilesets/secondary/indigo_plateau/tiles.png
diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
index 9dd5f613d..9dd5f613d 100644
--- a/data/tilesets/secondary/82D50AC/metatile_attributes.bin
+++ b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/island_harbor/metatiles.bin
index d5916a2cf..d5916a2cf 100644
--- a/data/tilesets/secondary/82D50AC/metatiles.bin
+++ b/data/tilesets/secondary/island_harbor/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/0.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal
index 22eb1667c..22eb1667c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/1.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D50AC/palettes/10.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal
index c42eeb7e1..c42eeb7e1 100644
--- a/data/tilesets/secondary/82D50AC/palettes/11.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/12.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/13.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/14.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/15.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/2.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E24/palettes/3.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/4.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E24/palettes/5.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/6.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/7.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal
index 5c1251024..5c1251024 100644
--- a/data/tilesets/secondary/82D50AC/palettes/8.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal
index c25501332..c25501332 100644
--- a/data/tilesets/secondary/82D50AC/palettes/9.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index 166ae2e18..166ae2e18 100644
--- a/data/tilesets/secondary/82D50AC/tiles.png
+++ b/data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/lab/metatile_attributes.bin
index 0d685881c..0d685881c 100644
--- a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lab/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/lab/metatiles.bin
index a7833446f..a7833446f 100644
--- a/data/tilesets/secondary/82D4C8C/metatiles.bin
+++ b/data/tilesets/secondary/lab/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal
index 9fc16da3b..9fc16da3b 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/0.pal
+++ b/data/tilesets/secondary/lab/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal
index 76403e6d6..76403e6d6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/1.pal
+++ b/data/tilesets/secondary/lab/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/10.pal
+++ b/data/tilesets/secondary/lab/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/11.pal
+++ b/data/tilesets/secondary/lab/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal
index 3c32c9fd4..3c32c9fd4 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/12.pal
+++ b/data/tilesets/secondary/lab/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/13.pal
+++ b/data/tilesets/secondary/lab/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/14.pal
+++ b/data/tilesets/secondary/lab/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/15.pal
+++ b/data/tilesets/secondary/lab/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal
index b1ecd71dc..b1ecd71dc 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/2.pal
+++ b/data/tilesets/secondary/lab/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal
index 43d9b60e3..43d9b60e3 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/3.pal
+++ b/data/tilesets/secondary/lab/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/4.pal
+++ b/data/tilesets/secondary/lab/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/5.pal
+++ b/data/tilesets/secondary/lab/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/6.pal
+++ b/data/tilesets/secondary/lab/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal
index 3d7f8bd89..3d7f8bd89 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/7.pal
+++ b/data/tilesets/secondary/lab/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal
index 7fce49d06..7fce49d06 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/8.pal
+++ b/data/tilesets/secondary/lab/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/9.pal
+++ b/data/tilesets/secondary/lab/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/lab/tiles.png
index 6caeac8a8..6caeac8a8 100644
--- a/data/tilesets/secondary/82D4C8C/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
index d103d7155..d103d7155 100644
--- a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/lavender_town/metatiles.bin
index f69885645..f69885645 100644
--- a/data/tilesets/secondary/82D4B0C/metatiles.bin
+++ b/data/tilesets/secondary/lavender_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/0.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E54/palettes/1.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/lavender_town/palettes/10.pal
index b97e9df4b..b97e9df4b 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/10.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/lavender_town/palettes/11.pal
index f71181976..f71181976 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/11.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/lavender_town/palettes/12.pal
index 0cdcab8c2..0cdcab8c2 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/12.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/lavender_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/13.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/lavender_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/14.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/lavender_town/palettes/15.pal
index 3973e491a..3973e491a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/15.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E24/palettes/2.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/3.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal
index 07dcd957c..07dcd957c 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/4.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E54/palettes/5.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/6.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/7.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal
index 376749664..376749664 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/8.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal
index 82b469a66..82b469a66 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/9.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/lavender_town/tiles.png
index 66bd81f8b..66bd81f8b 100644
--- a/data/tilesets/secondary/82D4B0C/tiles.png
+++ b/data/tilesets/secondary/lavender_town/tiles.png
diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/mart/metatile_attributes.bin
index 31fdb5cc0..31fdb5cc0 100644
--- a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mart/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/mart/metatiles.bin
index 1c00836c1..1c00836c1 100644
--- a/data/tilesets/secondary/82D4BCC/metatiles.bin
+++ b/data/tilesets/secondary/mart/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D34/palettes/0.pal
+++ b/data/tilesets/secondary/mart/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/1.pal
+++ b/data/tilesets/secondary/mart/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/mart/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/10.pal
+++ b/data/tilesets/secondary/mart/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/mart/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/11.pal
+++ b/data/tilesets/secondary/mart/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/mart/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/12.pal
+++ b/data/tilesets/secondary/mart/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/mart/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/13.pal
+++ b/data/tilesets/secondary/mart/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/mart/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/14.pal
+++ b/data/tilesets/secondary/mart/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/mart/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/15.pal
+++ b/data/tilesets/secondary/mart/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4D34/palettes/2.pal
+++ b/data/tilesets/secondary/mart/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal
index e1b56cd57..e1b56cd57 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/3.pal
+++ b/data/tilesets/secondary/mart/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/4.pal
+++ b/data/tilesets/secondary/mart/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/5.pal
+++ b/data/tilesets/secondary/mart/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/6.pal
+++ b/data/tilesets/secondary/mart/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal
index 0a07057ec..0a07057ec 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/7.pal
+++ b/data/tilesets/secondary/mart/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal
index 06fcc911b..06fcc911b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/8.pal
+++ b/data/tilesets/secondary/mart/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal
index ea018609b..ea018609b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/9.pal
+++ b/data/tilesets/secondary/mart/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/mart/tiles.png
index 2bfeb4080..2bfeb4080 100644
--- a/data/tilesets/secondary/82D4BCC/tiles.png
+++ b/data/tilesets/secondary/mart/tiles.png
diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
index 45432b773..45432b773 100644
--- a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/mt_ember/metatiles.bin
index b80796821..b80796821 100644
--- a/data/tilesets/secondary/82D4FEC/metatiles.bin
+++ b/data/tilesets/secondary/mt_ember/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal
index 30ff4070a..30ff4070a 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/0.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/1.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/mt_ember/palettes/10.pal
index fc340ed15..fc340ed15 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/10.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/mt_ember/palettes/11.pal
index e07ce6909..e07ce6909 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/11.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/mt_ember/palettes/12.pal
index cc53a5940..cc53a5940 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/12.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/mt_ember/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/13.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/mt_ember/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/14.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/mt_ember/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/15.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/2.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/3.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/4.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/5.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal
index 32afdccbb..32afdccbb 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/6.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal
index fa9d5d633..fa9d5d633 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/7.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal
index f4a797b87..f4a797b87 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/8.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal
index 0a2109195..0a2109195 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/9.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/mt_ember/tiles.png
index 04d2b7b67..04d2b7b67 100644
--- a/data/tilesets/secondary/82D4FEC/tiles.png
+++ b/data/tilesets/secondary/mt_ember/tiles.png
diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/museum/metatile_attributes.bin
index 097e93ce1..097e93ce1 100644
--- a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/museum/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/museum/metatiles.bin
index 993b73cbd..993b73cbd 100644
--- a/data/tilesets/secondary/82D4C2C/metatiles.bin
+++ b/data/tilesets/secondary/museum/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/0.pal
+++ b/data/tilesets/secondary/museum/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/1.pal
+++ b/data/tilesets/secondary/museum/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/museum/palettes/10.pal
index fc8da5d40..fc8da5d40 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/10.pal
+++ b/data/tilesets/secondary/museum/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/museum/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/11.pal
+++ b/data/tilesets/secondary/museum/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/museum/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/12.pal
+++ b/data/tilesets/secondary/museum/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/museum/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/13.pal
+++ b/data/tilesets/secondary/museum/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/museum/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/14.pal
+++ b/data/tilesets/secondary/museum/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/museum/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/15.pal
+++ b/data/tilesets/secondary/museum/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/2.pal
+++ b/data/tilesets/secondary/museum/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal
index 1520bed0b..1520bed0b 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/3.pal
+++ b/data/tilesets/secondary/museum/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/4.pal
+++ b/data/tilesets/secondary/museum/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/5.pal
+++ b/data/tilesets/secondary/museum/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/6.pal
+++ b/data/tilesets/secondary/museum/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/7.pal
+++ b/data/tilesets/secondary/museum/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal
index 223737ab6..223737ab6 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/8.pal
+++ b/data/tilesets/secondary/museum/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal
index 6de173f90..6de173f90 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/9.pal
+++ b/data/tilesets/secondary/museum/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/museum/tiles.png
index 9be5ebca9..9be5ebca9 100644
--- a/data/tilesets/secondary/82D4C2C/tiles.png
+++ b/data/tilesets/secondary/museum/tiles.png
diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
index 6e3d955e2..6e3d955e2 100644
--- a/data/tilesets/secondary/82D501C/metatile_attributes.bin
+++ b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/navel_rock/metatiles.bin
index 7fdc5c55d..7fdc5c55d 100644
--- a/data/tilesets/secondary/82D501C/metatiles.bin
+++ b/data/tilesets/secondary/navel_rock/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4E24/palettes/0.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/1.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/1.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal
index 334da8f23..334da8f23 100644
--- a/data/tilesets/secondary/82D501C/palettes/10.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/10.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal
index 0c3d2870e..0c3d2870e 100644
--- a/data/tilesets/secondary/82D501C/palettes/11.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/11.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal
index a68c94c2c..a68c94c2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/12.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/13.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/14.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/15.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E54/palettes/2.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/3.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E24/palettes/4.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/5.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/6.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/6.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal
index 364379ad9..364379ad9 100644
--- a/data/tilesets/secondary/82D501C/palettes/7.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/7.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal
index 102aaaf2c..102aaaf2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/8.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/8.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal
index 91329f82e..91329f82e 100644
--- a/data/tilesets/secondary/82D501C/palettes/9.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/9.pal
diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index cbce25763..cbce25763 100644
--- a/data/tilesets/secondary/82D501C/tiles.png
+++ b/data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
index 2ba2894bc..2ba2894bc 100644
--- a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/pallet_town/metatiles.bin
index 41db27015..41db27015 100644
--- a/data/tilesets/secondary/82D4AAC/metatiles.bin
+++ b/data/tilesets/secondary/pallet_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal
index 42246e9ea..42246e9ea 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/0.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal
index 28db536cb..28db536cb 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/1.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/pallet_town/palettes/10.pal
index 1958eff11..1958eff11 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/10.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/pallet_town/palettes/11.pal
index 896c79281..896c79281 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/11.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/pallet_town/palettes/12.pal
index 2bfc45b6d..2bfc45b6d 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/12.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/pallet_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/13.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/pallet_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/14.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/pallet_town/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/15.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal
index 937cec4da..937cec4da 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/2.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/3.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal
index cde020d4e..cde020d4e 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/4.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal
index bdcc7b8ed..bdcc7b8ed 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/5.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/6.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/7.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal
index dcecb9c40..dcecb9c40 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/8.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal
index 90bb77517..90bb77517 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/9.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/pallet_town/tiles.png
index 771eed906..771eed906 100644
--- a/data/tilesets/secondary/82D4AAC/tiles.png
+++ b/data/tilesets/secondary/pallet_town/tiles.png
diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
index 4e19ca185..4e19ca185 100644
--- a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/pewter_city/metatiles.bin
index a23224773..a23224773 100644
--- a/data/tilesets/secondary/82D4ADC/metatiles.bin
+++ b/data/tilesets/secondary/pewter_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal
index 60de8c7ad..60de8c7ad 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/pewter_city/palettes/10.pal
index 76fda8006..76fda8006 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/pewter_city/palettes/11.pal
index 3f8fdc519..3f8fdc519 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/pewter_city/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/pewter_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/pewter_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/pewter_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E54/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal
index d404706ab..d404706ab 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal
index cacf892a6..cacf892a6 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/pewter_city/tiles.png
index d3148ba5a..d3148ba5a 100644
--- a/data/tilesets/secondary/82D4ADC/tiles.png
+++ b/data/tilesets/secondary/pewter_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
index ead3610f0..ead3610f0 100644
--- a/data/tilesets/secondary/82D4D04/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/pewter_gym/metatiles.bin
index 7034bb6d6..7034bb6d6 100644
--- a/data/tilesets/secondary/82D4D04/metatiles.bin
+++ b/data/tilesets/secondary/pewter_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/pewter_gym/palettes/10.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/pewter_gym/palettes/11.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/pewter_gym/palettes/12.pal
index c8dfac7d2..c8dfac7d2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/pewter_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/pewter_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/pewter_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal
index 34c0ddd17..34c0ddd17 100644
--- a/data/tilesets/secondary/82D4D04/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal
index 77e03a48c..77e03a48c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal
index ef91ae987..ef91ae987 100644
--- a/data/tilesets/secondary/82D4D04/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/pewter_gym/tiles.png
index 6e97a68a1..6e97a68a1 100644
--- a/data/tilesets/secondary/82D4D04/tiles.png
+++ b/data/tilesets/secondary/pewter_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
index f9bd3d289..f9bd3d289 100644
--- a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/pokemon_center/metatiles.bin
index 2ec8817bc..2ec8817bc 100644
--- a/data/tilesets/secondary/82D4BE4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_center/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D64/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4D34/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal
index 62e3e6d6b..62e3e6d6b 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal
index 7ba7bccca..7ba7bccca 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal
index 0f1f36738..0f1f36738 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal
index 27ca86ca3..27ca86ca3 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal
index 6b6a0f25f..6b6a0f25f 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal
index 4b279ecf9..4b279ecf9 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 92d0112f3..92d0112f3 100644
--- a/data/tilesets/secondary/82D4BE4/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
index bcc2fedb4..bcc2fedb4 100644
--- a/data/tilesets/secondary/82D50C4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/pokemon_league/metatiles.bin
index 7cdfa846a..7cdfa846a 100644
--- a/data/tilesets/secondary/82D50C4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_league/metatiles.bin
diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D5094/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal
index fc945ef6c..fc945ef6c 100644
--- a/data/tilesets/secondary/82D50C4/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/pokemon_league/palettes/10.pal
index 18908d2ef..18908d2ef 100644
--- a/data/tilesets/secondary/82D50C4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/pokemon_league/palettes/11.pal
index edc05893b..edc05893b 100644
--- a/data/tilesets/secondary/82D50C4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/pokemon_league/palettes/12.pal
index 36807053a..36807053a 100644
--- a/data/tilesets/secondary/82D50C4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/pokemon_league/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/pokemon_league/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/pokemon_league/palettes/15.pal
index 0b5e86def..0b5e86def 100644
--- a/data/tilesets/secondary/82D50C4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5034/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5034/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5034/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal
index 34ef2f2d2..34ef2f2d2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5034/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal
index 6528f9f75..6528f9f75 100644
--- a/data/tilesets/secondary/82D50C4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal
index 6b56cd49e..6b56cd49e 100644
--- a/data/tilesets/secondary/82D50C4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal
index 5c2ed43a0..5c2ed43a0 100644
--- a/data/tilesets/secondary/82D50C4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/pokemon_league/tiles.png
index 0f65e1ff3..0f65e1ff3 100644
--- a/data/tilesets/secondary/82D50C4/tiles.png
+++ b/data/tilesets/secondary/pokemon_league/tiles.png
diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
index 91b8105d3..91b8105d3 100644
--- a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
index 5caba25a7..5caba25a7 100644
--- a/data/tilesets/secondary/82D4F2C/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
index 9c9a571ef..9c9a571ef 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
index 4d22869cd..4d22869cd 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
index 2a9d791a4..2a9d791a4 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/pokemon_mansion/tiles.png
index 3e69db5c3..3e69db5c3 100644
--- a/data/tilesets/secondary/82D4F2C/tiles.png
+++ b/data/tilesets/secondary/pokemon_mansion/tiles.png
diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
index 8c16318f0..8c16318f0 100644
--- a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/pokemon_tower/metatiles.bin
index d4216989e..d4216989e 100644
--- a/data/tilesets/secondary/82D4EFC/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50C4/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
index fa56f966e..fa56f966e 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D64/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
index 241a2678c..241a2678c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
index ebd9e912c..ebd9e912c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
index 51daf6701..51daf6701 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/pokemon_tower/tiles.png
index b8f8c6a4d..b8f8c6a4d 100644
--- a/data/tilesets/secondary/82D4EFC/tiles.png
+++ b/data/tilesets/secondary/pokemon_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/power_plant/metatile_attributes.bin
index 1105056c9..1105056c9 100644
--- a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/power_plant/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/power_plant/metatiles.bin
index 7d1e15676..7d1e15676 100644
--- a/data/tilesets/secondary/82D4E9C/metatiles.bin
+++ b/data/tilesets/secondary/power_plant/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/0.pal
+++ b/data/tilesets/secondary/power_plant/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/1.pal
+++ b/data/tilesets/secondary/power_plant/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/power_plant/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4D94/palettes/10.pal
+++ b/data/tilesets/secondary/power_plant/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/power_plant/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/11.pal
+++ b/data/tilesets/secondary/power_plant/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/power_plant/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/12.pal
+++ b/data/tilesets/secondary/power_plant/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/power_plant/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/13.pal
+++ b/data/tilesets/secondary/power_plant/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/power_plant/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/14.pal
+++ b/data/tilesets/secondary/power_plant/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/power_plant/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/15.pal
+++ b/data/tilesets/secondary/power_plant/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/2.pal
+++ b/data/tilesets/secondary/power_plant/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/3.pal
+++ b/data/tilesets/secondary/power_plant/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/4.pal
+++ b/data/tilesets/secondary/power_plant/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/5.pal
+++ b/data/tilesets/secondary/power_plant/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/6.pal
+++ b/data/tilesets/secondary/power_plant/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal
index b69e6cfa4..b69e6cfa4 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/7.pal
+++ b/data/tilesets/secondary/power_plant/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal
index 3cada9fa1..3cada9fa1 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/8.pal
+++ b/data/tilesets/secondary/power_plant/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/9.pal
+++ b/data/tilesets/secondary/power_plant/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/power_plant/tiles.png
index d252dbcd3..d252dbcd3 100644
--- a/data/tilesets/secondary/82D4E9C/tiles.png
+++ b/data/tilesets/secondary/power_plant/tiles.png
diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
index a2ac291b5..a2ac291b5 100644
--- a/data/tilesets/secondary/82D4F44/metatile_attributes.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
index 5cddd954c..5cddd954c 100644
--- a/data/tilesets/secondary/82D4F44/metatiles.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/0.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F44/palettes/1.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/10.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/11.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/12.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/13.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/14.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F44/palettes/15.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F44/palettes/2.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F44/palettes/3.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/4.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/5.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/6.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
index 5e3bac102..5e3bac102 100644
--- a/data/tilesets/secondary/82D4F44/palettes/7.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
index 2257c0006..2257c0006 100644
--- a/data/tilesets/secondary/82D4F44/palettes/8.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/9.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/restaurant_hotel/tiles.png
index 5c8a38b9e..5c8a38b9e 100644
--- a/data/tilesets/secondary/82D4F44/tiles.png
+++ b/data/tilesets/secondary/restaurant_hotel/tiles.png
diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
index 96ef6a853..96ef6a853 100644
--- a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/rock_tunnel/metatiles.bin
index 0ee478c87..0ee478c87 100644
--- a/data/tilesets/secondary/82D4DF4/metatiles.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/0.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/1.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
index 4235579fc..4235579fc 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/10.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
index 277172976..277172976 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/11.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
index 2fa21e9fb..2fa21e9fb 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/12.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/13.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/14.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/15.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/2.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/3.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4F14/palettes/4.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/5.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/6.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/7.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
index 34a637b1a..34a637b1a 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/8.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
index f10a94f7c..f10a94f7c 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/9.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/rock_tunnel/tiles.png
index cb4078fa9..cb4078fa9 100644
--- a/data/tilesets/secondary/82D4DF4/tiles.png
+++ b/data/tilesets/secondary/rock_tunnel/tiles.png
diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
index 9656d8ed7..9656d8ed7 100644
--- a/data/tilesets/secondary/82D4F14/metatile_attributes.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/safari_zone_building/metatiles.bin
index 3337a5393..3337a5393 100644
--- a/data/tilesets/secondary/82D4F14/metatiles.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4F14/palettes/0.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/1.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
index 1f08b0f6f..1f08b0f6f 100644
--- a/data/tilesets/secondary/82D4F14/palettes/10.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/11.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/12.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/13.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/14.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/15.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
index ddec077d0..ddec077d0 100644
--- a/data/tilesets/secondary/82D4F14/palettes/2.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4F14/palettes/3.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/4.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
index 9de0ef422..9de0ef422 100644
--- a/data/tilesets/secondary/82D4F14/palettes/5.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/6.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/7.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
index eed6dbc35..eed6dbc35 100644
--- a/data/tilesets/secondary/82D4F14/palettes/8.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
index e9b93cfd2..e9b93cfd2 100644
--- a/data/tilesets/secondary/82D4F14/palettes/9.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/safari_zone_building/tiles.png
index 6c8d53e34..6c8d53e34 100644
--- a/data/tilesets/secondary/82D4F14/tiles.png
+++ b/data/tilesets/secondary/safari_zone_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
index c6f6551c0..c6f6551c0 100644
--- a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/saffron_city/metatiles.bin
index dd43794df..dd43794df 100644
--- a/data/tilesets/secondary/82D4B9C/metatiles.bin
+++ b/data/tilesets/secondary/saffron_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/saffron_city/palettes/10.pal
index ce671fee4..ce671fee4 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/saffron_city/palettes/11.pal
index d1ae629c8..d1ae629c8 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/saffron_city/palettes/12.pal
index b66bd774a..b66bd774a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/saffron_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/saffron_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/saffron_city/palettes/15.pal
index 3ffc684ac..3ffc684ac 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D5004/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal
index b1e168855..b1e168855 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal
index 7a88fdbbf..7a88fdbbf 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/saffron_city/tiles.png
index ea835f8dd..ea835f8dd 100644
--- a/data/tilesets/secondary/82D4B9C/tiles.png
+++ b/data/tilesets/secondary/saffron_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
index ee895c35a..ee895c35a 100644
--- a/data/tilesets/secondary/82D4D64/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/saffron_gym/metatiles.bin
index e0fdb79fb..e0fdb79fb 100644
--- a/data/tilesets/secondary/82D4D64/metatiles.bin
+++ b/data/tilesets/secondary/saffron_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/saffron_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/saffron_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/saffron_gym/palettes/12.pal
index 702c67ecb..702c67ecb 100644
--- a/data/tilesets/secondary/82D4D64/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/saffron_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/saffron_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/saffron_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal
index c66eaedff..c66eaedff 100644
--- a/data/tilesets/secondary/82D4D64/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/saffron_gym/tiles.png
index 87641a309..87641a309 100644
--- a/data/tilesets/secondary/82D4D64/tiles.png
+++ b/data/tilesets/secondary/saffron_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/school/metatile_attributes.bin
index cdcb96c53..cdcb96c53 100644
--- a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/school/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/school/metatiles.bin
index 35009a690..35009a690 100644
--- a/data/tilesets/secondary/82D4F5C/metatiles.bin
+++ b/data/tilesets/secondary/school/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/0.pal
+++ b/data/tilesets/secondary/school/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/1.pal
+++ b/data/tilesets/secondary/school/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/school/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/10.pal
+++ b/data/tilesets/secondary/school/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/school/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/11.pal
+++ b/data/tilesets/secondary/school/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/school/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/12.pal
+++ b/data/tilesets/secondary/school/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/school/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/13.pal
+++ b/data/tilesets/secondary/school/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/school/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/14.pal
+++ b/data/tilesets/secondary/school/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/school/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/15.pal
+++ b/data/tilesets/secondary/school/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/2.pal
+++ b/data/tilesets/secondary/school/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/3.pal
+++ b/data/tilesets/secondary/school/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/4.pal
+++ b/data/tilesets/secondary/school/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/5.pal
+++ b/data/tilesets/secondary/school/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/6.pal
+++ b/data/tilesets/secondary/school/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal
index 6c1a5b096..6c1a5b096 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/7.pal
+++ b/data/tilesets/secondary/school/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal
index 1557a55f0..1557a55f0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/8.pal
+++ b/data/tilesets/secondary/school/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/9.pal
+++ b/data/tilesets/secondary/school/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/school/tiles.png
index 935afccd2..935afccd2 100644
--- a/data/tilesets/secondary/82D4F5C/tiles.png
+++ b/data/tilesets/secondary/school/tiles.png
diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
index 05caeb58b..05caeb58b 100644
--- a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
+++ b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/sea_cottage/metatiles.bin
index 6ac3cbf98..6ac3cbf98 100644
--- a/data/tilesets/secondary/82D4EB4/metatiles.bin
+++ b/data/tilesets/secondary/sea_cottage/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal
index ed708dd79..ed708dd79 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/0.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal
index 4d2b48991..4d2b48991 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/1.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/sea_cottage/palettes/10.pal
index e8624e82f..e8624e82f 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/10.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/sea_cottage/palettes/11.pal
index 9cec1272b..9cec1272b 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/11.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/sea_cottage/palettes/12.pal
index 600d8f469..600d8f469 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/12.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/sea_cottage/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/13.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/sea_cottage/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/14.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/sea_cottage/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/15.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal
index 878c13c95..878c13c95 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/2.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal
index bed4c20c3..bed4c20c3 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/3.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal
index b77ba3e87..b77ba3e87 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/4.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal
index 74a2a9ed0..74a2a9ed0 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/5.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/6.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/7.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal
index 370a3d2db..370a3d2db 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/8.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal
index 1193cc807..1193cc807 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/9.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/sea_cottage/tiles.png
index 42d557bcf..42d557bcf 100644
--- a/data/tilesets/secondary/82D4EB4/tiles.png
+++ b/data/tilesets/secondary/sea_cottage/tiles.png
diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
index 87564066c..87564066c 100644
--- a/data/tilesets/secondary/82D4E24/metatile_attributes.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/seafoam_islands/metatiles.bin
index 8f8bd569b..8f8bd569b 100644
--- a/data/tilesets/secondary/82D4E24/metatiles.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/0.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D501C/palettes/1.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
index 7116e91ff..7116e91ff 100644
--- a/data/tilesets/secondary/82D4E24/palettes/10.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
index b237ef1c8..b237ef1c8 100644
--- a/data/tilesets/secondary/82D4E24/palettes/11.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
index ed56edee1..ed56edee1 100644
--- a/data/tilesets/secondary/82D4E24/palettes/12.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/13.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/14.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/15.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D501C/palettes/2.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D501C/palettes/3.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D5004/palettes/4.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D501C/palettes/5.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D501C/palettes/6.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/7.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
index d96f3f0fc..d96f3f0fc 100644
--- a/data/tilesets/secondary/82D4E24/palettes/8.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
index 1a1dc881b..1a1dc881b 100644
--- a/data/tilesets/secondary/82D4E24/palettes/9.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/seafoam_islands/tiles.png
index e085d8e33..e085d8e33 100644
--- a/data/tilesets/secondary/82D4E24/tiles.png
+++ b/data/tilesets/secondary/seafoam_islands/tiles.png
diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
index 62eb1b917..62eb1b917 100644
--- a/data/tilesets/secondary/82D504C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
index 52d2f020d..52d2f020d 100644
--- a/data/tilesets/secondary/82D504C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D501C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D504C/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
index 265fb0625..265fb0625 100644
--- a/data/tilesets/secondary/82D504C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
index 9e1e423c6..9e1e423c6 100644
--- a/data/tilesets/secondary/82D504C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
index 375e3914b..375e3914b 100644
--- a/data/tilesets/secondary/82D504C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D504C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D504C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D4D94/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D504C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D504C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D504C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
index b66fdcdbf..b66fdcdbf 100644
--- a/data/tilesets/secondary/82D504C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/sevii_islands_123/tiles.png
index ad8f73a2c..ad8f73a2c 100644
--- a/data/tilesets/secondary/82D504C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_123/tiles.png
diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
index d67c4690c..d67c4690c 100644
--- a/data/tilesets/secondary/82D5064/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
index 7613f3702..7613f3702 100644
--- a/data/tilesets/secondary/82D5064/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D504C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D5064/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
index 86502dd48..86502dd48 100644
--- a/data/tilesets/secondary/82D5064/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
index b05410cba..b05410cba 100644
--- a/data/tilesets/secondary/82D5064/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D5064/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D5064/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D5064/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D504C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D5064/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5064/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D5064/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
index 5ac617b25..5ac617b25 100644
--- a/data/tilesets/secondary/82D5064/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/sevii_islands_45/tiles.png
index 744b38638..744b38638 100644
--- a/data/tilesets/secondary/82D5064/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_45/tiles.png
diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
index edf192276..edf192276 100644
--- a/data/tilesets/secondary/82D507C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
index 13f97073b..13f97073b 100644
--- a/data/tilesets/secondary/82D507C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D5064/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
index d26d003af..d26d003af 100644
--- a/data/tilesets/secondary/82D507C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D507C/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D507C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D507C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D507C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D507C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D507C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D507C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/sevii_islands_67/tiles.png
index d40c92649..d40c92649 100644
--- a/data/tilesets/secondary/82D507C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_67/tiles.png
diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/silph_co/metatile_attributes.bin
index a118a0181..a118a0181 100644
--- a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
+++ b/data/tilesets/secondary/silph_co/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/silph_co/metatiles.bin
index c86070668..c86070668 100644
--- a/data/tilesets/secondary/82D4ECC/metatiles.bin
+++ b/data/tilesets/secondary/silph_co/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
index 949846f90..949846f90 100644
--- a/data/tilesets/secondary/82D4D94/metatile_attributes.bin
+++ b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/ss_anne/metatiles.bin
index a976297b3..a976297b3 100644
--- a/data/tilesets/secondary/82D4D94/metatiles.bin
+++ b/data/tilesets/secondary/ss_anne/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal
index 28232d99e..28232d99e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/0.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal
index b43532470..b43532470 100644
--- a/data/tilesets/secondary/82D4D94/palettes/1.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/ss_anne/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/10.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/ss_anne/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/11.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/ss_anne/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/12.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/ss_anne/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/13.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/ss_anne/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/14.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/ss_anne/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/15.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal
index e267ae90e..e267ae90e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/2.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal
index 503f22878..503f22878 100644
--- a/data/tilesets/secondary/82D4D94/palettes/3.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal
index cdf1b6190..cdf1b6190 100644
--- a/data/tilesets/secondary/82D4D94/palettes/4.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D5064/palettes/5.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4D94/palettes/6.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal
index e9848a1c0..e9848a1c0 100644
--- a/data/tilesets/secondary/82D4D94/palettes/7.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal
index b5c80c8f4..b5c80c8f4 100644
--- a/data/tilesets/secondary/82D4D94/palettes/8.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal
index b66b2399a..b66b2399a 100644
--- a/data/tilesets/secondary/82D4D94/palettes/9.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/ss_anne/tiles.png
index 280f3e227..280f3e227 100644
--- a/data/tilesets/secondary/82D4D94/tiles.png
+++ b/data/tilesets/secondary/ss_anne/tiles.png
diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
index 5fe7d59fc..5fe7d59fc 100644
--- a/data/tilesets/secondary/82D5034/metatile_attributes.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
index 2b3a9543e..2b3a9543e 100644
--- a/data/tilesets/secondary/82D5034/metatiles.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
index 83b30fc17..83b30fc17 100644
--- a/data/tilesets/secondary/82D5034/palettes/0.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5034/palettes/1.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
index fb565545b..fb565545b 100644
--- a/data/tilesets/secondary/82D5034/palettes/10.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
index e637019c6..e637019c6 100644
--- a/data/tilesets/secondary/82D5034/palettes/11.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
index 775369fed..775369fed 100644
--- a/data/tilesets/secondary/82D5034/palettes/12.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/13.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/14.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/15.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5094/palettes/2.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5094/palettes/3.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5094/palettes/4.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5094/palettes/5.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5094/palettes/6.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
index dfa779635..dfa779635 100644
--- a/data/tilesets/secondary/82D5034/palettes/7.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
index fd7d8a9d7..fd7d8a9d7 100644
--- a/data/tilesets/secondary/82D5034/palettes/8.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
index 0d43d6ef9..0d43d6ef9 100644
--- a/data/tilesets/secondary/82D5034/palettes/9.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/tanoby_ruins/tiles.png
index c61f91c47..c61f91c47 100644
--- a/data/tilesets/secondary/82D5034/tiles.png
+++ b/data/tilesets/secondary/tanoby_ruins/tiles.png
diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
index 96b25bb0f..96b25bb0f 100644
--- a/data/tilesets/secondary/82D5094/metatile_attributes.bin
+++ b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/trainer_tower/metatiles.bin
index f045f57e8..f045f57e8 100644
--- a/data/tilesets/secondary/82D5094/metatiles.bin
+++ b/data/tilesets/secondary/trainer_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50DC/palettes/0.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5094/palettes/1.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/trainer_tower/palettes/10.pal
index ab3a7d14f..ab3a7d14f 100644
--- a/data/tilesets/secondary/82D5094/palettes/10.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/trainer_tower/palettes/11.pal
index bb88b4d57..bb88b4d57 100644
--- a/data/tilesets/secondary/82D5094/palettes/11.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/trainer_tower/palettes/12.pal
index b0d005f21..b0d005f21 100644
--- a/data/tilesets/secondary/82D5094/palettes/12.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/trainer_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/13.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/trainer_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/14.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/trainer_tower/palettes/15.pal
index 6a17f18dc..6a17f18dc 100644
--- a/data/tilesets/secondary/82D5094/palettes/15.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50C4/palettes/2.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50C4/palettes/3.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50C4/palettes/4.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/5.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/6.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D5094/palettes/7.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal
index 317213c42..317213c42 100644
--- a/data/tilesets/secondary/82D5094/palettes/8.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal
index 19dc9a47e..19dc9a47e 100644
--- a/data/tilesets/secondary/82D5094/palettes/9.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/trainer_tower/tiles.png
index f74f7c9f7..f74f7c9f7 100644
--- a/data/tilesets/secondary/82D5094/tiles.png
+++ b/data/tilesets/secondary/trainer_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/underground_path/metatile_attributes.bin
index 29caa862d..29caa862d 100644
--- a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/underground_path/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/underground_path/metatiles.bin
index 2010e1eca..2010e1eca 100644
--- a/data/tilesets/secondary/82D4EE4/metatiles.bin
+++ b/data/tilesets/secondary/underground_path/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/0.pal
+++ b/data/tilesets/secondary/underground_path/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D50DC/palettes/1.pal
+++ b/data/tilesets/secondary/underground_path/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/underground_path/palettes/10.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/10.pal
+++ b/data/tilesets/secondary/underground_path/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/underground_path/palettes/11.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/11.pal
+++ b/data/tilesets/secondary/underground_path/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/underground_path/palettes/12.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/12.pal
+++ b/data/tilesets/secondary/underground_path/palettes/12.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/underground_path/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/13.pal
+++ b/data/tilesets/secondary/underground_path/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/underground_path/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/14.pal
+++ b/data/tilesets/secondary/underground_path/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/underground_path/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/15.pal
+++ b/data/tilesets/secondary/underground_path/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50DC/palettes/2.pal
+++ b/data/tilesets/secondary/underground_path/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/3.pal
+++ b/data/tilesets/secondary/underground_path/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50DC/palettes/4.pal
+++ b/data/tilesets/secondary/underground_path/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/5.pal
+++ b/data/tilesets/secondary/underground_path/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50DC/palettes/6.pal
+++ b/data/tilesets/secondary/underground_path/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal
index 23e995640..23e995640 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/7.pal
+++ b/data/tilesets/secondary/underground_path/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal
index 3ce3570a1..3ce3570a1 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/8.pal
+++ b/data/tilesets/secondary/underground_path/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/9.pal
+++ b/data/tilesets/secondary/underground_path/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/underground_path/tiles.png
index b8865022d..b8865022d 100644
--- a/data/tilesets/secondary/82D4EE4/tiles.png
+++ b/data/tilesets/secondary/underground_path/tiles.png
diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4DDC/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E84/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/unused_gatehouse1/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4DDC/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse1/tiles.png
diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4E3C/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4F14/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E84/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/unused_gatehouse2/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4E3C/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse2/tiles.png
diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
index 1136f644a..1136f644a 100644
--- a/data/tilesets/secondary/82D4B24/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/vermilion_city/metatiles.bin
index c7978128e..c7978128e 100644
--- a/data/tilesets/secondary/82D4B24/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D507C/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D507C/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/vermilion_city/palettes/10.pal
index 892aae6ed..892aae6ed 100644
--- a/data/tilesets/secondary/82D4B24/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/vermilion_city/palettes/11.pal
index b2a405273..b2a405273 100644
--- a/data/tilesets/secondary/82D4B24/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/vermilion_city/palettes/12.pal
index f124929b4..f124929b4 100644
--- a/data/tilesets/secondary/82D4B24/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/vermilion_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/vermilion_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/vermilion_city/palettes/15.pal
index ac0d32eb0..ac0d32eb0 100644
--- a/data/tilesets/secondary/82D4B24/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D504C/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D50AC/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D50AC/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D50AC/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal
index 17b1a0ed2..17b1a0ed2 100644
--- a/data/tilesets/secondary/82D4B24/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal
index 7179b91bd..7179b91bd 100644
--- a/data/tilesets/secondary/82D4B24/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal
index 746dac7da..746dac7da 100644
--- a/data/tilesets/secondary/82D4B24/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/vermilion_city/tiles.png
index 8cfa9b4dd..8cfa9b4dd 100644
--- a/data/tilesets/secondary/82D4B24/tiles.png
+++ b/data/tilesets/secondary/vermilion_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
index a5e733de0..a5e733de0 100644
--- a/data/tilesets/secondary/82D4D34/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/vermilion_gym/metatiles.bin
index 25a46724b..25a46724b 100644
--- a/data/tilesets/secondary/82D4D34/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F44/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E84/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
index 9fa42f21f..9fa42f21f 100644
--- a/data/tilesets/secondary/82D4D34/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
index 5e2756cc9..5e2756cc9 100644
--- a/data/tilesets/secondary/82D4D34/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E84/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
index efd64bcc5..efd64bcc5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/vermilion_gym/tiles.png
index 1baac0893..1baac0893 100644
--- a/data/tilesets/secondary/82D4D34/tiles.png
+++ b/data/tilesets/secondary/vermilion_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
index ee2d7d5b3..ee2d7d5b3 100644
--- a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/viridian_city/metatiles.bin
index 297673a4b..297673a4b 100644
--- a/data/tilesets/secondary/82D4AC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D50AC/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4B84/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/viridian_city/palettes/10.pal
index 4baf904ae..4baf904ae 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/viridian_city/palettes/11.pal
index 2e92b3cc3..2e92b3cc3 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/viridian_city/palettes/12.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/viridian_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/viridian_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/viridian_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D5064/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4B84/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4B84/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4B84/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal
index 219129eba..219129eba 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal
index 0aa2b58dc..0aa2b58dc 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/viridian_city/tiles.png
index 39b80d8f9..39b80d8f9 100644
--- a/data/tilesets/secondary/82D4AC4/tiles.png
+++ b/data/tilesets/secondary/viridian_city/tiles.png
diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
index 990d6861c..990d6861c 100644
--- a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/viridian_forest/metatiles.bin
index cd0bd5f53..cd0bd5f53 100644
--- a/data/tilesets/secondary/82D4DC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D5004/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D5004/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/viridian_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D5004/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/viridian_forest/palettes/11.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/viridian_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/viridian_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/viridian_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/viridian_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D50AC/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D5004/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D501C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D5004/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D5004/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D5004/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D5004/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/viridian_forest/tiles.png
index 451eb8d5a..451eb8d5a 100644
--- a/data/tilesets/secondary/82D4DC4/tiles.png
+++ b/data/tilesets/secondary/viridian_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
index a84364708..a84364708 100644
--- a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/viridian_gym/metatiles.bin
index 2980877c1..2980877c1 100644
--- a/data/tilesets/secondary/82D4CBC/metatiles.bin
+++ b/data/tilesets/secondary/viridian_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/viridian_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/viridian_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/viridian_gym/palettes/12.pal
index d2c6cb089..d2c6cb089 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/viridian_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/viridian_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/viridian_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4D64/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal
index f55e52fe2..f55e52fe2 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal
index 3a7dbc274..3a7dbc274 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/viridian_gym/tiles.png
index b53b94b96..b53b94b96 100644
--- a/data/tilesets/secondary/82D4CBC/tiles.png
+++ b/data/tilesets/secondary/viridian_gym/tiles.png
diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc
index 5f9b0f49b..645a8a27e 100644
--- a/data/trainer_tower/trainers.inc
+++ b/data/trainer_tower/trainers.inc
@@ -5111,3 +5111,43 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.byte 0x80, 0x6b, 0x01
+
+	.align 2
+gUnknown_84827AC:: @ 84827AC
+	.byte 0x08, 0x01
+	.2byte 0
+	.4byte 0
+
+gUnknown_84827B4:: @ 84827B4
+	.4byte gUnknown_847F16C
+	.4byte gUnknown_847D26C
+	.4byte gUnknown_84808AC
+	.4byte gUnknown_847ABAC
+	.4byte gUnknown_847CAAC
+	.4byte gUnknown_847E9AC
+	.4byte gUnknown_847AF8C
+	.4byte gUnknown_847CE8C
+	.4byte gUnknown_847DA2C
+	.4byte gUnknown_847BF0C
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847DE0C
+	.4byte gUnknown_847B74C
+	.4byte gUnknown_847BB2C
+	.4byte gUnknown_848182C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847C2EC
+	.4byte gUnknown_847C6CC
+	.4byte gUnknown_847E5CC
+	.4byte gUnknown_84804CC
+	.4byte gUnknown_84823CC
+	.4byte gUnknown_8481FEC
+	.4byte gUnknown_84800EC
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847ED8C
+	.4byte gUnknown_848106C
+	.4byte gUnknown_8480C8C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847F54C
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847C6CC
diff --git a/include/AgbRfu_LinkManager.h b/include/AgbRfu_LinkManager.h
new file mode 100644
index 000000000..0970a4233
--- /dev/null
+++ b/include/AgbRfu_LinkManager.h
@@ -0,0 +1,245 @@
+#ifndef GUARD_LINKMANAGER_H
+#define GUARD_LINKMANAGER_H
+
+//-----------------------------------------------------------------
+// Constant definition
+//-----------------------------------------------------------------
+
+// Link Manager operation mode (specified by u8 parent_child argument of rfu_LMAN_establishConnection)
+//#define MODE_CHILD									0		// Start Link Manager in CHILD mode
+//#define MODE_PARENT									1		// Start Link Manager in PARENT mode
+//Note: This value uses the item defined by AgbRFU_LL.h.
+#define MODE_P_C_SWITCH									2		// Start Link Manager in parent-child switching mode.
+
+// Value of lman.p_c_switch_flag
+#define PCSWITCH_1ST_SC_START                                   0x01
+#define PCSWITCH_1ST_SC                                                 0x02
+#define PCSWITCH_2ND_SP_START                                   0x03
+#define PCSWITCH_2ND_SP                                                 0x04
+#define PCSWITCH_3RD_SC_START                                   0x05
+#define PCSWITCH_3RD_SC                                                 0x06
+#define PCSWITCH_CP                                                             0x07
+#define PCSWITCH_SC_LOCK                                                0x08
+#define PCSWITCH_FORCE_SP_START                                 0x09
+
+// Period for which parent-child switching search specified
+#define PCSWITCH_ALL_PERIOD                                             180             // Entire cycle 180 frames
+#define PCSWITCH_SP_PERIOD                                               40             // Child period 40 frames
+
+// Error code returned by Link Manager API (rfu_LMAN_...return value of function)
+#define LMAN_ERROR_MANAGER_BUSY								1	// Link Manager is already running.
+#define LMAN_ERROR_AGB_CLK_SLAVE							2	// AGB is clock slave so link manager cannot run.
+#define LMAN_ERROR_PID_NOT_FOUND							3	// Parent device information of the specified PID does not exist in rfuLinkStatus->partner[0-3].
+#define LMAN_ERROR_ILLEGAL_PARAMETER						4	// Specified argument is unusual.
+#define LMAN_ERROR_NOW_LINK_RECOVERY						5	// New settings were ignored because link recovery was under way when current link recovery was ON and new settings turned link recovery OFF.
+#define LMAN_ERROR_NOW_COMMUNICATION						6	// New settings were ignored because currently communicating with NI.
+#define LMAN_ERROR_NOW_SEARCH_PARENT					7		// Parent search currently under way, so ignore new setting.
+
+// Details of messages and the related parameters returned by the u8 msg, u8 param_count, and lman.param[0-1] arguments of the LMAN callback generated by the operation of the Link Manager.
+//		msg name		                              	msg No.	param qty	param[0]					param[1]		Description
+#define LMAN_MSG_INITIALIZE_COMPLETED					0x00	//	0			-							-			Generated when RFU reset and initial settings are completed
+#define LMAN_MSG_NEW_CHILD_CONNECT_DETECTED				0x10	//	1		Bit indicating slot				-			Generated when new child device connection was detected at RFU level.
+//	      with detected connection
+#define LMAN_MSG_NEW_CHILD_CONNECT_ACCEPTED				0x11	//	1		Bit indicating slot				-			Generated when game identification information from child device connected at RFU level is received and accepted (game serial numbers match).
+//	  	where connection was accepted
+#define LMAN_MSG_NEW_CHILD_CONNECT_REJECTED				0x12	//	1		Bit indicating slot				-			Generated when the connection from the child device connected at RFU level is rejected (game identification information reception failed or game serial numbers do not match).
+//	  	where connection was rejected
+#define LMAN_MSG_SEARCH_CHILD_PERIOD_EXPIRED			0x13	//	0			-							-			Generated when SearchChild operation time expires.
+#define LMAN_MSG_END_WAIT_CHILD_NAME					0x14	//	0			-							-			Generated when reception of game identification information from all child devices completes after the SearchChild operation time expires.
+#define LMAN_MSG_PARENT_FOUND							0x20	//	1		Bit indicating 					-			Generated when valid (game serial numbers match) parent devices are found during SearchParent.
+//      	rfuLinkStatus->partner[x] index number storing the valid parent devices (game serial number matches) from among the discovered parent devices.
+#define LMAN_MSG_SEARCH_PARENT_PERIOD_EXPIRED			0x21	//	0			-							-			Generated when SearchParent time expires.
+#define LMAN_MSG_CONNECT_PARENT_SUCCESSED				0x22	//	1		Connected slot number			-			Generated when connection with parent device at RFU level succeeds.
+#define LMAN_MSG_CONNECT_PARENT_FAILED					0x23	//	1		Connection failure reason		-			Generated when connection with parent device at RFU level fails.
+#define LMAN_MSG_CHILD_NAME_SEND_COMPLETED				0x24	//	0			-							-			Generated when transmission of the child's game identification information to the parent device succeeds after connection with parent device at RFU level succeeds.
+#define LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED	0x25	//	0		-							-			Generated when transmission of the child's game identification information to the parent device fails after connection with parent device at RFU level succeeds.
+#define LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED	0x30	//	1		Bit indicating slot				-			Generated when a link cut is detected and that slot disconnects. (Generated only when link recovery is OFF.)
+//     	that was disconnected and where link cut was detected but link recover not attempted
+#define LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY	0x31	//	1		Bit indicating slot				-			Generated when a link cut is detected and the link recovery process starts. (Generated only when link recovery is ON.)
+//     	where link cut was detected and link recovery was started
+#define LMAN_MSG_LINK_RECOVERY_SUCCESSED				0x32	//	1		Bit indicating slot				-			Generated when link recovery succeeds. (Generated only when link recovery is ON.)
+//		where link recovery succeeded
+#define LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED	0x33	//	1		Bit indicating slot				-			Generated when link recovery fails and that slot disconnects. (Generated only when link recovery is ON.)
+//		where link recovery failed and that disconnected
+#define LMAN_MSG_LINK_DISCONNECTED_BY_USER				0x40	//	1	Generated on disconnection by execution of rfu_REQ_disconnect by disconnected user.
+// 		Slot indicated in bits	*Note: If rfu_REQ_disconnect is used for disconnection during link recovery in the child device, the link recovery is also suspended, but the only message returned is DISCONNECTED_BY_USER.
+#define LMAN_MSG_CHANGE_AGB_CLOCK_SLAVE					0x41	//	0			-							-			Generated when the AGB-RFU clock switches to AGB clock slave after a successful connection or link recovery in the child device. (This message is not generated when the AGB switches to a clock slave when an MSC callback completes.)
+#define LMAN_MSG_CHANGE_AGB_CLOCK_MASTER				0x45	//	0			-							-			Generated when the AGB-RFU intercommunication clock is switched to the AGB clock master in the child device.
+#define LMAN_MSG_RFU_POWER_DOWN							0x42	//	0			-							-			Generated when the RFU enters power conservation mode with rfu_LMAN_powerDownRFU.
+#define LMAN_MSG_MANAGER_STOPPED						0x43	//	0			-							-			Generated when the Link Manager is halted by rfu_LMAN_stopLMAN(0). (This message is not generated during SearchChild, SearchParent, ConnectParent, and LinkRecovery. A message (-PERIOD_EXPIRED, -SUCCESSED, -FAILED) corresponding to the operation completion is returned.)
+#define LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET   0x44	//	0			-							-			Generates when the Link Manager is forcibly halted by rfu_LMAN_stopLMAN(1) and RFU is reset.
+
+#define LMAN_MSG_RECV_DATA_REQ_COMPLETED				0x50	//	0			-							-			Generated when the execution of rfu_REQ_recvData completes. (This message is not notification of data reception from a RFU.)
+
+#define LMAN_MSG_REQ_API_ERROR							0xf0	//	2		REQ_commandID					REQ_result 	REQ-API resulted in error. This message is also generated by an REQ-API executed by either the link manager or the user.
+#define LMAN_MSG_WATCH_DOG_TIMER_ERROR					0xf1	// 	0			-							-			Generated when a MSC callback does not occur even after 6 seconds pass when the AGB is the clock slave.
+#define LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA		0xf2	// 	0			-							-			Generated when an automatic starting DMA, such as HDMA, is issued at the same time the RFU attempts to send notification and to return the AGB to the clock master while the AGB is the clock slave and the exchange of that information (REQ command) fails.
+#define LMAN_MSG_LMAN_API_ERROR_RETURN					0xf3	//  1		Return error code				-			Generated when LMAN-API execution returns an error.
+#define LMAN_MSG_RFU_FATAL_ERROR						0xff	//	0			-							-			Generated when the Link Manager cannot recongize a RFU because of the execution of rfu_REQBN_softReset_and_checkID.
+
+
+// Value of lman.childClockSlave_flag
+#define RFU_CHILD_CLOCK_SLAVE_OFF					0		// The child device is not operating in AGB clock slave mode. (The child device is in this mode in cases such as when the child has not established a connection or during link recovery.)
+#define RFU_CHILD_CLOCK_SLAVE_ON					1		// The child device is operating in AGB clock slave mode. (Child automatically enters this mode when a connection is established.)
+#define RFU_CHILD_CLOCK_SLAVE_OFF_REQ				2		// The child device has requested that AGB clock slave mode be halted.
+
+// State of Link Manager (values of lman.state, lman.next_state)
+#define LMAN_STATE_READY					0x00			// Waiting
+#define LMAN_STATE_SOFT_RESET_AND_CHECK_ID		0x01			// Requesting execution of rfu_REQBN_softResetAndCheckID (same as below)
+#define LMAN_STATE_RESET					0x02			// rfu_REQ_reset
+#define LMAN_STATE_CONFIG_SYSTEM				0x03			// rfu_REQ_configSystem
+#define LMAN_STATE_CONFIG_GAME_DATA				0x04			// rfu_REQ_configGameData
+#define LMAN_STATE_START_SEARCH_CHILD			0x05			// rfu_REQ_startSearchChild
+#define LMAN_STATE_POLL_SEARCH_CHILD			0x06			// rfu_REQ_pollSearchChild
+#define LMAN_STATE_END_SEARCH_CHILD				0x07			// rfu_REQ_endSearchChild
+#define LMAN_STATE_WAIT_RECV_CHILD_NAME			0x08			// Awaiting reception of game name from connected child device.
+#define LMAN_STATE_START_SEARCH_PARENT			0x09			// rfu_REQ_startSearchParent
+#define LMAN_STATE_POLL_SEARCH_PARENT			0x0a			// rfu_REQ_pollSearchParent
+#define LMAN_STATE_END_SEARCH_PARENT			0x0b			// rfu_REQ_endSearchParent
+#define LMAN_STATE_START_CONNECT_PARENT			0x0c			// rfu_REQ_startConnectParent
+#define LMAN_STATE_POLL_CONNECT_PARENT			0x0d			// rfu_REQ_pollConnectParent
+#define LMAN_STATE_END_CONNECT_PARENT			0x0e			// rfu_REQ_endConnectParent
+#define LMAN_STATE_SEND_CHILD_NAME				0x0f			// Sending child game name.
+#define LMAN_STATE_START_LINK_RECOVERY			0x10			// rfu_REQ_CHILD_startConnectRecovery
+#define LMAN_STATE_POLL_LINK_RECOVERY			0x11			// rfu_REQ_CHILD_pollConnectRecovery
+#define LMAN_STATE_END_LINK_RECOVERY			0x12			// rfu_REQ_CHILD_endConnectRecovery
+#define LMAN_STATE_MS_CHANGE					0x13			// rfu_REQ_changeMasterSlave
+#define LMAN_STATE_WAIT_CLOCK_MASTER			0x14			// Waiting for AGB-RFU intercommunication clock to become AGB clock master.
+#define LMAN_STATE_STOP_MODE					0x15			// rfu_REQ_stopMode
+#define LMAN_STATE_BACK_STATE					0x16			// Following the completion of link-recovery processing, return the Link Manager state to the state present before link-recovery processing was initiated.
+#define LMAN_FORCED_STOP_AND_RFU_RESET			0x17			// Attempt to forcibly stop Link Manager using rfu_LMAN_stopLMAN(1).
+#define LMAN_STATE_WAIT_CHANGE_CLOCK_MASTER		0x18			// Attempt to return to AGB clock master after child fails in sending game name.
+
+// RfuTgtData.gname is read as these structs.
+struct GFtgtGnameSub
+{
+    u16 language:4;
+    u16 hasNews:1;
+    u16 hasCard:1;
+    u16 unk_00_6:1;
+    u16 isChampion:1;
+    u16 hasNationalDex:1;
+    u16 gameClear:1;
+    u16 version:4;
+    u16 unk_01_6:2;
+    u8 playerTrainerId[2];
+};
+
+struct __attribute__((packed, aligned(2))) GFtgtGname
+{
+    struct GFtgtGnameSub unk_00;
+    u8 child_sprite_gender[RFU_CHILD_MAX]; // u8 sprite_idx:3;
+    // u8 gender:1;
+    // u8 unk_4:3
+    // u8 active:1
+    u16 species:10;
+    u16 type:6;
+    u8 activity:7;
+    u8 started:1;
+    u8 playerGender:1;
+    u8 level:7;
+    u8 padding;
+}; // size: RFU_GNAME_SIZE
+
+struct Padded_U8
+{
+    u8 value;
+};
+
+// Parameter group used in initial setting run of the link manager (rfu_LMAN_initializeRFU)
+typedef struct InitializeParametersTag {
+    // rfu_REQ_configSystem argument
+    u8 			maxMFrame;							// Maximum number of times to re-transmit of RFU level
+    u8 			MC_TimerCount;						// MC_Timer count (x16.7ms)
+    u16			availSlot_flag;						// Use RFU-API constant "AVAIL_SLOT1-4" to specify the maximum number of child devices (1 - 4) that can be connected to a parent device.
+
+    // rfu_REQB_configGameData argument
+    u8 			mboot_flag;							// Multiplayer boot flag
+    u16			serialNo;							// Game serial number
+    u8 			*gameName;							// Game name
+    u8 			*userName;							// User name
+
+    // ON/OFF flag for parent fast search operation by child.
+    u8  		fastSearchParent_flag;				// Flag indicating whether parent fast search operation to be performed by child.
+
+    // Link recovery settings
+    u8 			linkRecovery_enable;				// Determines whether or not to execute the link recovery process when a link cut occurs
+    u16			linkRecovery_period;				// Time to spend on the link recovery process (x 16.7 ms)  Note: Runs for unlimited time when specifying 0.
+
+    // Setting for NI-type data transmit/receive period
+    u16			NI_failCounter_limit;				//  Limit for failCounter during NI type data transmit/receive (x 16.7 ms) Note: Runs for unlimited time when specifying 0.
+}INIT_PARAM;
+
+
+// Timer that counts with the V-Blank cycle
+typedef struct VblankTimerTag {
+    u8 			active;								// Timer ON/OFF (bits 0 - 3 indicate ON/OFF for each connected slot)
+    u16			count_max;							// Maximum count value (x16.7ms)
+    u16			count[RFU_CHILD_MAX];				// Current count value (x 16.7 ms) for each connected slot
+}VBL_TIMER;
+
+struct UnkLinkRfuStruct_02022B44
+{
+    u8 fill_00[6];
+    u16 unk_06;
+    u8 fill_08[6];
+    vu8 unk_0e;
+    u8 unk_0f;
+    u8 fill_10[0x54];
+    u16 unk_64;
+    u8 fill_66[0x1d];
+    u8 unk_83;
+    u8 fill_84[0x58];
+};
+
+typedef struct linkManagerTag
+{
+    /* 0x000 */ u8 acceptSlot_flag;
+    /* 0x001 */ u8 acceptCount;
+    /* 0x002 */ vu8 childClockSlave_flag;
+    /* 0x003 */ vu8 parentAck_flag;
+    /* 0x004 */ u8 state;
+    /* 0x005 */ u8 next_state;
+    /* 0x006 */ u8 parent_child;
+    /* 0x007 */ u8 pcswitch_flag;
+    /* 0x008 */ u8 RFU_powerOn_flag;
+    /* 0x009 */ u8 linkRecovery_enable;
+    /* 0x00a */ u8 linkRecovery_start_flag;
+    /* 0x00b */ u8 fastSearchParent_flag;
+    /* 0x00c */ u8 connectSlot_flag_old;
+    /* 0x00d */ u8 reserveDisconnectSlot_flag;
+    /* 0x00e */ u8 active;
+    /* 0x00f */ u8 msc_exe_flag;
+    /* 0x010 */ u8 child_slot;
+    /* 0x011 */ u8 state_bak[2];
+    /* 0x014 */ u16 param[2];
+    /* 0x018 */ u16 NI_failCounter_limit;
+    /* 0x01a */ u16 connect_period;
+    /* 0x01c */ u16 pcswitch_period_bak;
+    /* 0x01e */ u16 work;
+    /* 0x020 */ u16 *acceptable_serialNo_list;
+    /* 0x024 */ VBL_TIMER nameAcceptTimer;
+    /* 0x030 */ VBL_TIMER linkRecoveryTimer;
+    /* 0x03c */ INIT_PARAM *init_param;
+    /* 0x040 */ void (*LMAN_callback)(u8, u8);
+    /* 0x044 */ void (*MSC_callback)(u16);
+} LINK_MANAGER;
+
+extern struct linkManagerTag lman;
+
+u32 rfu_LMAN_REQBN_softReset_and_checkID(void);
+void rfu_LMAN_requestChangeAgbClockMaster(void);
+void rfu_LMAN_initializeRFU(INIT_PARAM *init_params);
+u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_accept_period, u16 *acceptable_serialNo_list);
+void rfu_LMAN_stopManager(bool8 forced_stop_and_RFU_reset_flag);
+void rfu_LMAN_setMSCCallback(void (*MSC_callback_p)(u16));
+void rfu_LMAN_REQ_sendData(bool8 clockChangeFlag);
+void rfu_LMAN_powerDownRFU(void);
+u8 rfu_LMAN_CHILD_connectParent(u16 parentId, u16 connect_period);
+u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period);
+void rfu_LMAN_manager_entity(u32 rand);
+void rfu_LMAN_syncVBlank(void);
+u8 rfu_LMAN_initializeManager(void (*LMAN_callback_p)(u8, u8), void (*MSC_callback_p)(u16));
+void rfu_LMAN_forceChangeSP(void);
+
+#endif //GUARD_LINKMANAGER_H
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 87f847aa4..be07320c9 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -33,8 +33,6 @@ void ValidateEReaderTrainer(void);
 u8 GetBattleTowerTrainerFrontSpriteId(void);
 u8 GetEreaderTrainerFrontSpriteId(void);
 void CopyEReaderTrainerName5(u8 *dest);
-void sub_815DC40(u8 *dest, u8 opponentIdx);
-void sub_815DBF4(u8 *dest, u8 opponentIdx);
 void GetBattleTowerTrainerName(u8 *text);
 u8 GetEreaderTrainerClassId(void);
 u8 GetBattleTowerTrainerClassNameId(void);
diff --git a/include/berry_crush.h b/include/berry_crush.h
index 2583aba61..e8e9c216f 100644
--- a/include/berry_crush.h
+++ b/include/berry_crush.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_BERRY_CRUSH_H
 #define GUARD_BERRY_CRUSH_H
 
-void sub_814B754(MainCallback callback);
+void StartBerryCrush(MainCallback callback);
 
 #endif //GUARD_BERRY_CRUSH_H
diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index 6275eaabf..dd1866fb3 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -2,6 +2,7 @@
 #define GUARD_CEREADER_TOOL_H
 
 #include "global.h"
+#include "constants/trainer_tower.h"
 
 struct TrainerTowerTrainer
 {
@@ -21,30 +22,31 @@ struct TrainerTowerFloor
     /* 0x001 */ u8 floorIdx;
     /* 0x002 */ u8 challengeType;
     /* 0x003 */ u8 prize;
-    /* 0x004 */ struct TrainerTowerTrainer trainers[3];
+    /* 0x004 */ struct TrainerTowerTrainer trainers[MAX_TRAINERS_PER_FLOOR];
     /* 0x3DC */ u32 checksum;
 };
 
-struct EReaderTrainerHillSetSubstruct
+struct EReaderTrainerTowerSetSubstruct
 {
-    u8 count;
+    u8 numFloors;
     u8 id;
     u16 dummy;
     u32 checksum;
 };
 
-struct EReaderTrainerHillSet
+struct EReaderTrainerTowerSet
 {
-    u8 count;
+    u8 numFloors;
     u8 id;
     u16 dummy;
     u32 checksum;
-    struct TrainerTowerFloor floors[8];
+    struct TrainerTowerFloor floors[MAX_TRAINER_TOWER_FLOORS];
 };
 
-bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata);
-bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata);
-bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata);
+bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata);
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata);
+bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata);
 u8 sub_815D654(void);
+bool32 ReadTrainerTowerAndValidate(void);
 
 #endif //GUARD_CEREADER_TOOL_H
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 63be37936..a80038f2c 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -71,7 +71,7 @@
 #define BATTLE_TYPE_x800000          0x800000
 #define BATTLE_TYPE_RECORDED         0x1000000
 #define BATTLE_TYPE_x2000000         0x2000000
-#define BATTLE_TYPE_TRAINER_HILL     0x4000000
+#define BATTLE_TYPE_x4000000         0x4000000
 #define BATTLE_TYPE_SECRET_BASE      0x8000000
 #define BATTLE_TYPE_GROUDON          0x10000000
 #define BATTLE_TYPE_KYOGRE           0x20000000
diff --git a/include/constants/coins.h b/include/constants/coins.h
new file mode 100644
index 000000000..3ae3bb23f
--- /dev/null
+++ b/include/constants/coins.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CONSTANTS_COINS_H
+#define GUARD_CONSTANTS_COINS_H
+
+#define MAX_COINS 9999
+
+#endif // GUARD_CONSTANTS_COINS_H
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index 4ef90ed60..7261365c2 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -6,22 +6,7 @@
 #define EASY_CHAT_TYPE_BATTLE_WON              2
 #define EASY_CHAT_TYPE_BATTLE_LOST             3
 #define EASY_CHAT_TYPE_MAIL                    4
-#define EASY_CHAT_TYPE_INTERVIEW               5
-#define EASY_CHAT_TYPE_BARD_SONG               6
-#define EASY_CHAT_TYPE_FAN_CLUB                7
-#define EASY_CHAT_TYPE_UNK_8                   8
-#define EASY_CHAT_TYPE_TRENDY_PHRASE           9
-#define EASY_CHAT_TYPE_GABBY_AND_TY            10
-#define EASY_CHAT_TYPE_CONTEST_INTERVIEW       11
-#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW  12
-#define EASY_CHAT_TYPE_GOOD_SAYING             13
-#define EASY_CHAT_TYPE_FAN_QUESTION            14
-#define EASY_CHAT_TYPE_QUIZ_ANSWER             15
-#define EASY_CHAT_TYPE_QUIZ_QUESTION           16
-#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION       17
-#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER         18
-#define EASY_CHAT_TYPE_APPRENTICE              19
-#define EASY_CHAT_TYPE_QUESTIONNAIRE           20
+#define EASY_CHAT_TYPE_QUESTIONNAIRE           14
 
 #define EC_GROUP_POKEMON_2      0x0
 #define EC_GROUP_TRAINER        0x1
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 3ed7d8ce2..1fd6777f0 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -65,7 +65,7 @@
 #define FLDEFF_PCTURN_ON                 61
 #define FLDEFF_HALL_OF_FAME_RECORD       62
 #define FLDEFF_USE_TELEPORT              63
-#define FLDEFF_UNK_40                    64
+#define FLDEFF_UNK_40                    64 // TODO: game corner smile icon?
 #define FLDEFF_UNK_41                    65 // TODO: related to vs_seeker
 #define FLDEFF_UNK_42                    66 // TODO: related to trainer see
 #define FLDEFF_UNK_43                    67 // TODO: related to deoxys
diff --git a/include/constants/field_tasks.h b/include/constants/field_tasks.h
new file mode 100644
index 000000000..31edb6ffe
--- /dev/null
+++ b/include/constants/field_tasks.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_CONSTANTS_FIELD_TASKS_H
+#define GUARD_CONSTANTS_FIELD_TASKS_H
+
+#define STEP_CB_DUMMY               0
+#define STEP_CB_ASH                 1 // Unused
+#define STEP_CB_FORTREE_BRIDGE      2 // Unused, dummied
+#define STEP_CB_PACIFIDLOG_BRIDGE   3 // Unused, dummied
+#define STEP_CB_ICE                 4
+#define STEP_CB_TRUCK               5 // Unused, dummied
+#define STEP_CB_SECRET_BASE         6 // Unused, dummied
+#define STEP_CB_CRACKED_FLOOR       7 // Unused
+
+#endif // GUARD_CONSTANTS_FIELD_TASKS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 26ffa8a7c..7555f3c6b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1046,7 +1046,7 @@
 #define HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE                            23
 #define HIDDEN_ITEM_SILPH_CO_5F_ELIXIR                                 24
 #define HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION                             25
-#define HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET                      26
+#define HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET              26
 #define HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR                             27
 #define HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE                          28
 #define HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET                         29
@@ -1415,7 +1415,7 @@
 #define FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST                    (SYS_FLAGS + 0xB7)
 #define FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE            (SYS_FLAGS + 0xB8)
 #define FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE                 (SYS_FLAGS + 0xB9)
-#define FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY             (SYS_FLAGS + 0xBA)
+#define FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY                          (SYS_FLAGS + 0xBA)
 #define FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F                    (SYS_FLAGS + 0xBB)
 #define FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE               (SYS_FLAGS + 0xBC)
 #define FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH                      (SYS_FLAGS + 0xBD)
diff --git a/include/constants/global.h b/include/constants/global.h
index 7f3c80bb4..ae9a0da3b 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -34,6 +34,8 @@
 
 #define QUEST_LOG_SCENE_COUNT 4
 
+#define NUM_TOWER_CHALLENGE_TYPES 4
+
 #define MALE   0
 #define FEMALE 1
 #define GENDER_COUNT 2
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 657d531e8..431ca198a 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -4,7 +4,7 @@
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2
 #define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3
-#define LAYOUT_UNUSED_LAYOUT_82D54D8 4
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4
 #define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5
 #define LAYOUT_HOUSE1 6
 #define LAYOUT_HOUSE2 7
@@ -14,53 +14,53 @@
 #define LAYOUT_HOUSE3 11
 #define LAYOUT_CERULEAN_CITY_GYM 12
 #define LAYOUT_HOUSE4 13
-#define LAYOUT_UNUSED_LAYOUT_82D6144 14
+#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 14
 #define LAYOUT_CELADON_CITY_GYM 15
-#define LAYOUT_UNUSED_LAYOUT_82D6490 16
+#define LAYOUT_RS_POKEMON_CENTER_1F 16
 #define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE 17
-#define LAYOUT_UNUSED_LAYOUT_82D6654 18
-#define LAYOUT_UNUSED_LAYOUT_82D672C 19
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 18
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 19
 #define LAYOUT_FUCHSIA_CITY_GYM 20
 #define LAYOUT_HOUSE5 21
-#define LAYOUT_UNUSED_LAYOUT_82D6C34 24
+#define LAYOUT_UNUSED1 24
 #define LAYOUT_VERMILION_CITY_GYM 25
 #define LAYOUT_CERULEAN_CITY_BIKE_SHOP 26
 #define LAYOUT_CELADON_CITY_GAME_CORNER 27
 #define LAYOUT_PEWTER_CITY_GYM 28
 #define LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE 30
 #define LAYOUT_THREE_ISLAND_HOUSE1 31
-#define LAYOUT_UNUSED_LAYOUT_82D75F0 32
-#define LAYOUT_UNUSED_LAYOUT_82D7674 33
+#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 32
+#define LAYOUT_FORTREE_CITY_HOUSE1 33
 #define LAYOUT_SAFFRON_CITY_GYM 34
-#define LAYOUT_UNUSED_LAYOUT_82D7CC8 35
+#define LAYOUT_FORTREE_CITY_HOUSE2 35
 #define LAYOUT_CINNABAR_ISLAND_GYM 36
 #define LAYOUT_VIRIDIAN_CITY_GYM 37
-#define LAYOUT_UNUSED_LAYOUT_82D88C8 46
+#define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46
 #define LAYOUT_BATTLE_COLOSSEUM_2P 47
 #define LAYOUT_TRADE_CENTER 48
 #define LAYOUT_RECORD_CENTER 49
 #define LAYOUT_BATTLE_COLOSSEUM_4P 50
 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
-#define LAYOUT_UNUSED_LAYOUT_82D9B24 52
-#define LAYOUT_UNUSED_LAYOUT_82DA7C8 53
-#define LAYOUT_UNUSED_LAYOUT_82DB46C 54
-#define LAYOUT_UNUSED_LAYOUT_82DB4F0 55
-#define LAYOUT_UNUSED_LAYOUT_82DBBE0 57
-#define LAYOUT_UNUSED_LAYOUT_82DBDD8 62
-#define LAYOUT_UNUSED_LAYOUT_82DBFB8 63
-#define LAYOUT_UNUSED_LAYOUT_82DC4EC 64
-#define LAYOUT_UNUSED_LAYOUT_82DC60C 65
-#define LAYOUT_UNUSED_LAYOUT_82DC72C 66
-#define LAYOUT_UNUSED_LAYOUT_82DC84C 67
-#define LAYOUT_UNUSED_LAYOUT_82DCA70 68
-#define LAYOUT_UNUSED_LAYOUT_82DCB44 69
-#define LAYOUT_UNUSED_LAYOUT_82DCC40 70
-#define LAYOUT_UNUSED_LAYOUT_82DCCD4 71
-#define LAYOUT_UNUSED_LAYOUT_82DCD68 72
-#define LAYOUT_UNUSED_LAYOUT_82DCDFC 73
-#define LAYOUT_UNUSED_LAYOUT_82DCF00 74
-#define LAYOUT_UNUSED_LAYOUT_82DD004 75
-#define LAYOUT_UNUSED_LAYOUT_82DD0DC 77
+#define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52
+#define LAYOUT_RS_SAFARI_ZONE_SOUTHWEST 53
+#define LAYOUT_RS_SAFARI_ZONE_SOUTHEAST 54
+#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 55
+#define LAYOUT_RS_BATTLE_TOWER 57
+#define LAYOUT_SS_TIDAL_CORRIDOR 62
+#define LAYOUT_SS_TIDAL_LOWER_DECK 63
+#define LAYOUT_SS_TIDAL_ROOMS 64
+#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 65
+#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 66
+#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 67
+#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 68
+#define LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F 69
+#define LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F 70
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 71
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 72
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 73
+#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 74
+#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 75
+#define LAYOUT_RS_SAFARI_ZONE_REST_HOUSE 77
 #define LAYOUT_PALLET_TOWN 78
 #define LAYOUT_VIRIDIAN_CITY 79
 #define LAYOUT_PEWTER_CITY 80
@@ -71,7 +71,7 @@
 #define LAYOUT_FUCHSIA_CITY 85
 #define LAYOUT_CINNABAR_ISLAND 86
 #define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
-#define LAYOUT_SAFFRON_CITY_CLASSIC 88
+#define LAYOUT_SAFFRON_CITY_CONNECTION 88
 #define LAYOUT_ROUTE1 89
 #define LAYOUT_ROUTE2 90
 #define LAYOUT_ROUTE3 91
@@ -208,8 +208,8 @@
 #define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223
 #define LAYOUT_ENTRANCE_1F 224
 #define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225
-#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226
-#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227
+#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F 226
+#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F 227
 #define LAYOUT_SAFFRON_CITY_DOJO 228
 #define LAYOUT_SILPH_CO_ELEVATOR 229
 #define LAYOUT_ONE_ISLAND 230
@@ -224,10 +224,10 @@
 #define LAYOUT_TWO_ISLAND_CAPE_BRINK 239
 #define LAYOUT_THREE_ISLAND_BOND_BRIDGE 240
 #define LAYOUT_THREE_ISLAND_PORT 241
-#define LAYOUT_UNKNOWN_MAP_03_50 242
-#define LAYOUT_UNKNOWN_MAP_03_51 243
-#define LAYOUT_UNKNOWN_MAP_03_52 244
-#define LAYOUT_UNKNOWN_MAP_03_53 245
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_6 242
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_7 243
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_8 244
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_9 245
 #define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS 246
 #define LAYOUT_FIVE_ISLAND_WATER_LABYRINTH 247
 #define LAYOUT_FIVE_ISLAND_MEADOW 248
@@ -240,17 +240,17 @@
 #define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE 255
 #define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON 256
 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS 257
-#define LAYOUT_UNUSED_LAYOUT_833614C 258
-#define LAYOUT_UNUSED_LAYOUT_83377F0 259
-#define LAYOUT_UNUSED_LAYOUT_8338354 260
-#define LAYOUT_UNUSED_LAYOUT_8338738 261
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_22 258
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST 259
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST 260
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_24 261
 #define LAYOUT_UNION_ROOM 262
 #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263
-#define LAYOUT_UNUSED_LAYOUT_8338B4C 264
+#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN 264
 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265
 #define LAYOUT_VIRIDIAN_CITY_HOUSE2 266
-#define LAYOUT_UNUSED_LAYOUT_8338E90 267
-#define LAYOUT_UNUSED_LAYOUT_833902C 268
+#define LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE 267
+#define LAYOUT_CELADON_CITY_HOTEL_DUPLICATE 268
 #define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269
 #define LAYOUT_THREE_ISLAND_BERRY_FOREST 270
 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F 271
@@ -279,17 +279,17 @@
 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294
 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F 295
 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK 296
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F 300
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F 301
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F 302
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F 303
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F 304
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F 305
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306
-#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307
+#define LAYOUT_TRAINER_TOWER_LOBBY 297
+#define LAYOUT_TRAINER_TOWER_1F 298
+#define LAYOUT_TRAINER_TOWER_2F 299
+#define LAYOUT_TRAINER_TOWER_3F 300
+#define LAYOUT_TRAINER_TOWER_4F 301
+#define LAYOUT_TRAINER_TOWER_5F 302
+#define LAYOUT_TRAINER_TOWER_6F 303
+#define LAYOUT_TRAINER_TOWER_7F 304
+#define LAYOUT_TRAINER_TOWER_8F 305
+#define LAYOUT_TRAINER_TOWER_ROOF 306
+#define LAYOUT_TRAINER_TOWER_ELEVATOR 307
 #define LAYOUT_CERULEAN_CITY_HOUSE5 308
 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F 309
 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310
@@ -301,7 +301,7 @@
 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
 #define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317
 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
-#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319
+#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT 319
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322
@@ -348,22 +348,22 @@
 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER 363
 #define LAYOUT_NAVEL_ROCK_B1F 364
 #define LAYOUT_NAVEL_ROCK_FORK 365
-#define LAYOUT_UNUSED_LAYOUT_834BC2C 366
-#define LAYOUT_UNUSED_LAYOUT_834BEB4 367
-#define LAYOUT_UNUSED_LAYOUT_834C13C 368
-#define LAYOUT_UNUSED_LAYOUT_834C3C4 369
-#define LAYOUT_UNUSED_LAYOUT_834C64C 370
-#define LAYOUT_UNUSED_LAYOUT_834C8D4 371
-#define LAYOUT_UNUSED_LAYOUT_834CB5C 372
-#define LAYOUT_UNUSED_LAYOUT_834CDE4 373
-#define LAYOUT_UNUSED_LAYOUT_834D06C 374
-#define LAYOUT_UNUSED_LAYOUT_834D2F4 375
-#define LAYOUT_UNUSED_LAYOUT_834D57C 376
-#define LAYOUT_UNUSED_LAYOUT_834D804 377
-#define LAYOUT_UNUSED_LAYOUT_834DA8C 378
-#define LAYOUT_UNUSED_LAYOUT_834DD14 379
-#define LAYOUT_UNUSED_LAYOUT_834DF9C 380
-#define LAYOUT_UNUSED_LAYOUT_834E224 381
+#define LAYOUT_TRAINER_TOWER_1F_DOUBLES 366
+#define LAYOUT_TRAINER_TOWER_2F_DOUBLES 367
+#define LAYOUT_TRAINER_TOWER_3F_DOUBLES 368
+#define LAYOUT_TRAINER_TOWER_4F_DOUBLES 369
+#define LAYOUT_TRAINER_TOWER_5F_DOUBLES 370
+#define LAYOUT_TRAINER_TOWER_6F_DOUBLES 371
+#define LAYOUT_TRAINER_TOWER_7F_DOUBLES 372
+#define LAYOUT_TRAINER_TOWER_8F_DOUBLES 373
+#define LAYOUT_TRAINER_TOWER_1F_KNOCKOUT 374
+#define LAYOUT_TRAINER_TOWER_2F_KNOCKOUT 375
+#define LAYOUT_TRAINER_TOWER_3F_KNOCKOUT 376
+#define LAYOUT_TRAINER_TOWER_4F_KNOCKOUT 377
+#define LAYOUT_TRAINER_TOWER_5F_KNOCKOUT 378
+#define LAYOUT_TRAINER_TOWER_6F_KNOCKOUT 379
+#define LAYOUT_TRAINER_TOWER_7F_KNOCKOUT 380
+#define LAYOUT_TRAINER_TOWER_8F_KNOCKOUT 381
 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1 382
 #define LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA 383
 
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 0cc1c27fb..27e74b337 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -135,17 +135,17 @@
 
 // Map Group 2
 #define MAP_NAVEL_ROCK_EXTERIOR                       (0 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_1F             (1 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_2F             (2 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_3F             (3 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_4F             (4 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_5F             (5 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_6F             (6 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_7F             (7 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_8F             (8 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF           (9 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY          (10 | (2 << 8))
-#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR       (11 | (2 << 8))
+#define MAP_TRAINER_TOWER_1F                          (1 | (2 << 8))
+#define MAP_TRAINER_TOWER_2F                          (2 | (2 << 8))
+#define MAP_TRAINER_TOWER_3F                          (3 | (2 << 8))
+#define MAP_TRAINER_TOWER_4F                          (4 | (2 << 8))
+#define MAP_TRAINER_TOWER_5F                          (5 | (2 << 8))
+#define MAP_TRAINER_TOWER_6F                          (6 | (2 << 8))
+#define MAP_TRAINER_TOWER_7F                          (7 | (2 << 8))
+#define MAP_TRAINER_TOWER_8F                          (8 | (2 << 8))
+#define MAP_TRAINER_TOWER_ROOF                        (9 | (2 << 8))
+#define MAP_TRAINER_TOWER_LOBBY                       (10 | (2 << 8))
+#define MAP_TRAINER_TOWER_ELEVATOR                    (11 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE            (12 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM1               (13 | (2 << 8))
 #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM2               (14 | (2 << 8))
@@ -207,7 +207,7 @@
 #define MAP_CINNABAR_ISLAND                      (8 | (3 << 8))
 #define MAP_INDIGO_PLATEAU_EXTERIOR              (9 | (3 << 8))
 #define MAP_SAFFRON_CITY                         (10 | (3 << 8))
-#define MAP_SAFFRON_CITY_CLASSIC                 (11 | (3 << 8))
+#define MAP_SAFFRON_CITY_CONNECTION              (11 | (3 << 8))
 #define MAP_ONE_ISLAND                           (12 | (3 << 8))
 #define MAP_TWO_ISLAND                           (13 | (3 << 8))
 #define MAP_THREE_ISLAND                         (14 | (3 << 8))
@@ -246,10 +246,10 @@
 #define MAP_TWO_ISLAND_CAPE_BRINK                (47 | (3 << 8))
 #define MAP_THREE_ISLAND_BOND_BRIDGE             (48 | (3 << 8))
 #define MAP_THREE_ISLAND_PORT                    (49 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_50                    (50 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_51                    (51 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_52                    (52 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_53                    (53 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_6               (50 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_7               (51 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_8               (52 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_9               (53 | (3 << 8))
 #define MAP_FIVE_ISLAND_RESORT_GORGEOUS          (54 | (3 << 8))
 #define MAP_FIVE_ISLAND_WATER_LABYRINTH          (55 | (3 << 8))
 #define MAP_FIVE_ISLAND_MEADOW                   (56 | (3 << 8))
@@ -366,15 +366,15 @@
 #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8))
 
 // Map Group 14
-#define MAP_SAFFRON_CITY_HOUSE1_1F                (0 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE1_2F                (1 | (14 << 8))
+#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F        (0 | (14 << 8))
+#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F        (1 | (14 << 8))
 #define MAP_SAFFRON_CITY_DOJO                     (2 | (14 << 8))
 #define MAP_SAFFRON_CITY_GYM                      (3 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE2                   (4 | (14 << 8))
+#define MAP_SAFFRON_CITY_HOUSE                    (4 | (14 << 8))
 #define MAP_SAFFRON_CITY_MART                     (5 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_CENTER_1F        (6 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_CENTER_2F        (7 | (14 << 8))
-#define MAP_SAFFRON_CITY_HOUSE3                   (8 | (14 << 8))
+#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE        (8 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8))
 
 // Map Group 15
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 8726113f4..b71e7d08f 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -1,14 +1,14 @@
 #ifndef GUARD_METATILE_LABELS_H
 #define GUARD_METATILE_LABELS_H
 
-// General
+// gTileset_General
 #define METATILE_General_CalmWater  0x12B
 
-// PokeMart
-#define METATILE_Shop_CounterMid_Top     0x2BF
-#define METATILE_Shop_CounterMid_Bottom  0x2C0     
+// gTileset_Mart
+#define METATILE_Mart_CounterMid_Top     0x2BF
+#define METATILE_Mart_CounterMid_Bottom  0x2C0     
 
-// Vermilion Gym
+// gTileset_VermilionGym
 #define METATILE_VermilionGym_Floor                             0x281
 #define METATILE_VermilionGym_Beam_MidTop                       0x285
 #define METATILE_VermilionGym_Beam_MidBottom                    0x28D
@@ -39,7 +39,16 @@
 #define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
 #define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn      0x2C7
 
-// Pokemon Mansion
+// gTileset_GameCorner
+#define METATILE_GameCorner_Floor_ShadeFull          0x292
+#define METATILE_GameCorner_Floor_StairsTop          0x29D
+#define METATILE_GameCorner_StairsTop                0x29E
+#define METATILE_GameCorner_StairsBottom             0x29F
+#define METATILE_GameCorner_PurpleWall_Floor         0x2CF
+#define METATILE_GameCorner_PurpleWall_StairsTop     0x2A6
+#define METATILE_GameCorner_PurpleWall_stairsBottom  0x2A7
+
+// gTileset_PokemonMansion
 #define METATILE_PokemonMansion_Floor                                    0x284
 #define METATILE_PokemonMansion_Floor_ShadeFull                          0x285
 #define METATILE_PokemonMansion_BasementFloor                            0x286
@@ -72,7 +81,19 @@
 #define METATILE_PokemonMansion_Statue_RedEyes_Shade                     0x34E
 #define METATILE_PokemonMansion_Statue_RedEyes_Basement                  0x34F
 
-// Cinnabar Gym
+// gTileset_SilphCo  TODO: Bring below metatile labels in line with new tileset name
+#define METATILE_Hideout_Arrow_Up               0x2A0
+#define METATILE_Hideout_Arrow_Left             0x2A1
+#define METATILE_Hideout_Arrow_Down             0x2A8
+#define METATILE_Hideout_Arrow_RIght            0x2A9   
+#define METATILE_Hideout_Barrier_TopLeft_Floor  0x2CE
+#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF
+#define METATILE_Hideout_Barrier_BottomLeft     0x2D6
+#define METATILE_Hideout_Barrier_BottomRight    0x2D7
+#define METATILE_Hideout_Floor                  0x281
+#define METATILE_Hideout_Floor_ShadeFull        0x282
+
+// gTileset_CinnabarGym
 #define METATILE_CinnabarGym_Floor                  0x281
 #define METATILE_CinnabarGym_Floor_ShadeDiagonal    0x282
 #define METATILE_CinnabarGym_Floor_ShadeFull        0x289
@@ -82,8 +103,28 @@
 #define METATILE_CinnabarGym_Floor_WallLeftEdge     0x2CF
 #define METATILE_CinnabarGym_Wall_RetractedBarrier  0x2D1
 
-// gTileset_82D504C. Below metatile probably needs generic name
+// gTileset_PokemonLeague
+#define METATILE_PokemonLeague_Door_Top_Open             0x28E
+#define METATILE_PokemonLeague_Door_Mid_Open             0x296
+#define METATILE_PokemonLeague_Entry_TopLeft_Closed      0x29D
+#define METATILE_PokemonLeague_Entry_TopMid_Closed       0x29E
+#define METATILE_PokemonLeague_Entry_TopRight_Closed     0x29F
+#define METATILE_PokemonLeague_Entry_BottomLeft_Closed   0x2A5
+#define METATILE_PokemonLeague_Entry_BottomMid_Closed    0x2A6
+#define METATILE_PokemonLeague_Entry_BottomRight_Closed  0x2A7
+#define METATILE_PokemonLeague_Floor_ShadeFull_Lance     0x311
+
+// gTileset_MtEmber
 #define METATILE_MtEmber_CaveEntrance  0x346
 
+// gTileset_Cave
+#define METATILE_Cave_Floor_Ledge_Top    0x2D1
+#define METATILE_Cave_Floor_Ledge_Bottom 0x2E1
+#define METATILE_Cave_RockBarrier_Top    0x307
+#define METATILE_Cave_RockBarrier_Bottom 0x317
+
+// gTileset_TrainerTower
+#define METATILE_TrainerTower_Floor_ShadeBottomLeft  0x287
+#define METATILE_TrainerTower_CounterBarrier         0x2B4
 
 #endif // GUARD_METATILE_LABELS_H
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 28ce39cd3..0c958ccc5 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -64,7 +64,6 @@
 #define PARTY_MENU_TYPE_UNION_ROOM_TRADE          9  // trading board
 #define PARTY_MENU_TYPE_SPIN_TRADE                10 // Unused beta for Gen IV's Spin Trade
 #define PARTY_MENU_TYPE_MINIGAME                  11
-#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS  12
 
 #define PARTY_ACTION_CHOOSE_MON         0
 #define PARTY_ACTION_SEND_OUT           1
diff --git a/include/constants/species.h b/include/constants/species.h
index bedb1282d..89da836f7 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -705,583 +705,582 @@
 #define NATIONAL_DEX_HO_OH 250
 #define NATIONAL_DEX_CELEBI 251
 
-#define NATIONAL_DEX_OLD_UNOWN_B 387
-#define NATIONAL_DEX_OLD_UNOWN_C 388
-#define NATIONAL_DEX_OLD_UNOWN_D 389
-#define NATIONAL_DEX_OLD_UNOWN_E 390
-#define NATIONAL_DEX_OLD_UNOWN_F 391
-#define NATIONAL_DEX_OLD_UNOWN_G 392
-#define NATIONAL_DEX_OLD_UNOWN_H 393
-#define NATIONAL_DEX_OLD_UNOWN_I 394
-#define NATIONAL_DEX_OLD_UNOWN_J 395
-#define NATIONAL_DEX_OLD_UNOWN_K 396
-#define NATIONAL_DEX_OLD_UNOWN_L 397
-#define NATIONAL_DEX_OLD_UNOWN_M 398
-#define NATIONAL_DEX_OLD_UNOWN_N 399
-#define NATIONAL_DEX_OLD_UNOWN_O 400
-#define NATIONAL_DEX_OLD_UNOWN_P 401
-#define NATIONAL_DEX_OLD_UNOWN_Q 402
-#define NATIONAL_DEX_OLD_UNOWN_R 403
-#define NATIONAL_DEX_OLD_UNOWN_S 404
-#define NATIONAL_DEX_OLD_UNOWN_T 405
-#define NATIONAL_DEX_OLD_UNOWN_U 406
-#define NATIONAL_DEX_OLD_UNOWN_V 407
-#define NATIONAL_DEX_OLD_UNOWN_W 408
-#define NATIONAL_DEX_OLD_UNOWN_X 409
-#define NATIONAL_DEX_OLD_UNOWN_Y 410
-#define NATIONAL_DEX_OLD_UNOWN_Z 411
-
-#define NATIONAL_DEX_TREECKO 252
-#define NATIONAL_DEX_GROVYLE 253
-#define NATIONAL_DEX_SCEPTILE 254
-#define NATIONAL_DEX_TORCHIC 255
-#define NATIONAL_DEX_COMBUSKEN 256
-#define NATIONAL_DEX_BLAZIKEN 257
-#define NATIONAL_DEX_MUDKIP 258
-#define NATIONAL_DEX_MARSHTOMP 259
-#define NATIONAL_DEX_SWAMPERT 260
-#define NATIONAL_DEX_POOCHYENA 261
-#define NATIONAL_DEX_MIGHTYENA 262
-#define NATIONAL_DEX_ZIGZAGOON 263
-#define NATIONAL_DEX_LINOONE 264
-#define NATIONAL_DEX_WURMPLE 265
-#define NATIONAL_DEX_SILCOON 266
-#define NATIONAL_DEX_BEAUTIFLY 267
-#define NATIONAL_DEX_CASCOON 268
-#define NATIONAL_DEX_DUSTOX 269
-#define NATIONAL_DEX_LOTAD 270
-#define NATIONAL_DEX_LOMBRE 271
-#define NATIONAL_DEX_LUDICOLO 272
-#define NATIONAL_DEX_SEEDOT 273
-#define NATIONAL_DEX_NUZLEAF 274
-#define NATIONAL_DEX_SHIFTRY 275
-#define NATIONAL_DEX_NINCADA 290
-#define NATIONAL_DEX_NINJASK 291
-#define NATIONAL_DEX_SHEDINJA 292
-#define NATIONAL_DEX_TAILLOW 276
-#define NATIONAL_DEX_SWELLOW 277
-#define NATIONAL_DEX_SHROOMISH 285
-#define NATIONAL_DEX_BRELOOM 286
-#define NATIONAL_DEX_SPINDA 327
-#define NATIONAL_DEX_WINGULL 278
-#define NATIONAL_DEX_PELIPPER 279
-#define NATIONAL_DEX_SURSKIT 283
+#define NATIONAL_DEX_TREECKO    252
+#define NATIONAL_DEX_GROVYLE    253
+#define NATIONAL_DEX_SCEPTILE   254
+#define NATIONAL_DEX_TORCHIC    255
+#define NATIONAL_DEX_COMBUSKEN  256
+#define NATIONAL_DEX_BLAZIKEN   257
+#define NATIONAL_DEX_MUDKIP     258
+#define NATIONAL_DEX_MARSHTOMP  259
+#define NATIONAL_DEX_SWAMPERT   260
+#define NATIONAL_DEX_POOCHYENA  261
+#define NATIONAL_DEX_MIGHTYENA  262
+#define NATIONAL_DEX_ZIGZAGOON  263
+#define NATIONAL_DEX_LINOONE    264
+#define NATIONAL_DEX_WURMPLE    265
+#define NATIONAL_DEX_SILCOON    266
+#define NATIONAL_DEX_BEAUTIFLY  267
+#define NATIONAL_DEX_CASCOON    268
+#define NATIONAL_DEX_DUSTOX     269
+#define NATIONAL_DEX_LOTAD      270
+#define NATIONAL_DEX_LOMBRE     271
+#define NATIONAL_DEX_LUDICOLO   272
+#define NATIONAL_DEX_SEEDOT     273
+#define NATIONAL_DEX_NUZLEAF    274
+#define NATIONAL_DEX_SHIFTRY    275
+#define NATIONAL_DEX_TAILLOW    276
+#define NATIONAL_DEX_SWELLOW    277
+#define NATIONAL_DEX_WINGULL    278
+#define NATIONAL_DEX_PELIPPER   279
+#define NATIONAL_DEX_RALTS      280
+#define NATIONAL_DEX_KIRLIA     281
+#define NATIONAL_DEX_GARDEVOIR  282
+#define NATIONAL_DEX_SURSKIT    283
 #define NATIONAL_DEX_MASQUERAIN 284
-#define NATIONAL_DEX_WAILMER 320
-#define NATIONAL_DEX_WAILORD 321
-#define NATIONAL_DEX_SKITTY 300
-#define NATIONAL_DEX_DELCATTY 301
-#define NATIONAL_DEX_KECLEON 352
-#define NATIONAL_DEX_BALTOY 343
-#define NATIONAL_DEX_CLAYDOL 344
-#define NATIONAL_DEX_NOSEPASS 299
-#define NATIONAL_DEX_TORKOAL 324
-#define NATIONAL_DEX_SABLEYE 302
-#define NATIONAL_DEX_BARBOACH 339
-#define NATIONAL_DEX_WHISCASH 340
-#define NATIONAL_DEX_LUVDISC 370
-#define NATIONAL_DEX_CORPHISH 341
-#define NATIONAL_DEX_CRAWDAUNT 342
-#define NATIONAL_DEX_FEEBAS 349
-#define NATIONAL_DEX_MILOTIC 350
-#define NATIONAL_DEX_CARVANHA 318
-#define NATIONAL_DEX_SHARPEDO 319
-#define NATIONAL_DEX_TRAPINCH 328
-#define NATIONAL_DEX_VIBRAVA 329
-#define NATIONAL_DEX_FLYGON 330
-#define NATIONAL_DEX_MAKUHITA 296
-#define NATIONAL_DEX_HARIYAMA 297
-#define NATIONAL_DEX_ELECTRIKE 309
-#define NATIONAL_DEX_MANECTRIC 310
-#define NATIONAL_DEX_NUMEL 322
-#define NATIONAL_DEX_CAMERUPT 323
-#define NATIONAL_DEX_SPHEAL 363
-#define NATIONAL_DEX_SEALEO 364
-#define NATIONAL_DEX_WALREIN 365
-#define NATIONAL_DEX_CACNEA 331
-#define NATIONAL_DEX_CACTURNE 332
-#define NATIONAL_DEX_SNORUNT 361
-#define NATIONAL_DEX_GLALIE 362
-#define NATIONAL_DEX_LUNATONE 337
-#define NATIONAL_DEX_SOLROCK 338
-#define NATIONAL_DEX_AZURILL 298
-#define NATIONAL_DEX_SPOINK 325
-#define NATIONAL_DEX_GRUMPIG 326
-#define NATIONAL_DEX_PLUSLE 311
-#define NATIONAL_DEX_MINUN 312
-#define NATIONAL_DEX_MAWILE 303
-#define NATIONAL_DEX_MEDITITE 307
-#define NATIONAL_DEX_MEDICHAM 308
-#define NATIONAL_DEX_SWABLU 333
-#define NATIONAL_DEX_ALTARIA 334
-#define NATIONAL_DEX_WYNAUT 360
-#define NATIONAL_DEX_DUSKULL 355
-#define NATIONAL_DEX_DUSCLOPS 356
-#define NATIONAL_DEX_ROSELIA 315
-#define NATIONAL_DEX_SLAKOTH 287
-#define NATIONAL_DEX_VIGOROTH 288
-#define NATIONAL_DEX_SLAKING 289
-#define NATIONAL_DEX_GULPIN 316
-#define NATIONAL_DEX_SWALOT 317
-#define NATIONAL_DEX_TROPIUS 357
-#define NATIONAL_DEX_WHISMUR 293
-#define NATIONAL_DEX_LOUDRED 294
-#define NATIONAL_DEX_EXPLOUD 295
-#define NATIONAL_DEX_CLAMPERL 366
-#define NATIONAL_DEX_HUNTAIL 367
-#define NATIONAL_DEX_GOREBYSS 368
-#define NATIONAL_DEX_ABSOL 359
-#define NATIONAL_DEX_SHUPPET 353
-#define NATIONAL_DEX_BANETTE 354
-#define NATIONAL_DEX_SEVIPER 336
-#define NATIONAL_DEX_ZANGOOSE 335
-#define NATIONAL_DEX_RELICANTH 369
-#define NATIONAL_DEX_ARON 304
-#define NATIONAL_DEX_LAIRON 305
-#define NATIONAL_DEX_AGGRON 306
-#define NATIONAL_DEX_CASTFORM 351
-#define NATIONAL_DEX_VOLBEAT 313
-#define NATIONAL_DEX_ILLUMISE 314
-#define NATIONAL_DEX_LILEEP 345
-#define NATIONAL_DEX_CRADILY 346
-#define NATIONAL_DEX_ANORITH 347
-#define NATIONAL_DEX_ARMALDO 348
-#define NATIONAL_DEX_RALTS 280
-#define NATIONAL_DEX_KIRLIA 281
-#define NATIONAL_DEX_GARDEVOIR 282
-#define NATIONAL_DEX_BAGON 371
-#define NATIONAL_DEX_SHELGON 372
-#define NATIONAL_DEX_SALAMENCE 373
-#define NATIONAL_DEX_BELDUM 374
-#define NATIONAL_DEX_METANG 375
-#define NATIONAL_DEX_METAGROSS 376
-#define NATIONAL_DEX_REGIROCK 377
-#define NATIONAL_DEX_REGICE 378
-#define NATIONAL_DEX_REGISTEEL 379
-#define NATIONAL_DEX_KYOGRE 382
-#define NATIONAL_DEX_GROUDON 383
-#define NATIONAL_DEX_RAYQUAZA 384
-#define NATIONAL_DEX_LATIAS 380
-#define NATIONAL_DEX_LATIOS 381
-#define NATIONAL_DEX_JIRACHI 385
-#define NATIONAL_DEX_DEOXYS 386
-#define NATIONAL_DEX_CHIMECHO 358
+#define NATIONAL_DEX_SHROOMISH  285
+#define NATIONAL_DEX_BRELOOM    286
+#define NATIONAL_DEX_SLAKOTH    287
+#define NATIONAL_DEX_VIGOROTH   288
+#define NATIONAL_DEX_SLAKING    289
+#define NATIONAL_DEX_NINCADA    290
+#define NATIONAL_DEX_NINJASK    291
+#define NATIONAL_DEX_SHEDINJA   292
+#define NATIONAL_DEX_WHISMUR    293
+#define NATIONAL_DEX_LOUDRED    294
+#define NATIONAL_DEX_EXPLOUD    295
+#define NATIONAL_DEX_MAKUHITA   296
+#define NATIONAL_DEX_HARIYAMA   297
+#define NATIONAL_DEX_AZURILL    298
+#define NATIONAL_DEX_NOSEPASS   299
+#define NATIONAL_DEX_SKITTY     300
+#define NATIONAL_DEX_DELCATTY   301
+#define NATIONAL_DEX_SABLEYE    302
+#define NATIONAL_DEX_MAWILE     303
+#define NATIONAL_DEX_ARON       304
+#define NATIONAL_DEX_LAIRON     305
+#define NATIONAL_DEX_AGGRON     306
+#define NATIONAL_DEX_MEDITITE   307
+#define NATIONAL_DEX_MEDICHAM   308
+#define NATIONAL_DEX_ELECTRIKE  309
+#define NATIONAL_DEX_MANECTRIC  310
+#define NATIONAL_DEX_PLUSLE     311
+#define NATIONAL_DEX_MINUN      312
+#define NATIONAL_DEX_VOLBEAT    313
+#define NATIONAL_DEX_ILLUMISE   314
+#define NATIONAL_DEX_ROSELIA    315
+#define NATIONAL_DEX_GULPIN     316
+#define NATIONAL_DEX_SWALOT     317
+#define NATIONAL_DEX_CARVANHA   318
+#define NATIONAL_DEX_SHARPEDO   319
+#define NATIONAL_DEX_WAILMER    320
+#define NATIONAL_DEX_WAILORD    321
+#define NATIONAL_DEX_NUMEL      322
+#define NATIONAL_DEX_CAMERUPT   323
+#define NATIONAL_DEX_TORKOAL    324
+#define NATIONAL_DEX_SPOINK     325
+#define NATIONAL_DEX_GRUMPIG    326
+#define NATIONAL_DEX_SPINDA     327
+#define NATIONAL_DEX_TRAPINCH   328
+#define NATIONAL_DEX_VIBRAVA    329
+#define NATIONAL_DEX_FLYGON     330
+#define NATIONAL_DEX_CACNEA     331
+#define NATIONAL_DEX_CACTURNE   332
+#define NATIONAL_DEX_SWABLU     333
+#define NATIONAL_DEX_ALTARIA    334
+#define NATIONAL_DEX_ZANGOOSE   335
+#define NATIONAL_DEX_SEVIPER    336
+#define NATIONAL_DEX_LUNATONE   337
+#define NATIONAL_DEX_SOLROCK    338
+#define NATIONAL_DEX_BARBOACH   339
+#define NATIONAL_DEX_WHISCASH   340
+#define NATIONAL_DEX_CORPHISH   341
+#define NATIONAL_DEX_CRAWDAUNT  342
+#define NATIONAL_DEX_BALTOY     343
+#define NATIONAL_DEX_CLAYDOL    344
+#define NATIONAL_DEX_LILEEP     345
+#define NATIONAL_DEX_CRADILY    346
+#define NATIONAL_DEX_ANORITH    347
+#define NATIONAL_DEX_ARMALDO    348
+#define NATIONAL_DEX_FEEBAS     349
+#define NATIONAL_DEX_MILOTIC    350
+#define NATIONAL_DEX_CASTFORM   351
+#define NATIONAL_DEX_KECLEON    352
+#define NATIONAL_DEX_SHUPPET    353
+#define NATIONAL_DEX_BANETTE    354
+#define NATIONAL_DEX_DUSKULL    355
+#define NATIONAL_DEX_DUSCLOPS   356
+#define NATIONAL_DEX_TROPIUS    357
+#define NATIONAL_DEX_CHIMECHO   358
+#define NATIONAL_DEX_ABSOL      359
+#define NATIONAL_DEX_WYNAUT     360
+#define NATIONAL_DEX_SNORUNT    361
+#define NATIONAL_DEX_GLALIE     362
+#define NATIONAL_DEX_SPHEAL     363
+#define NATIONAL_DEX_SEALEO     364
+#define NATIONAL_DEX_WALREIN    365
+#define NATIONAL_DEX_CLAMPERL   366
+#define NATIONAL_DEX_HUNTAIL    367
+#define NATIONAL_DEX_GOREBYSS   368
+#define NATIONAL_DEX_RELICANTH  369
+#define NATIONAL_DEX_LUVDISC    370
+#define NATIONAL_DEX_BAGON      371
+#define NATIONAL_DEX_SHELGON    372
+#define NATIONAL_DEX_SALAMENCE  373
+#define NATIONAL_DEX_BELDUM     374
+#define NATIONAL_DEX_METANG     375
+#define NATIONAL_DEX_METAGROSS  376
+#define NATIONAL_DEX_REGIROCK   377
+#define NATIONAL_DEX_REGICE     378
+#define NATIONAL_DEX_REGISTEEL  379
+#define NATIONAL_DEX_LATIAS     380
+#define NATIONAL_DEX_LATIOS     381
+#define NATIONAL_DEX_KYOGRE     382
+#define NATIONAL_DEX_GROUDON    383
+#define NATIONAL_DEX_RAYQUAZA   384
+#define NATIONAL_DEX_JIRACHI    385
+#define NATIONAL_DEX_DEOXYS     386
 
-// Hoenn Dex Index Defines
+#define NATIONAL_DEX_OLD_UNOWN_B    387
+#define NATIONAL_DEX_OLD_UNOWN_C    388
+#define NATIONAL_DEX_OLD_UNOWN_D    389
+#define NATIONAL_DEX_OLD_UNOWN_E    390
+#define NATIONAL_DEX_OLD_UNOWN_F    391
+#define NATIONAL_DEX_OLD_UNOWN_G    392
+#define NATIONAL_DEX_OLD_UNOWN_H    393
+#define NATIONAL_DEX_OLD_UNOWN_I    394
+#define NATIONAL_DEX_OLD_UNOWN_J    395
+#define NATIONAL_DEX_OLD_UNOWN_K    396
+#define NATIONAL_DEX_OLD_UNOWN_L    397
+#define NATIONAL_DEX_OLD_UNOWN_M    398
+#define NATIONAL_DEX_OLD_UNOWN_N    399
+#define NATIONAL_DEX_OLD_UNOWN_O    400
+#define NATIONAL_DEX_OLD_UNOWN_P    401
+#define NATIONAL_DEX_OLD_UNOWN_Q    402
+#define NATIONAL_DEX_OLD_UNOWN_R    403
+#define NATIONAL_DEX_OLD_UNOWN_S    404
+#define NATIONAL_DEX_OLD_UNOWN_T    405
+#define NATIONAL_DEX_OLD_UNOWN_U    406
+#define NATIONAL_DEX_OLD_UNOWN_V    407
+#define NATIONAL_DEX_OLD_UNOWN_W    408
+#define NATIONAL_DEX_OLD_UNOWN_X    409
+#define NATIONAL_DEX_OLD_UNOWN_Y    410
+#define NATIONAL_DEX_OLD_UNOWN_Z    411
 
-#define HOENN_DEX_NONE 0
-#define HOENN_DEX_BULBASAUR 203
-#define HOENN_DEX_IVYSAUR 204
-#define HOENN_DEX_VENUSAUR 205
-#define HOENN_DEX_CHARMANDER 206
-#define HOENN_DEX_CHARMELEON 207
-#define HOENN_DEX_CHARIZARD 208
-#define HOENN_DEX_SQUIRTLE 209
-#define HOENN_DEX_WARTORTLE 210
-#define HOENN_DEX_BLASTOISE 211
-#define HOENN_DEX_CATERPIE 212
-#define HOENN_DEX_METAPOD 213
-#define HOENN_DEX_BUTTERFREE 214
-#define HOENN_DEX_WEEDLE 215
-#define HOENN_DEX_KAKUNA 216
-#define HOENN_DEX_BEEDRILL 217
-#define HOENN_DEX_PIDGEY 218
-#define HOENN_DEX_PIDGEOTTO 219
-#define HOENN_DEX_PIDGEOT 220
-#define HOENN_DEX_RATTATA 221
-#define HOENN_DEX_RATICATE 222
-#define HOENN_DEX_SPEAROW 223
-#define HOENN_DEX_FEAROW 224
-#define HOENN_DEX_EKANS 225
-#define HOENN_DEX_ARBOK 226
-#define HOENN_DEX_PIKACHU 156
-#define HOENN_DEX_RAICHU 157
-#define HOENN_DEX_SANDSHREW 112
-#define HOENN_DEX_SANDSLASH 113
-#define HOENN_DEX_NIDORAN_F 227
-#define HOENN_DEX_NIDORINA 228
-#define HOENN_DEX_NIDOQUEEN 229
-#define HOENN_DEX_NIDORAN_M 230
-#define HOENN_DEX_NIDORINO 231
-#define HOENN_DEX_NIDOKING 232
-#define HOENN_DEX_CLEFAIRY 233
-#define HOENN_DEX_CLEFABLE 234
-#define HOENN_DEX_VULPIX 153
-#define HOENN_DEX_NINETALES 154
-#define HOENN_DEX_JIGGLYPUFF 138
-#define HOENN_DEX_WIGGLYTUFF 139
-#define HOENN_DEX_ZUBAT 63
-#define HOENN_DEX_GOLBAT 64
-#define HOENN_DEX_ODDISH 88
-#define HOENN_DEX_GLOOM 89
-#define HOENN_DEX_VILEPLUME 90
-#define HOENN_DEX_PARAS 235
-#define HOENN_DEX_PARASECT 236
-#define HOENN_DEX_VENONAT 237
-#define HOENN_DEX_VENOMOTH 238
-#define HOENN_DEX_DIGLETT 239
-#define HOENN_DEX_DUGTRIO 240
-#define HOENN_DEX_MEOWTH 241
-#define HOENN_DEX_PERSIAN 242
-#define HOENN_DEX_PSYDUCK 158
-#define HOENN_DEX_GOLDUCK 159
-#define HOENN_DEX_MANKEY 243
-#define HOENN_DEX_PRIMEAPE 244
-#define HOENN_DEX_GROWLITHE 245
-#define HOENN_DEX_ARCANINE 246
-#define HOENN_DEX_POLIWAG 247
-#define HOENN_DEX_POLIWHIRL 248
-#define HOENN_DEX_POLIWRATH 249
-#define HOENN_DEX_ABRA 39
-#define HOENN_DEX_KADABRA 40
-#define HOENN_DEX_ALAKAZAM 41
-#define HOENN_DEX_MACHOP 73
-#define HOENN_DEX_MACHOKE 74
-#define HOENN_DEX_MACHAMP 75
-#define HOENN_DEX_BELLSPROUT 250
-#define HOENN_DEX_WEEPINBELL 251
-#define HOENN_DEX_VICTREEBEL 252
-#define HOENN_DEX_TENTACOOL 66
-#define HOENN_DEX_TENTACRUEL 67
-#define HOENN_DEX_GEODUDE 57
-#define HOENN_DEX_GRAVELER 58
-#define HOENN_DEX_GOLEM 59
-#define HOENN_DEX_PONYTA 253
-#define HOENN_DEX_RAPIDASH 254
-#define HOENN_DEX_SLOWPOKE 255
-#define HOENN_DEX_SLOWBRO 256
-#define HOENN_DEX_MAGNEMITE 82
-#define HOENN_DEX_MAGNETON 83
-#define HOENN_DEX_FARFETCHD 257
-#define HOENN_DEX_DODUO 92
-#define HOENN_DEX_DODRIO 93
-#define HOENN_DEX_SEEL 258
-#define HOENN_DEX_DEWGONG 259
-#define HOENN_DEX_GRIMER 106
-#define HOENN_DEX_MUK 107
-#define HOENN_DEX_SHELLDER 260
-#define HOENN_DEX_CLOYSTER 261
-#define HOENN_DEX_GASTLY 262
-#define HOENN_DEX_HAUNTER 263
-#define HOENN_DEX_GENGAR 264
-#define HOENN_DEX_ONIX 265
-#define HOENN_DEX_DROWZEE 266
-#define HOENN_DEX_HYPNO 267
-#define HOENN_DEX_KRABBY 268
-#define HOENN_DEX_KINGLER 269
-#define HOENN_DEX_VOLTORB 84
-#define HOENN_DEX_ELECTRODE 85
-#define HOENN_DEX_EXEGGCUTE 270
-#define HOENN_DEX_EXEGGUTOR 271
-#define HOENN_DEX_CUBONE 272
-#define HOENN_DEX_MAROWAK 273
-#define HOENN_DEX_HITMONLEE 274
-#define HOENN_DEX_HITMONCHAN 275
-#define HOENN_DEX_LICKITUNG 276
-#define HOENN_DEX_KOFFING 108
-#define HOENN_DEX_WEEZING 109
-#define HOENN_DEX_RHYHORN 169
-#define HOENN_DEX_RHYDON 170
-#define HOENN_DEX_CHANSEY 277
-#define HOENN_DEX_TANGELA 278
-#define HOENN_DEX_KANGASKHAN 279
-#define HOENN_DEX_HORSEA 184
-#define HOENN_DEX_SEADRA 185
-#define HOENN_DEX_GOLDEEN 50
-#define HOENN_DEX_SEAKING 51
-#define HOENN_DEX_STARYU 143
-#define HOENN_DEX_STARMIE 144
-#define HOENN_DEX_MR_MIME 280
-#define HOENN_DEX_SCYTHER 281
-#define HOENN_DEX_JYNX 282
-#define HOENN_DEX_ELECTABUZZ 283
-#define HOENN_DEX_MAGMAR 284
-#define HOENN_DEX_PINSIR 167
-#define HOENN_DEX_TAUROS 285
-#define HOENN_DEX_MAGIKARP 52
-#define HOENN_DEX_GYARADOS 53
-#define HOENN_DEX_LAPRAS 286
-#define HOENN_DEX_DITTO 287
-#define HOENN_DEX_EEVEE 288
-#define HOENN_DEX_VAPOREON 289
-#define HOENN_DEX_JOLTEON 290
-#define HOENN_DEX_FLAREON 291
-#define HOENN_DEX_PORYGON 292
-#define HOENN_DEX_OMANYTE 293
-#define HOENN_DEX_OMASTAR 294
-#define HOENN_DEX_KABUTO 295
-#define HOENN_DEX_KABUTOPS 296
-#define HOENN_DEX_AERODACTYL 297
-#define HOENN_DEX_SNORLAX 298
-#define HOENN_DEX_ARTICUNO 299
-#define HOENN_DEX_ZAPDOS 300
-#define HOENN_DEX_MOLTRES 301
-#define HOENN_DEX_DRATINI 302
-#define HOENN_DEX_DRAGONAIR 303
-#define HOENN_DEX_DRAGONITE 304
-#define HOENN_DEX_MEWTWO 305
-#define HOENN_DEX_MEW 306
-#define HOENN_DEX_CHIKORITA 307
-#define HOENN_DEX_BAYLEEF 308
-#define HOENN_DEX_MEGANIUM 309
-#define HOENN_DEX_CYNDAQUIL 310
-#define HOENN_DEX_QUILAVA 311
-#define HOENN_DEX_TYPHLOSION 312
-#define HOENN_DEX_TOTODILE 313
-#define HOENN_DEX_CROCONAW 314
-#define HOENN_DEX_FERALIGATR 315
-#define HOENN_DEX_SENTRET 316
-#define HOENN_DEX_FURRET 317
-#define HOENN_DEX_HOOTHOOT 318
-#define HOENN_DEX_NOCTOWL 319
-#define HOENN_DEX_LEDYBA 320
-#define HOENN_DEX_LEDIAN 321
-#define HOENN_DEX_SPINARAK 322
-#define HOENN_DEX_ARIADOS 323
-#define HOENN_DEX_CROBAT 65
-#define HOENN_DEX_CHINCHOU 181
-#define HOENN_DEX_LANTURN 182
-#define HOENN_DEX_PICHU 155
-#define HOENN_DEX_CLEFFA 324
-#define HOENN_DEX_IGGLYBUFF 137
-#define HOENN_DEX_TOGEPI 325
-#define HOENN_DEX_TOGETIC 326
-#define HOENN_DEX_NATU 162
-#define HOENN_DEX_XATU 163
-#define HOENN_DEX_MAREEP 327
-#define HOENN_DEX_FLAAFFY 328
-#define HOENN_DEX_AMPHAROS 329
-#define HOENN_DEX_BELLOSSOM 91
-#define HOENN_DEX_MARILL 55
-#define HOENN_DEX_AZUMARILL 56
-#define HOENN_DEX_SUDOWOODO 330
-#define HOENN_DEX_POLITOED 331
-#define HOENN_DEX_HOPPIP 332
-#define HOENN_DEX_SKIPLOOM 333
-#define HOENN_DEX_JUMPLUFF 334
-#define HOENN_DEX_AIPOM 335
-#define HOENN_DEX_SUNKERN 336
-#define HOENN_DEX_SUNFLORA 337
-#define HOENN_DEX_YANMA 338
-#define HOENN_DEX_WOOPER 339
-#define HOENN_DEX_QUAGSIRE 340
-#define HOENN_DEX_ESPEON 341
-#define HOENN_DEX_UMBREON 342
-#define HOENN_DEX_MURKROW 343
-#define HOENN_DEX_SLOWKING 344
-#define HOENN_DEX_MISDREAVUS 345
-#define HOENN_DEX_UNOWN 346
-#define HOENN_DEX_WOBBUFFET 161
-#define HOENN_DEX_GIRAFARIG 164
-#define HOENN_DEX_PINECO 347
-#define HOENN_DEX_FORRETRESS 348
-#define HOENN_DEX_DUNSPARCE 349
-#define HOENN_DEX_GLIGAR 350
-#define HOENN_DEX_STEELIX 351
-#define HOENN_DEX_SNUBBULL 352
-#define HOENN_DEX_GRANBULL 353
-#define HOENN_DEX_QWILFISH 354
-#define HOENN_DEX_SCIZOR 355
-#define HOENN_DEX_SHUCKLE 356
-#define HOENN_DEX_HERACROSS 168
-#define HOENN_DEX_SNEASEL 357
-#define HOENN_DEX_TEDDIURSA 358
-#define HOENN_DEX_URSARING 359
-#define HOENN_DEX_SLUGMA 103
-#define HOENN_DEX_MAGCARGO 104
-#define HOENN_DEX_SWINUB 360
-#define HOENN_DEX_PILOSWINE 361
-#define HOENN_DEX_CORSOLA 180
-#define HOENN_DEX_REMORAID 362
-#define HOENN_DEX_OCTILLERY 363
-#define HOENN_DEX_DELIBIRD 364
-#define HOENN_DEX_MANTINE 365
-#define HOENN_DEX_SKARMORY 115
-#define HOENN_DEX_HOUNDOUR 366
-#define HOENN_DEX_HOUNDOOM 367
-#define HOENN_DEX_KINGDRA 186
-#define HOENN_DEX_PHANPY 165
-#define HOENN_DEX_DONPHAN 166
-#define HOENN_DEX_PORYGON2 368
-#define HOENN_DEX_STANTLER 369
-#define HOENN_DEX_SMEARGLE 370
-#define HOENN_DEX_TYROGUE 371
-#define HOENN_DEX_HITMONTOP 372
-#define HOENN_DEX_SMOOCHUM 373
-#define HOENN_DEX_ELEKID 374
-#define HOENN_DEX_MAGBY 375
-#define HOENN_DEX_MILTANK 376
-#define HOENN_DEX_BLISSEY 377
-#define HOENN_DEX_RAIKOU 378
-#define HOENN_DEX_ENTEI 379
-#define HOENN_DEX_SUICUNE 380
-#define HOENN_DEX_LARVITAR 381
-#define HOENN_DEX_PUPITAR 382
-#define HOENN_DEX_TYRANITAR 383
-#define HOENN_DEX_LUGIA 384
-#define HOENN_DEX_HO_OH 385
-#define HOENN_DEX_CELEBI 386
+// Hoenn Dex Index Defines
+#define HOENN_DEX_NONE          0
+#define HOENN_DEX_TREECKO       1
+#define HOENN_DEX_GROVYLE       2
+#define HOENN_DEX_SCEPTILE      3
+#define HOENN_DEX_TORCHIC       4
+#define HOENN_DEX_COMBUSKEN     5
+#define HOENN_DEX_BLAZIKEN      6
+#define HOENN_DEX_MUDKIP        7
+#define HOENN_DEX_MARSHTOMP     8
+#define HOENN_DEX_SWAMPERT      9
+#define HOENN_DEX_POOCHYENA     10
+#define HOENN_DEX_MIGHTYENA     11
+#define HOENN_DEX_ZIGZAGOON     12
+#define HOENN_DEX_LINOONE       13
+#define HOENN_DEX_WURMPLE       14
+#define HOENN_DEX_SILCOON       15
+#define HOENN_DEX_BEAUTIFLY     16
+#define HOENN_DEX_CASCOON       17
+#define HOENN_DEX_DUSTOX        18
+#define HOENN_DEX_LOTAD         19
+#define HOENN_DEX_LOMBRE        20
+#define HOENN_DEX_LUDICOLO      21
+#define HOENN_DEX_SEEDOT        22
+#define HOENN_DEX_NUZLEAF       23
+#define HOENN_DEX_SHIFTRY       24
+#define HOENN_DEX_TAILLOW       25
+#define HOENN_DEX_SWELLOW       26
+#define HOENN_DEX_WINGULL       27
+#define HOENN_DEX_PELIPPER      28
+#define HOENN_DEX_RALTS         29
+#define HOENN_DEX_KIRLIA        30
+#define HOENN_DEX_GARDEVOIR     31
+#define HOENN_DEX_SURSKIT       32
+#define HOENN_DEX_MASQUERAIN    33
+#define HOENN_DEX_SHROOMISH     34
+#define HOENN_DEX_BRELOOM       35
+#define HOENN_DEX_SLAKOTH       36
+#define HOENN_DEX_VIGOROTH      37
+#define HOENN_DEX_SLAKING       38
+#define HOENN_DEX_ABRA          39
+#define HOENN_DEX_KADABRA       40
+#define HOENN_DEX_ALAKAZAM      41
+#define HOENN_DEX_NINCADA       42
+#define HOENN_DEX_NINJASK       43
+#define HOENN_DEX_SHEDINJA      44
+#define HOENN_DEX_WHISMUR       45
+#define HOENN_DEX_LOUDRED       46
+#define HOENN_DEX_EXPLOUD       47
+#define HOENN_DEX_MAKUHITA      48
+#define HOENN_DEX_HARIYAMA      49
+#define HOENN_DEX_GOLDEEN       50
+#define HOENN_DEX_SEAKING       51
+#define HOENN_DEX_MAGIKARP      52
+#define HOENN_DEX_GYARADOS      53
+#define HOENN_DEX_AZURILL       54
+#define HOENN_DEX_MARILL        55
+#define HOENN_DEX_AZUMARILL     56
+#define HOENN_DEX_GEODUDE       57
+#define HOENN_DEX_GRAVELER      58
+#define HOENN_DEX_GOLEM         59
+#define HOENN_DEX_NOSEPASS      60
+#define HOENN_DEX_SKITTY        61
+#define HOENN_DEX_DELCATTY      62
+#define HOENN_DEX_ZUBAT         63
+#define HOENN_DEX_GOLBAT        64
+#define HOENN_DEX_CROBAT        65
+#define HOENN_DEX_TENTACOOL     66
+#define HOENN_DEX_TENTACRUEL    67
+#define HOENN_DEX_SABLEYE       68
+#define HOENN_DEX_MAWILE        69
+#define HOENN_DEX_ARON          70
+#define HOENN_DEX_LAIRON        71
+#define HOENN_DEX_AGGRON        72
+#define HOENN_DEX_MACHOP        73
+#define HOENN_DEX_MACHOKE       74
+#define HOENN_DEX_MACHAMP       75
+#define HOENN_DEX_MEDITITE      76
+#define HOENN_DEX_MEDICHAM      77
+#define HOENN_DEX_ELECTRIKE     78
+#define HOENN_DEX_MANECTRIC     79
+#define HOENN_DEX_PLUSLE        80
+#define HOENN_DEX_MINUN         81
+#define HOENN_DEX_MAGNEMITE     82
+#define HOENN_DEX_MAGNETON      83
+#define HOENN_DEX_VOLTORB       84
+#define HOENN_DEX_ELECTRODE     85
+#define HOENN_DEX_VOLBEAT       86
+#define HOENN_DEX_ILLUMISE      87
+#define HOENN_DEX_ODDISH        88
+#define HOENN_DEX_GLOOM         89
+#define HOENN_DEX_VILEPLUME     90
+#define HOENN_DEX_BELLOSSOM     91
+#define HOENN_DEX_DODUO         92
+#define HOENN_DEX_DODRIO        93
+#define HOENN_DEX_ROSELIA       94
+#define HOENN_DEX_GULPIN        95
+#define HOENN_DEX_SWALOT        96
+#define HOENN_DEX_CARVANHA      97
+#define HOENN_DEX_SHARPEDO      98
+#define HOENN_DEX_WAILMER       99
+#define HOENN_DEX_WAILORD       100
+#define HOENN_DEX_NUMEL         101
+#define HOENN_DEX_CAMERUPT      102
+#define HOENN_DEX_SLUGMA        103
+#define HOENN_DEX_MAGCARGO      104
+#define HOENN_DEX_TORKOAL       105
+#define HOENN_DEX_GRIMER        106
+#define HOENN_DEX_MUK           107
+#define HOENN_DEX_KOFFING       108
+#define HOENN_DEX_WEEZING       109
+#define HOENN_DEX_SPOINK        110
+#define HOENN_DEX_GRUMPIG       111
+#define HOENN_DEX_SANDSHREW     112
+#define HOENN_DEX_SANDSLASH     113
+#define HOENN_DEX_SPINDA        114
+#define HOENN_DEX_SKARMORY      115
+#define HOENN_DEX_TRAPINCH      116
+#define HOENN_DEX_VIBRAVA       117
+#define HOENN_DEX_FLYGON        118
+#define HOENN_DEX_CACNEA        119
+#define HOENN_DEX_CACTURNE      120
+#define HOENN_DEX_SWABLU        121
+#define HOENN_DEX_ALTARIA       122
+#define HOENN_DEX_ZANGOOSE      123
+#define HOENN_DEX_SEVIPER       124
+#define HOENN_DEX_LUNATONE      125
+#define HOENN_DEX_SOLROCK       126
+#define HOENN_DEX_BARBOACH      127
+#define HOENN_DEX_WHISCASH      128
+#define HOENN_DEX_CORPHISH      129
+#define HOENN_DEX_CRAWDAUNT     130
+#define HOENN_DEX_BALTOY        131
+#define HOENN_DEX_CLAYDOL       132
+#define HOENN_DEX_LILEEP        133
+#define HOENN_DEX_CRADILY       134
+#define HOENN_DEX_ANORITH       135
+#define HOENN_DEX_ARMALDO       136
+#define HOENN_DEX_IGGLYBUFF     137
+#define HOENN_DEX_JIGGLYPUFF    138
+#define HOENN_DEX_WIGGLYTUFF    139
+#define HOENN_DEX_FEEBAS        140
+#define HOENN_DEX_MILOTIC       141
+#define HOENN_DEX_CASTFORM      142
+#define HOENN_DEX_STARYU        143
+#define HOENN_DEX_STARMIE       144
+#define HOENN_DEX_KECLEON       145
+#define HOENN_DEX_SHUPPET       146
+#define HOENN_DEX_BANETTE       147
+#define HOENN_DEX_DUSKULL       148
+#define HOENN_DEX_DUSCLOPS      149
+#define HOENN_DEX_TROPIUS       150
+#define HOENN_DEX_CHIMECHO      151
+#define HOENN_DEX_ABSOL         152
+#define HOENN_DEX_VULPIX        153
+#define HOENN_DEX_NINETALES     154
+#define HOENN_DEX_PICHU         155
+#define HOENN_DEX_PIKACHU       156
+#define HOENN_DEX_RAICHU        157
+#define HOENN_DEX_PSYDUCK       158
+#define HOENN_DEX_GOLDUCK       159
+#define HOENN_DEX_WYNAUT        160
+#define HOENN_DEX_WOBBUFFET     161
+#define HOENN_DEX_NATU          162
+#define HOENN_DEX_XATU          163
+#define HOENN_DEX_GIRAFARIG     164
+#define HOENN_DEX_PHANPY        165
+#define HOENN_DEX_DONPHAN       166
+#define HOENN_DEX_PINSIR        167
+#define HOENN_DEX_HERACROSS     168
+#define HOENN_DEX_RHYHORN       169
+#define HOENN_DEX_RHYDON        170
+#define HOENN_DEX_SNORUNT       171
+#define HOENN_DEX_GLALIE        172
+#define HOENN_DEX_SPHEAL        173
+#define HOENN_DEX_SEALEO        174
+#define HOENN_DEX_WALREIN       175
+#define HOENN_DEX_CLAMPERL      176
+#define HOENN_DEX_HUNTAIL       177
+#define HOENN_DEX_GOREBYSS      178
+#define HOENN_DEX_RELICANTH     179
+#define HOENN_DEX_CORSOLA       180
+#define HOENN_DEX_CHINCHOU      181
+#define HOENN_DEX_LANTURN       182
+#define HOENN_DEX_LUVDISC       183
+#define HOENN_DEX_HORSEA        184
+#define HOENN_DEX_SEADRA        185
+#define HOENN_DEX_KINGDRA       186
+#define HOENN_DEX_BAGON         187
+#define HOENN_DEX_SHELGON       188
+#define HOENN_DEX_SALAMENCE     189
+#define HOENN_DEX_BELDUM        190
+#define HOENN_DEX_METANG        191
+#define HOENN_DEX_METAGROSS     192
+#define HOENN_DEX_REGIROCK      193
+#define HOENN_DEX_REGICE        194
+#define HOENN_DEX_REGISTEEL     195
+#define HOENN_DEX_LATIAS        196
+#define HOENN_DEX_LATIOS        197
+#define HOENN_DEX_KYOGRE        198
+#define HOENN_DEX_GROUDON       199
+#define HOENN_DEX_RAYQUAZA      200
+#define HOENN_DEX_JIRACHI       201
+#define HOENN_DEX_DEOXYS        202
 
-#define HOENN_DEX_OLD_UNOWN_B 387
-#define HOENN_DEX_OLD_UNOWN_C 388
-#define HOENN_DEX_OLD_UNOWN_D 389
-#define HOENN_DEX_OLD_UNOWN_E 390
-#define HOENN_DEX_OLD_UNOWN_F 391
-#define HOENN_DEX_OLD_UNOWN_G 392
-#define HOENN_DEX_OLD_UNOWN_H 393
-#define HOENN_DEX_OLD_UNOWN_I 394
-#define HOENN_DEX_OLD_UNOWN_J 395
-#define HOENN_DEX_OLD_UNOWN_K 396
-#define HOENN_DEX_OLD_UNOWN_L 397
-#define HOENN_DEX_OLD_UNOWN_M 398
-#define HOENN_DEX_OLD_UNOWN_N 399
-#define HOENN_DEX_OLD_UNOWN_O 400
-#define HOENN_DEX_OLD_UNOWN_P 401
-#define HOENN_DEX_OLD_UNOWN_Q 402
-#define HOENN_DEX_OLD_UNOWN_R 403
-#define HOENN_DEX_OLD_UNOWN_S 404
-#define HOENN_DEX_OLD_UNOWN_T 405
-#define HOENN_DEX_OLD_UNOWN_U 406
-#define HOENN_DEX_OLD_UNOWN_V 407
-#define HOENN_DEX_OLD_UNOWN_W 408
-#define HOENN_DEX_OLD_UNOWN_X 409
-#define HOENN_DEX_OLD_UNOWN_Y 410
-#define HOENN_DEX_OLD_UNOWN_Z 411
+#define HOENN_DEX_BULBASAUR     203
+#define HOENN_DEX_IVYSAUR       204
+#define HOENN_DEX_VENUSAUR      205
+#define HOENN_DEX_CHARMANDER    206
+#define HOENN_DEX_CHARMELEON    207
+#define HOENN_DEX_CHARIZARD     208
+#define HOENN_DEX_SQUIRTLE      209
+#define HOENN_DEX_WARTORTLE     210
+#define HOENN_DEX_BLASTOISE     211
+#define HOENN_DEX_CATERPIE      212
+#define HOENN_DEX_METAPOD       213
+#define HOENN_DEX_BUTTERFREE    214
+#define HOENN_DEX_WEEDLE        215
+#define HOENN_DEX_KAKUNA        216
+#define HOENN_DEX_BEEDRILL      217
+#define HOENN_DEX_PIDGEY        218
+#define HOENN_DEX_PIDGEOTTO     219
+#define HOENN_DEX_PIDGEOT       220
+#define HOENN_DEX_RATTATA       221
+#define HOENN_DEX_RATICATE      222
+#define HOENN_DEX_SPEAROW       223
+#define HOENN_DEX_FEAROW        224
+#define HOENN_DEX_EKANS         225
+#define HOENN_DEX_ARBOK         226
+#define HOENN_DEX_NIDORAN_F     227
+#define HOENN_DEX_NIDORINA      228
+#define HOENN_DEX_NIDOQUEEN     229
+#define HOENN_DEX_NIDORAN_M     230
+#define HOENN_DEX_NIDORINO      231
+#define HOENN_DEX_NIDOKING      232
+#define HOENN_DEX_CLEFAIRY      233
+#define HOENN_DEX_CLEFABLE      234
+#define HOENN_DEX_PARAS         235
+#define HOENN_DEX_PARASECT      236
+#define HOENN_DEX_VENONAT       237
+#define HOENN_DEX_VENOMOTH      238
+#define HOENN_DEX_DIGLETT       239
+#define HOENN_DEX_DUGTRIO       240
+#define HOENN_DEX_MEOWTH        241
+#define HOENN_DEX_PERSIAN       242
+#define HOENN_DEX_MANKEY        243
+#define HOENN_DEX_PRIMEAPE      244
+#define HOENN_DEX_GROWLITHE     245
+#define HOENN_DEX_ARCANINE      246
+#define HOENN_DEX_POLIWAG       247
+#define HOENN_DEX_POLIWHIRL     248
+#define HOENN_DEX_POLIWRATH     249
+#define HOENN_DEX_BELLSPROUT    250
+#define HOENN_DEX_WEEPINBELL    251
+#define HOENN_DEX_VICTREEBEL    252
+#define HOENN_DEX_PONYTA        253
+#define HOENN_DEX_RAPIDASH      254
+#define HOENN_DEX_SLOWPOKE      255
+#define HOENN_DEX_SLOWBRO       256
+#define HOENN_DEX_FARFETCHD     257
+#define HOENN_DEX_SEEL          258
+#define HOENN_DEX_DEWGONG       259
+#define HOENN_DEX_SHELLDER      260
+#define HOENN_DEX_CLOYSTER      261
+#define HOENN_DEX_GASTLY        262
+#define HOENN_DEX_HAUNTER       263
+#define HOENN_DEX_GENGAR        264
+#define HOENN_DEX_ONIX          265
+#define HOENN_DEX_DROWZEE       266
+#define HOENN_DEX_HYPNO         267
+#define HOENN_DEX_KRABBY        268
+#define HOENN_DEX_KINGLER       269
+#define HOENN_DEX_EXEGGCUTE     270
+#define HOENN_DEX_EXEGGUTOR     271
+#define HOENN_DEX_CUBONE        272
+#define HOENN_DEX_MAROWAK       273
+#define HOENN_DEX_HITMONLEE     274
+#define HOENN_DEX_HITMONCHAN    275
+#define HOENN_DEX_LICKITUNG     276
+#define HOENN_DEX_CHANSEY       277
+#define HOENN_DEX_TANGELA       278
+#define HOENN_DEX_KANGASKHAN    279
+#define HOENN_DEX_MR_MIME       280
+#define HOENN_DEX_SCYTHER       281
+#define HOENN_DEX_JYNX          282
+#define HOENN_DEX_ELECTABUZZ    283
+#define HOENN_DEX_MAGMAR        284
+#define HOENN_DEX_TAUROS        285
+#define HOENN_DEX_LAPRAS        286
+#define HOENN_DEX_DITTO         287
+#define HOENN_DEX_EEVEE         288
+#define HOENN_DEX_VAPOREON      289
+#define HOENN_DEX_JOLTEON       290
+#define HOENN_DEX_FLAREON       291
+#define HOENN_DEX_PORYGON       292
+#define HOENN_DEX_OMANYTE       293
+#define HOENN_DEX_OMASTAR       294
+#define HOENN_DEX_KABUTO        295
+#define HOENN_DEX_KABUTOPS      296
+#define HOENN_DEX_AERODACTYL    297
+#define HOENN_DEX_SNORLAX       298
+#define HOENN_DEX_ARTICUNO      299
+#define HOENN_DEX_ZAPDOS        300
+#define HOENN_DEX_MOLTRES       301
+#define HOENN_DEX_DRATINI       302
+#define HOENN_DEX_DRAGONAIR     303
+#define HOENN_DEX_DRAGONITE     304
+#define HOENN_DEX_MEWTWO        305
+#define HOENN_DEX_MEW           306
+#define HOENN_DEX_CHIKORITA     307
+#define HOENN_DEX_BAYLEEF       308
+#define HOENN_DEX_MEGANIUM      309
+#define HOENN_DEX_CYNDAQUIL     310
+#define HOENN_DEX_QUILAVA       311
+#define HOENN_DEX_TYPHLOSION    312
+#define HOENN_DEX_TOTODILE      313
+#define HOENN_DEX_CROCONAW      314
+#define HOENN_DEX_FERALIGATR    315
+#define HOENN_DEX_SENTRET       316
+#define HOENN_DEX_FURRET        317
+#define HOENN_DEX_HOOTHOOT      318
+#define HOENN_DEX_NOCTOWL       319
+#define HOENN_DEX_LEDYBA        320
+#define HOENN_DEX_LEDIAN        321
+#define HOENN_DEX_SPINARAK      322
+#define HOENN_DEX_ARIADOS       323
+#define HOENN_DEX_CLEFFA        324
+#define HOENN_DEX_TOGEPI        325
+#define HOENN_DEX_TOGETIC       326
+#define HOENN_DEX_MAREEP        327
+#define HOENN_DEX_FLAAFFY       328
+#define HOENN_DEX_AMPHAROS      329
+#define HOENN_DEX_SUDOWOODO     330
+#define HOENN_DEX_POLITOED      331
+#define HOENN_DEX_HOPPIP        332
+#define HOENN_DEX_SKIPLOOM      333
+#define HOENN_DEX_JUMPLUFF      334
+#define HOENN_DEX_AIPOM         335
+#define HOENN_DEX_SUNKERN       336
+#define HOENN_DEX_SUNFLORA      337
+#define HOENN_DEX_YANMA         338
+#define HOENN_DEX_WOOPER        339
+#define HOENN_DEX_QUAGSIRE      340
+#define HOENN_DEX_ESPEON        341
+#define HOENN_DEX_UMBREON       342
+#define HOENN_DEX_MURKROW       343
+#define HOENN_DEX_SLOWKING      344
+#define HOENN_DEX_MISDREAVUS    345
+#define HOENN_DEX_UNOWN         346
+#define HOENN_DEX_PINECO        347
+#define HOENN_DEX_FORRETRESS    348
+#define HOENN_DEX_DUNSPARCE     349
+#define HOENN_DEX_GLIGAR        350
+#define HOENN_DEX_STEELIX       351
+#define HOENN_DEX_SNUBBULL      352
+#define HOENN_DEX_GRANBULL      353
+#define HOENN_DEX_QWILFISH      354
+#define HOENN_DEX_SCIZOR        355
+#define HOENN_DEX_SHUCKLE       356
+#define HOENN_DEX_SNEASEL       357
+#define HOENN_DEX_TEDDIURSA     358
+#define HOENN_DEX_URSARING      359
+#define HOENN_DEX_SWINUB        360
+#define HOENN_DEX_PILOSWINE     361
+#define HOENN_DEX_REMORAID      362
+#define HOENN_DEX_OCTILLERY     363
+#define HOENN_DEX_DELIBIRD      364
+#define HOENN_DEX_MANTINE       365
+#define HOENN_DEX_HOUNDOUR      366
+#define HOENN_DEX_HOUNDOOM      367
+#define HOENN_DEX_PORYGON2      368
+#define HOENN_DEX_STANTLER      369
+#define HOENN_DEX_SMEARGLE      370
+#define HOENN_DEX_TYROGUE       371
+#define HOENN_DEX_HITMONTOP     372
+#define HOENN_DEX_SMOOCHUM      373
+#define HOENN_DEX_ELEKID        374
+#define HOENN_DEX_MAGBY         375
+#define HOENN_DEX_MILTANK       376
+#define HOENN_DEX_BLISSEY       377
+#define HOENN_DEX_RAIKOU        378
+#define HOENN_DEX_ENTEI         379
+#define HOENN_DEX_SUICUNE       380
+#define HOENN_DEX_LARVITAR      381
+#define HOENN_DEX_PUPITAR       382
+#define HOENN_DEX_TYRANITAR     383
+#define HOENN_DEX_LUGIA         384
+#define HOENN_DEX_HO_OH         385
+#define HOENN_DEX_CELEBI        386
 
-#define HOENN_DEX_TREECKO 1
-#define HOENN_DEX_GROVYLE 2
-#define HOENN_DEX_SCEPTILE 3
-#define HOENN_DEX_TORCHIC 4
-#define HOENN_DEX_COMBUSKEN 5
-#define HOENN_DEX_BLAZIKEN 6
-#define HOENN_DEX_MUDKIP 7
-#define HOENN_DEX_MARSHTOMP 8
-#define HOENN_DEX_SWAMPERT 9
-#define HOENN_DEX_POOCHYENA 10
-#define HOENN_DEX_MIGHTYENA 11
-#define HOENN_DEX_ZIGZAGOON 12
-#define HOENN_DEX_LINOONE 13
-#define HOENN_DEX_WURMPLE 14
-#define HOENN_DEX_SILCOON 15
-#define HOENN_DEX_BEAUTIFLY 16
-#define HOENN_DEX_CASCOON 17
-#define HOENN_DEX_DUSTOX 18
-#define HOENN_DEX_LOTAD 19
-#define HOENN_DEX_LOMBRE 20
-#define HOENN_DEX_LUDICOLO 21
-#define HOENN_DEX_SEEDOT 22
-#define HOENN_DEX_NUZLEAF 23
-#define HOENN_DEX_SHIFTRY 24
-#define HOENN_DEX_NINCADA 42
-#define HOENN_DEX_NINJASK 43
-#define HOENN_DEX_SHEDINJA 44
-#define HOENN_DEX_TAILLOW 25
-#define HOENN_DEX_SWELLOW 26
-#define HOENN_DEX_SHROOMISH 34
-#define HOENN_DEX_BRELOOM 35
-#define HOENN_DEX_SPINDA 114
-#define HOENN_DEX_WINGULL 27
-#define HOENN_DEX_PELIPPER 28
-#define HOENN_DEX_SURSKIT 32
-#define HOENN_DEX_MASQUERAIN 33
-#define HOENN_DEX_WAILMER 99
-#define HOENN_DEX_WAILORD 100
-#define HOENN_DEX_SKITTY 61
-#define HOENN_DEX_DELCATTY 62
-#define HOENN_DEX_KECLEON 145
-#define HOENN_DEX_BALTOY 131
-#define HOENN_DEX_CLAYDOL 132
-#define HOENN_DEX_NOSEPASS 60
-#define HOENN_DEX_TORKOAL 105
-#define HOENN_DEX_SABLEYE 68
-#define HOENN_DEX_BARBOACH 127
-#define HOENN_DEX_WHISCASH 128
-#define HOENN_DEX_LUVDISC 183
-#define HOENN_DEX_CORPHISH 129
-#define HOENN_DEX_CRAWDAUNT 130
-#define HOENN_DEX_FEEBAS 140
-#define HOENN_DEX_MILOTIC 141
-#define HOENN_DEX_CARVANHA 97
-#define HOENN_DEX_SHARPEDO 98
-#define HOENN_DEX_TRAPINCH 116
-#define HOENN_DEX_VIBRAVA 117
-#define HOENN_DEX_FLYGON 118
-#define HOENN_DEX_MAKUHITA 48
-#define HOENN_DEX_HARIYAMA 49
-#define HOENN_DEX_ELECTRIKE 78
-#define HOENN_DEX_MANECTRIC 79
-#define HOENN_DEX_NUMEL 101
-#define HOENN_DEX_CAMERUPT 102
-#define HOENN_DEX_SPHEAL 173
-#define HOENN_DEX_SEALEO 174
-#define HOENN_DEX_WALREIN 175
-#define HOENN_DEX_CACNEA 119
-#define HOENN_DEX_CACTURNE 120
-#define HOENN_DEX_SNORUNT 171
-#define HOENN_DEX_GLALIE 172
-#define HOENN_DEX_LUNATONE 125
-#define HOENN_DEX_SOLROCK 126
-#define HOENN_DEX_AZURILL 54
-#define HOENN_DEX_SPOINK 110
-#define HOENN_DEX_GRUMPIG 111
-#define HOENN_DEX_PLUSLE 80
-#define HOENN_DEX_MINUN 81
-#define HOENN_DEX_MAWILE 69
-#define HOENN_DEX_MEDITITE 76
-#define HOENN_DEX_MEDICHAM 77
-#define HOENN_DEX_SWABLU 121
-#define HOENN_DEX_ALTARIA 122
-#define HOENN_DEX_WYNAUT 160
-#define HOENN_DEX_DUSKULL 148
-#define HOENN_DEX_DUSCLOPS 149
-#define HOENN_DEX_ROSELIA 94
-#define HOENN_DEX_SLAKOTH 36
-#define HOENN_DEX_VIGOROTH 37
-#define HOENN_DEX_SLAKING 38
-#define HOENN_DEX_GULPIN 95
-#define HOENN_DEX_SWALOT 96
-#define HOENN_DEX_TROPIUS 150
-#define HOENN_DEX_WHISMUR 45
-#define HOENN_DEX_LOUDRED 46
-#define HOENN_DEX_EXPLOUD 47
-#define HOENN_DEX_CLAMPERL 176
-#define HOENN_DEX_HUNTAIL 177
-#define HOENN_DEX_GOREBYSS 178
-#define HOENN_DEX_ABSOL 152
-#define HOENN_DEX_SHUPPET 146
-#define HOENN_DEX_BANETTE 147
-#define HOENN_DEX_SEVIPER 124
-#define HOENN_DEX_ZANGOOSE 123
-#define HOENN_DEX_RELICANTH 179
-#define HOENN_DEX_ARON 70
-#define HOENN_DEX_LAIRON 71
-#define HOENN_DEX_AGGRON 72
-#define HOENN_DEX_CASTFORM 142
-#define HOENN_DEX_VOLBEAT 86
-#define HOENN_DEX_ILLUMISE 87
-#define HOENN_DEX_LILEEP 133
-#define HOENN_DEX_CRADILY 134
-#define HOENN_DEX_ANORITH 135
-#define HOENN_DEX_ARMALDO 136
-#define HOENN_DEX_RALTS 29
-#define HOENN_DEX_KIRLIA 30
-#define HOENN_DEX_GARDEVOIR 31
-#define HOENN_DEX_BAGON 187
-#define HOENN_DEX_SHELGON 188
-#define HOENN_DEX_SALAMENCE 189
-#define HOENN_DEX_BELDUM 190
-#define HOENN_DEX_METANG 191
-#define HOENN_DEX_METAGROSS 192
-#define HOENN_DEX_REGIROCK 193
-#define HOENN_DEX_REGICE 194
-#define HOENN_DEX_REGISTEEL 195
-#define HOENN_DEX_KYOGRE 198
-#define HOENN_DEX_GROUDON 199
-#define HOENN_DEX_RAYQUAZA 200
-#define HOENN_DEX_LATIAS 196
-#define HOENN_DEX_LATIOS 197
-#define HOENN_DEX_JIRACHI 201
-#define HOENN_DEX_DEOXYS 202
-#define HOENN_DEX_CHIMECHO 151
+#define HOENN_DEX_OLD_UNOWN_B   387
+#define HOENN_DEX_OLD_UNOWN_C   388
+#define HOENN_DEX_OLD_UNOWN_D   389
+#define HOENN_DEX_OLD_UNOWN_E   390
+#define HOENN_DEX_OLD_UNOWN_F   391
+#define HOENN_DEX_OLD_UNOWN_G   392
+#define HOENN_DEX_OLD_UNOWN_H   393
+#define HOENN_DEX_OLD_UNOWN_I   394
+#define HOENN_DEX_OLD_UNOWN_J   395
+#define HOENN_DEX_OLD_UNOWN_K   396
+#define HOENN_DEX_OLD_UNOWN_L   397
+#define HOENN_DEX_OLD_UNOWN_M   398
+#define HOENN_DEX_OLD_UNOWN_N   399
+#define HOENN_DEX_OLD_UNOWN_O   400
+#define HOENN_DEX_OLD_UNOWN_P   401
+#define HOENN_DEX_OLD_UNOWN_Q   402
+#define HOENN_DEX_OLD_UNOWN_R   403
+#define HOENN_DEX_OLD_UNOWN_S   404
+#define HOENN_DEX_OLD_UNOWN_T   405
+#define HOENN_DEX_OLD_UNOWN_U   406
+#define HOENN_DEX_OLD_UNOWN_V   407
+#define HOENN_DEX_OLD_UNOWN_W   408
+#define HOENN_DEX_OLD_UNOWN_X   409
+#define HOENN_DEX_OLD_UNOWN_Y   410
+#define HOENN_DEX_OLD_UNOWN_Z   411
 
 #endif  // GUARD_CONSTANTS_SPECIES_H
diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h
new file mode 100644
index 000000000..6372a30e8
--- /dev/null
+++ b/include/constants/trainer_tower.h
@@ -0,0 +1,46 @@
+#ifndef GUARD_CONSTANTS_TRAINER_TOWER_H
+#define GUARD_CONSTANTS_TRAINER_TOWER_H
+
+#define CHALLENGE_TYPE_SINGLE     0
+#define CHALLENGE_TYPE_DOUBLE     1
+#define CHALLENGE_TYPE_KNOCKOUT   2
+// Mixed challenges use one of the above 3 for each floor
+
+#define CHALLENGE_STATUS_LOST     0
+#define CHALLENGE_STATUS_UNK      1  // Never set, possibly e-Card related
+#define CHALLENGE_STATUS_NORMAL   2  // Not started or ongoing
+
+#define MAX_TRAINER_TOWER_FLOORS 8
+
+#define MAX_TRAINERS_PER_FLOOR  3
+
+#define TRAINER_TOWER_FUNC_INIT_FLOOR               0
+#define TRAINER_TOWER_FUNC_GET_SPEECH               1
+#define TRAINER_TOWER_FUNC_DO_BATTLE                2
+#define TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE       3
+#define TRAINER_TOWER_FUNC_CLEARED_FLOOR            4
+#define TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED        5
+#define TRAINER_TOWER_FUNC_START_CHALLENGE          6
+#define TRAINER_TOWER_FUNC_GET_OWNER_STATE          7
+#define TRAINER_TOWER_FUNC_GIVE_PRIZE               8
+#define TRAINER_TOWER_FUNC_CHECK_FINAL_TIME         9
+#define TRAINER_TOWER_FUNC_RESUME_TIMER             10
+#define TRAINER_TOWER_FUNC_SET_LOST                 11
+#define TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS     12
+#define TRAINER_TOWER_FUNC_GET_TIME                 13
+#define TRAINER_TOWER_FUNC_SHOW_RESULTS             14
+#define TRAINER_TOWER_FUNC_CLOSE_RESULTS            15
+#define TRAINER_TOWER_FUNC_CHECK_DOUBLES            16
+#define TRAINER_TOWER_FUNC_GET_NUM_FLOORS           17
+#define TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER   18
+#define TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC          19
+#define TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE       20
+
+#define TRAINER_TOWER_TEXT_INTRO        2
+#define TRAINER_TOWER_TEXT_PLAYER_LOST  3
+#define TRAINER_TOWER_TEXT_PLAYER_WON   4
+#define TRAINER_TOWER_TEXT_AFTER        5
+
+#define TRAINER_TOWER_MAX_TIME 215999 // 60 * 60 * 60 - 1
+
+#endif //GUARD_CONSTANTS_TRAINER_TOWER_H
diff --git a/include/constants/union_room.h b/include/constants/union_room.h
index 021424773..b23860645 100644
--- a/include/constants/union_room.h
+++ b/include/constants/union_room.h
@@ -1,6 +1,48 @@
 #ifndef GUARD_CONSTANTS_UNION_ROOM_H
 #define GUARD_CONSTANTS_UNION_ROOM_H
 
+#define UNION_ROOM_SPAWN_NONE 0
+#define UNION_ROOM_SPAWN_IN   1
+#define UNION_ROOM_SPAWN_OUT  2
+
+#define ACTIVITY_NONE       0
+#define ACTIVITY_BATTLE     1
+#define ACTIVITY_DBLBATTLE  2
+#define ACTIVITY_MLTBATTLE  3
+#define ACTIVITY_TRADE      4
+#define ACTIVITY_CHAT       5
+#define ACTIVITY_WCARD      6
+#define ACTIVITY_WNEWS      7
+#define ACTIVITY_CARD       8
+#define ACTIVITY_PJUMP      9
+#define ACTIVITY_BCRUSH    10
+#define ACTIVITY_BPICK     11
+#define ACTIVITY_SEARCH    12
+#define ACTIVITY_SPINTRADE 13
+#define ACTIVITY_ITEMTRADE 14
+
+// Player response
+#define ACTIVITY_ACCEPT    17
+#define ACTIVITY_DECLINE   18
+
+#define ACTIVITY_NPCTALK   19
+#define ACTIVITY_PLYRTALK  20
+
+// Duplicate IDs?
+#define ACTIVITY_WCARD2    21
+#define ACTIVITY_WNEWS2    22
+
+#define IN_UNION_ROOM   0x40
+
+// Used in UR_AddTextPrinterParameterized
+#define UR_COLOR_DKE_WHT_LTE 0
+#define UR_COLOR_RED_WHT_LTR 1
+#define UR_COLOR_GRN_WHT_LTG 2
+#define UR_COLOR_WHT_WHT_LTE 3
+#define UR_COLOR_WHT_DKE_LTE 4
+#define UR_COLOR_GRN_DN6_LTB 5
+#define UR_COLOR_DN5_DN6_LTB 6
+
 #define LINK_GROUP_SINGLE_BATTLE        0
 #define LINK_GROUP_DOUBLE_BATTLE        1
 #define LINK_GROUP_MULTI_BATTLE         2
@@ -12,4 +54,7 @@
 #define LINK_GROUP_WONDER_NEWS          8
 #define NUM_LINK_GROUP_TYPES            9
 
+#define LINK_GROUP_UNION_ROOM_RESUME    9
+#define LINK_GROUP_UNION_ROOM_INIT     10
+
 #endif //GUARD_CONSTANTS_UNION_ROOM_H
diff --git a/include/constants/weather.h b/include/constants/weather.h
index a45d2e523..77be45c51 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -12,7 +12,7 @@
 #define WEATHER_SANDSTORM          8   // unused
 #define WEATHER_FOG_DIAGONAL       9   // unused
 #define WEATHER_UNDERWATER         10  // unused
-#define WEATHER_CLOUDY             11
+#define WEATHER_SHADE              11
 #define WEATHER_DROUGHT            12  // unused and broken in overworld
 #define WEATHER_DOWNPOUR           13  // unused
 #define WEATHER_UNDERWATER_BUBBLES 14  // unused
diff --git a/include/digit_obj_util.h b/include/digit_obj_util.h
new file mode 100644
index 000000000..b2ecd42bc
--- /dev/null
+++ b/include/digit_obj_util.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_DIGIT_OBJ_UTIL_H
+#define GUARD_DIGIT_OBJ_UTIL_H
+
+struct DigitObjUtilTemplate
+{
+    u8 strConvMode:2;
+    u8 shape:2;
+    u8 size:2;
+    u8 priority:2;
+    u8 oamCount;
+    u8 xDelta;
+    s16 x;
+    s16 y;
+    const struct SpriteSheet *spriteSheet;
+    const struct SpritePalette *spritePal;
+};
+
+void DigitObjUtil_Teardown(void);
+bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template);
+void DigitObjUtil_PrintNumOn(u32 id, s32 num);
+void DigitObjUtil_DeletePrinter(u32 id);
+void DigitObjUtil_HideOrShow(u32 id, bool32 hide);
+
+#endif //GUARD_DIGIT_OBJ_UTIL_H
diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h
index 59736ba7a..47cece996 100644
--- a/include/dodrio_berry_picking.h
+++ b/include/dodrio_berry_picking.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_DODRIO_BERRY_PICKING_H
 #define GUARD_DODRIO_BERRY_PICKING_H
 
-void sub_81507FC(u16 species, MainCallback callback);
+void StartDodrioBerryPicking(u16 species, MainCallback callback);
 
 #endif //GUARD_DODRIO_BERRY_PICKING_H
diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
new file mode 100644
index 000000000..dab97470a
--- /dev/null
+++ b/include/ereader_helpers.h
@@ -0,0 +1,36 @@
+#ifndef GUARD_EREADER_HELPERS_H
+#define GUARD_EREADER_HELPERS_H
+
+enum {
+    EREADER_XFR_STATE_INIT = 0,
+    EREADER_XFR_STATE_HANDSHAKE,
+    EREADER_XFR_STATE_START,
+    EREADER_XFR_STATE_TRANSFER,
+    EREADER_XFR_STATE_TRANSFER_DONE,
+    EREADER_XFR_STATE_CHECKSUM,
+    EREADER_XFR_STATE_DONE
+};
+
+#define EREADER_XFER_EXE 1
+#define EREADER_XFER_CHK 2
+#define EREADER_XFER_SHIFT 0
+#define EREADER_XFER_MASK  3
+
+#define EREADER_CANCEL_TIMEOUT 1
+#define EREADER_CANCEL_KEY     2
+#define EREADER_CANCEL_MASK  0xC
+#define EREADER_CANCEL_SHIFT 2
+
+#define EREADER_CHECKSUM_OK  1
+#define EREADER_CHECKSUM_ERR 2
+#define EREADER_CHECKSUM_MASK  0x30
+#define EREADER_CHECKSUM_SHIFT 4
+
+void EReaderHelper_SerialCallback(void);
+void EReaderHelper_Timer3Callback(void);
+void EReaderHelper_SaveRegsState(void);
+void EReaderHelper_ClearsSendRecvMgr(void);
+void EReaderHelper_RestoreRegsState(void);
+u16 EReaderHandleTransfer(u8 mode, size_t size, const void * src, void * dest);
+
+#endif //GUARD_EREADER_HELPERS_H
diff --git a/include/event_data.h b/include/event_data.h
index 7987720f1..e635cbc6d 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -54,8 +54,8 @@ bool8 FlagGet(u16 id);
 u16 * GetVarPointer(u16 id);
 bool32 IsMysteryGiftEnabled(void);
 void ResetSpecialVars(void);
-void sub_806E2D0(void);
-void sub_806E370(void);
+void ResetMysteryEventFlags(void);
+void ResetMysteryEventVars(void);
 bool32 IsNationalPokedexEnabled(void);
 void sub_806E190(void);
 
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h
index 36040e0a5..241d48c3a 100644
--- a/include/event_object_80688E4.h
+++ b/include/event_object_80688E4.h
@@ -4,12 +4,12 @@
 #include "global.h"
 
 void FreezeObjectEvents(void);
-void FreezeObjectEvent(struct ObjectEvent *);
+bool8 FreezeObjectEvent(struct ObjectEvent *);
 void FreezeObjectEventsExceptOne(u8 objEventId);
-void sub_8069124(u8 a0, bool8 a1);
-u32 sub_806916C(u8 a0);
-void sub_80691A4(u8 a0, u8 a1);
-void sub_8069094(u8 a0, u8 a1);
-bool32 sub_8069294(u8 a0);
+void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction);
+void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
+bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
+void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
+bool32 RfuUnionObjectIsWarping(u8 objectEventId);
 
 #endif // GUARD_EVENT_OBJECT_80688E4_H
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 5c65585b5..1a0f452fc 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -11,6 +11,6 @@ void sub_8098630(void);
 bool8 sub_8098734(void);
 void sub_80696C0(void);
 bool8 walkrun_is_standing_still(void);
-void sub_80696F0(void);
+void UnionRoom_UnlockPlayerAndChatPartner(void);
 
 #endif // GUARD_EVENT_OBJECT_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index f2e7bd325..650f137d9 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -97,7 +97,7 @@ u8 sub_8063F84(u8 direction);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
 void CameraObjectSetFollowedObjectId(u8 spriteId);
 void UnfreezeObjectEvents(void);
-void sub_8069058(u8, u8);
+void TurnObjectEvent(u8, u8);
 
 // Exported data declarations
 
@@ -105,5 +105,6 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
 extern const struct OamData gObjectEventBaseOam_32x32;
+extern const struct UCoords16 gUnknown_83A64C8[];
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/field_effect.h b/include/field_effect.h
index c2d14d43c..3e30fa897 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -8,7 +8,7 @@ extern u32 gFieldEffectArguments[8];
 extern void (*gPostMenuFieldCallback)(void);
 extern bool8 (*gFieldCallback2)(void);
 
-u8 FieldEffectStart(u8);
+u32 FieldEffectStart(u8);
 bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
 void CreateTeleportFieldEffectTask(void);
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 91a45d8c5..406ec2959 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -31,6 +31,6 @@ void sub_8059948(u8 a0, u8 a1);
 void save_serialize_map(void);
 u32 sub_8058F1C(u32 original, u8 bit);
 u32 sub_8058F48(s16 x, s16 y, u8 z);
-void sub_8059024(s32 x, s32 y, bool32 arg2);
+void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 01cd992ec..e0053fe88 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -168,62 +168,58 @@ struct MapHeader
 
 struct ObjectEvent
 {
-    /*0x00*/ u32 active:1;
-             u32 mapobj_bit_1:1;
-             u32 mapobj_bit_2:1;
-             u32 mapobj_bit_3:1;
-             u32 mapobj_bit_4:1;
-             u32 mapobj_bit_5:1;
-             u32 mapobj_bit_6:1;
-             u32 mapobj_bit_7:1;
-    /*0x01*/ u32 mapobj_bit_8:1;
-             u32 mapobj_bit_9:1;
-             u32 mapobj_bit_10:1;
-             u32 mapobj_bit_11:1;
-             u32 mapobj_bit_12:1;
-             u32 mapobj_bit_13:1;
-             u32 mapobj_bit_14:1;
-             u32 mapobj_bit_15:1;
-    /*0x02*/ u32 mapobj_bit_16:1;
-             u32 mapobj_bit_17:1;
-             u32 mapobj_bit_18:1;
-             u32 mapobj_bit_19:1;
-             u32 mapobj_bit_20:1;
-             u32 mapobj_bit_21:1;
-             u32 mapobj_bit_22:1;
-             u32 mapobj_bit_23:1;
-    /*0x03*/ u32 mapobj_bit_24:1;
-             u32 mapobj_bit_25:1;
-             u32 mapobj_bit_26:1;
-             u32 mapobj_bit_27:1;
-             u32 mapobj_bit_28:1;
-             u32 mapobj_bit_29:1;
-             u32 mapobj_bit_30:1;
-             u32 mapobj_bit_31:1;
-    /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 graphicsId;
-    /*0x06*/ u8 animPattern;
-    /*0x07*/ u8 trainerType;
-    /*0x08*/ u8 localId;
-    /*0x09*/ u8 mapNum;
-    /*0x0A*/ u8 mapGroup;
-    /*0x0B*/ u8 mapobj_unk_0B_0:4;
-             u8 elevation:4;
-    /*0x0C*/ struct Coords16 coords1;
-    /*0x10*/ struct Coords16 coords2;
-    /*0x14*/ struct Coords16 coords3;
-    /*0x18*/ u8 facingDirection:4;  //current direction?
-    /*0x18*/ u8 placeholder18:4;
-    /*0x19*/ union ObjectEventRange range;
-    /*0x1A*/ u8 mapobj_unk_1A;
-    /*0x1B*/ u8 mapobj_unk_1B;
-    /*0x1C*/ u8 mapobj_unk_1C;
-    /*0x1D*/ u8 trainerRange_berryTreeId;
-    /*0x1E*/ u8 mapobj_unk_1E;
-    /*0x1F*/ u8 mapobj_unk_1F;
-    /*0x20*/ u8 mapobj_unk_20;
-    /*0x21*/ u8 mapobj_unk_21;
-    /*0x22*/ u8 animId;
+    /*0x00*/ /* 0*/ u32 active:1;
+             /* 1*/ u32 singleMovementActive:1;
+             /* 2*/ u32 triggerGroundEffectsOnMove:1;
+             /* 3*/ u32 triggerGroundEffectsOnStop:1;
+             /* 4*/ u32 disableCoveringGroundEffects:1;
+             /* 5*/ u32 landingJump:1;
+             /* 6*/ u32 heldMovementActive:1;
+             /* 7*/ u32 heldMovementFinished:1;
+    /*0x01*/ /* 8*/ u32 frozen:1;
+             /* 9*/ u32 facingDirectionLocked:1;
+             /*10*/ u32 disableAnim:1;
+             /*11*/ u32 enableAnim:1;
+             /*12*/ u32 inanimate:1;
+             /*13*/ u32 invisible:1;
+             /*14*/ u32 offScreen:1;
+             /*15*/ u32 trackedByCamera:1;
+    /*0x02*/ /*16*/ u32 isPlayer:1;
+             /*17*/ u32 hasReflection:1;
+             /*18*/ u32 inShortGrass:1;
+             /*19*/ u32 inShallowFlowingWater:1;
+             /*20*/ u32 inSandPile:1;
+             /*21*/ u32 inHotSprings:1;
+             /*22*/ u32 hasShadow:1;
+             /*23*/ u32 spriteAnimPausedBackup:1;
+    /*0x03*/ /*24*/ u32 spriteAffineAnimPausedBackup:1;
+             /*25*/ u32 disableJumpLandingGroundEffect:1;
+             /*26*/ u32 fixedPriority:1;
+             /*27*/ u32 hideReflection:1;
+    /*0x04*/        u8 spriteId;
+    /*0x05*/        u8 graphicsId;
+    /*0x06*/        u8 animPattern;
+    /*0x07*/        u8 trainerType;
+    /*0x08*/        u8 localId;
+    /*0x09*/        u8 mapNum;
+    /*0x0A*/        u8 mapGroup;
+    /*0x0B*/        u8 mapobj_unk_0B_0:4;
+                    u8 elevation:4;
+    /*0x0C*/        struct Coords16 coords1;
+    /*0x10*/        struct Coords16 coords2;
+    /*0x14*/        struct Coords16 coords3;
+    /*0x18*/        u8 facingDirection:4;  //current direction?
+    /*0x18*/        u8 placeholder18:4;
+    /*0x19*/        union ObjectEventRange range;
+    /*0x1A*/        u8 mapobj_unk_1A;
+    /*0x1B*/        u8 mapobj_unk_1B;
+    /*0x1C*/        u8 mapobj_unk_1C;
+    /*0x1D*/        u8 trainerRange_berryTreeId;
+    /*0x1E*/        u8 mapobj_unk_1E;
+    /*0x1F*/        u8 mapobj_unk_1F;
+    /*0x20*/        u8 mapobj_unk_20;
+    /*0x21*/        u8 mapobj_unk_21;
+    /*0x22*/        u8 animId;
     /*size = 0x24*/
 };
 
diff --git a/include/global.h b/include/global.h
index 2f87a0c29..54d8fdec3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -74,8 +74,8 @@
 // GameFreak never ceases to amaze.
 // TODO: Propagate use of this macro
 #define TEST_BUTTON(field, button) ({(field) & (button);})
-#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys,  button)
-#define JOY_HELD(button)  TEST_BUTTON(gMain.heldKeys, button)
+#define JOY_NEW(button)  TEST_BUTTON(gMain.newKeys,  button)
+#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
 #define JOY_REPT(button) TEST_BUTTON(gMain.newAndRepeatedKeys, button)
 
 extern u8 gStringVar1[];
@@ -168,13 +168,6 @@ struct BerryPickingResults // possibly used in the game itself? Size may be wron
     u8 field_F;
 };
 
-struct PyramidBag
-{
-    u16 items_Lvl50[10];
-    u16 items_OpenLvl[10];
-    u8 quantity[10];
-};
-
 struct BerryCrush
 {
     u16 berryCrushResults[4];
@@ -591,22 +584,22 @@ union QuestLogMovement
 struct QuestLogObjectEvent
 {
     /*0x00*/ u8 active:1;
-    /*0x00*/ u8 mapobj_bit_3:1;
-    /*0x00*/ u8 mapobj_bit_4:1;
-    /*0x00*/ u8 mapobj_bit_5:1;
-    /*0x00*/ u8 mapobj_bit_8:1;
-    /*0x00*/ u8 mapobj_bit_9:1;
-    /*0x00*/ u8 mapobj_bit_10:1;
-    /*0x00*/ u8 mapobj_bit_11:1;
-    /*0x01*/ u8 mapobj_bit_12:1;
-    /*0x01*/ u8 mapobj_bit_13:1;
-    /*0x01*/ u8 mapobj_bit_14:1;
-    /*0x01*/ u8 mapobj_bit_15:1;
-    /*0x01*/ u8 mapobj_bit_16:1;
-    /*0x01*/ u8 mapobj_bit_23:1;
-    /*0x01*/ u8 mapobj_bit_24:1;
-    /*0x01*/ u8 mapobj_bit_25:1;
-    /*0x02*/ u8 mapobj_bit_26:1;
+    /*0x00*/ u8 triggerGroundEffectsOnStop:1;
+    /*0x00*/ u8 disableCoveringGroundEffects:1;
+    /*0x00*/ u8 landingJump:1;
+    /*0x00*/ u8 frozen:1;
+    /*0x00*/ u8 facingDirectionLocked:1;
+    /*0x00*/ u8 disableAnim:1;
+    /*0x00*/ u8 enableAnim:1;
+    /*0x01*/ u8 inanimate:1;
+    /*0x01*/ u8 invisible:1;
+    /*0x01*/ u8 offScreen:1;
+    /*0x01*/ u8 trackedByCamera:1;
+    /*0x01*/ u8 isPlayer:1;
+    /*0x01*/ u8 spriteAnimPausedBackup:1;
+    /*0x01*/ u8 spriteAffineAnimPausedBackup:1;
+    /*0x01*/ u8 disableJumpLandingGroundEffect:1;
+    /*0x02*/ u8 fixedPriority:1;
     /*0x02*/ u8 mapobj_unk_18:4;
     /*0x02*/ u8 unused_02_5:3;
     /*0x03*/ u8 mapobj_unk_0B_0:4;
@@ -658,8 +651,8 @@ struct FameCheckerSaveData
 
 struct MEWonderNewsData
 {
-    u16 unk_00;
-    u8 unk_02;
+    u16 newsId;
+    u8 shareState;
     u8 unk_03;
     u8 unk_04[40];
     u8 unk_2C[10][40];
@@ -673,13 +666,13 @@ struct MEWonderNewsStruct
 
 struct MEWonderCardData
 {
-    u16 unk_00;
+    u16 cardId;
     u16 unk_02;
     u32 unk_04;
     u8 unk_08_0:2;
     u8 unk_08_2:4;
-    u8 unk_08_6:2;
-    u8 unk_09;
+    u8 shareState:2;
+    u8 recvMonCapacity;
     u8 unk_0A[40];
     u8 unk_32[40];
     u8 unk_5A[4][40];
@@ -695,11 +688,12 @@ struct MEWonderCardStruct
 
 struct MEventBuffer_3430_Sub
 {
-    u16 unk_00;
-    u16 unk_02;
-    u16 unk_04;
+    u16 linkWins;
+    u16 linkLosses;
+    u16 linkTrades;
     u16 unk_06;
-    u16 unk_08[2][7];
+    u16 distributedMons[2][7]; // [0][x] = species
+                               // [1][x] = ???
 };
 
 struct MEventBuffer_3430
@@ -718,19 +712,18 @@ struct MEventBuffers
     /*0x344 0x3464*/ u32 unk_344[2][5];
 }; // 0x36C 0x348C
 
-struct TrainerTowerLog
+struct TrainerTower
 {
-    u32 unk0;
-    u32 unk4;
-    u8 unk8;
+    u32 timer;
+    u32 bestTime;
+    u8 floorsCleared;
     u8 unk9;
-    u8 unkA_0:1;
-    u8 unkA_1:1;
-    u8 unkA_2:1;
-    u8 unkA_3:1;
-    u8 unkA_4:1;
-    u8 unkA_5:1;
-    u8 unkA_6:2;
+    bool8 receivedPrize:1;
+    bool8 checkedFinalTime:1;
+    bool8 spokeToOwner:1;
+    bool8 hasLost:1;
+    bool8 unkA_4:1;
+    bool8 validated:1;
 };
 
 struct TrainerRematchState
@@ -806,8 +799,8 @@ struct SaveBlock1
     /*0x3BA8*/ struct TrainerNameRecord trainerNameRecords[20];
     /*0x3C98*/ struct DaycareMon route5DayCareMon;
     /*0x3D24*/ u8 filler3D24[0x10];
-    /*0x3D34*/ u32 unkArrayIdx;
-    /*0x3D38*/ struct TrainerTowerLog unkArray[4];
+    /*0x3D34*/ u32 towerChallengeId;
+    /*0x3D38*/ struct TrainerTower trainerTower[NUM_TOWER_CHALLENGE_TYPES];
 };
 
 struct MapPosition
diff --git a/include/help_system.h b/include/help_system.h
index 59adec912..c5ae5e5fa 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -17,16 +17,16 @@ struct HelpSystemListMenu_sub
 struct HelpSystemListMenu
 {
     struct HelpSystemListMenu_sub sub;
-    u8 field_0C;
-    u8 field_0D;
-    u8 field_0E;
+    u8 itemsAbove;
+    u8 cursorPos;
+    u8 state;
     u8 filler_10[0xC];
 };
 
 extern struct HelpSystemListMenu gHelpSystemListMenu;
 extern struct ListMenuItem gHelpSystemListMenuItems[];
 extern bool8 gHelpSystemEnabled;
-extern u8 gUnknown_203F175;
+extern bool8 gHelpSystemToggleWithRButtonDisabled;
 
 // help_system_812B1E0
 void HelpSystem_SetSomeVariable(u8);
@@ -35,19 +35,19 @@ bool8 sub_812B40C(void);
 bool8 sub_812B45C(void);
 void HelpSystem_Disable(void);
 void HelpSystem_Enable(void);
-void sub_812B4B8(void);
-bool8 sub_812BB9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BC54(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BC80(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BCA8(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BCD0(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BD2C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BD64(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
+void HelpSystem_EnableToggleWithRButton(void);
+bool8 RunHelpMenuSubroutine(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpSystemSubroutine_PrintWelcomeMessage(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpSystemSubroutine_WelcomeWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpSystemSubroutine_WelcomeEndGotoMenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpSystemSubroutine_MenuInputHandlerMain(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpMenuSubroutine_InitSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpMenuSubroutine_ReturnFromSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpMenuSubroutine_SubmenuInputHandler(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 void sub_812BDEC(void);
-bool8 sub_812BE10(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BEEC(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-bool8 sub_812BF18(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
+bool8 HelpMenuSubroutine_HelpItemPrint(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpMenuSubroutine_ReturnFromHelpItem(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
+bool8 HelpMenuSubroutine_HelpItemWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 bool8 sub_812BF88(void);
 
 // help_system
@@ -92,6 +92,6 @@ bool8 MoveCursor(u8 by, u8 dirn);
 void HelpSystem_BackupSomeVariable(void);
 void HelpSystem_RestoreSomeVariable(void);
 void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height);
-void sub_812B4AC(void);
+void HelpSystem_DisableToggleWithRButton(void);
 
 #endif //GUARD_HELP_SYSTEM_H
diff --git a/include/librfu.h b/include/librfu.h
index 97fd8044e..3c9d776f1 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -4,11 +4,10 @@
 #include "global.h"
 #include "main.h"
 
-/* TODOs: 
- * - split files
+#define LIBRFU_VERSION 1024
+
+/* TODOs:
  * - documentation
- * - decompile librfu_intr.s once arm support is back again
- (for internal structs not documented in SDK)
  * - check if any field needs to be volatile
  * - check if field names make sense
  */
@@ -71,6 +70,7 @@
 #define ID_CPR_POLL_REQ                             0x0033
 #define ID_CPR_END_REQ                              0x0034
 #define ID_UNK35_REQ                                0x0035    // not defined in SDK header
+#define ID_UNK36_REQ                                0x0036    // not defined in SDK header
 #define ID_RESUME_RETRANSMIT_AND_CHANGE_REQ         0x0037
 #define ID_STOP_MODE_REQ                            0x003d
 #define ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ   0x00ff    // When the AGB is the clock slave, the RFU generates an informational notice, and an automatically started DMA, such as HDMA, is generated at the instant the AGB is being returned as the clock master. This ID is notified by a REQ callback when the exchange of this information (REQ command) fails.
@@ -90,8 +90,13 @@
 
 #define RFU_MBOOT_DOWNLOADER_SERIAL_NO  0x0000             // The game serial number of the multi-boot downloader (programs that boot without a Game Pak)
 
+#if LIBRFU_VERSION >= 1028
 #define RFU_API_BUFF_SIZE_RAM           0x0e8c             // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in RAM)
 #define RFU_API_BUFF_SIZE_ROM           0x052c             // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in ROM)
+#else
+#define RFU_API_BUFF_SIZE_RAM           0x0e64             // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in RAM)
+#define RFU_API_BUFF_SIZE_ROM           0x0504             // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in ROM)
+#endif
 
 #define RFU_CHILD_MAX                   4                  // Maximum number of slaves that can be connected to one parent device
 
@@ -304,7 +309,11 @@ struct STWIStatus
     u8 ackActiveCommand;
     u8 timerSelect;
     u8 unk_b;
-    u32 timerState; // this field is s32 in emerald
+#if LIBRFU_VERSION >= 1026
+    s32 timerState;
+#else
+    u32 timerState;
+#endif
     vu8 timerActive;
     u8 unk_11;
     vu16 error;
@@ -314,10 +323,10 @@ struct STWIStatus
     u8 unk_17;
     void (*callbackM)();
     void (*callbackS)(u16);
-    void (*unk_20)(void);
+    void (*callbackID)(void);
     union RfuPacket *txPacket;
     union RfuPacket *rxPacket;
-    vu8 unk_2c;
+    vu8 sending;
 };
 
 // This struct is used as u8 array in SDK. 
@@ -452,54 +461,32 @@ struct RfuStatic
     u8 nullFrameCount;
     u8 emberCount;
     u8 SCStartFlag;
-    u8 linkEmergencyFlag[4];
-    u8 lsFixedCount[4];
-    u16 cidBak[4];
-    u16 unk_1a;
+    u8 linkEmergencyFlag[RFU_CHILD_MAX];
+    u8 lsFixedCount[RFU_CHILD_MAX];
+    u16 cidBak[RFU_CHILD_MAX];
+    u16 linkEmergencyLimit;
     u16 reqResult;
     u16 tryPid;
     u16 watchdogTimer;
     u32 totalPacketSize;
 };
 
-struct RfuSIO32Id
-{
-    u8 unk0;
-    u8 unk1;
-    u16 unk2;
-    u16 unk4;
-    u16 unk6;
-    u16 unk8; // unused
-    u16 unkA;
-};
-
-struct RfuAPIBuffer
-{
-    struct RfuLinkStatus linkStatus;
-    struct RfuStatic static_;
-    struct RfuFixed fixed;
-    struct RfuSlotStatusNI NI[RFU_CHILD_MAX];
-    struct RfuSlotStatusUNI UNI[RFU_CHILD_MAX];
-    struct RfuIntrStruct intr;
-};
-
 extern struct STWIStatus *gSTWIStatus;
 extern struct RfuLinkStatus *gRfuLinkStatus;
 extern struct RfuStatic *gRfuStatic;
 extern struct RfuFixed *gRfuFixed;
 extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX];
 extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
-extern struct RfuSIO32Id gRfuSIO32Id;
 
-// librfu_s32id
-s32 AgbRFU_checkID(u8);
+// librfu_sio32id
+s32 AgbRFU_checkID(u8 maxTries);
 
 // Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation. 
 
 // librfu_rfu
 // API Initialization and Initial Settings
     // API Initialization
-u16 rfu_initializeAPI(struct RfuAPIBuffer *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p, bool8 copyInterruptToRam);
+u16 rfu_initializeAPI(u32 *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p, bool8 copyInterruptToRam);
     // Set Timer Interrupt
 void rfu_setTimerInterrupt(u8 timerNo, IntrFunc *timerIntrTable_p);
     // Resident Function called from within a V-Blank Interrupt
@@ -600,7 +587,7 @@ u16 rfu_MBOOT_CHILD_inheritanceLinkStatus(void);
 
 // For Debug
     // Obtain address of the SWTI-layer receive buffer
-struct RfuIntrStruct *rfu_getSTWIRecvBuffer(void);
+u8 *rfu_getSTWIRecvBuffer(void);
     // Obtain RFU state
 void rfu_REQ_RFUStatus(void);
 u16 rfu_getRFUStatus(u8 *rfuState);
@@ -626,14 +613,14 @@ void STWI_send_DataRxREQ(void);
 void STWI_send_MS_ChangeREQ(void);
 void STWI_send_StopModeREQ(void);
 void STWI_send_SystemStatusREQ(void);
-void STWI_send_GameConfigREQ(const u8 *unk1, const u8 *data);
+void STWI_send_GameConfigREQ(const u8 *serial_uname, const u8 *gname);
 void STWI_send_ResetREQ(void);
 void STWI_send_LinkStatusREQ(void);
 void STWI_send_VersionStatusREQ(void);
 void STWI_send_SlotStatusREQ(void);
 void STWI_send_ConfigStatusREQ(void);
 void STWI_send_ResumeRetransmitAndChangeREQ(void);
-void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3);
+void STWI_send_SystemConfigREQ(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer);
 void STWI_send_SC_StartREQ(void);
 void STWI_send_SC_PollingREQ(void);
 void STWI_send_SC_EndREQ(void);
diff --git a/include/link.h b/include/link.h
index 770a60f44..e36ac8078 100644
--- a/include/link.h
+++ b/include/link.h
@@ -246,38 +246,38 @@ void sub_800E0E8(void);
 bool8 sub_800A520(void);
 bool8 sub_8010500(void);
 void sub_800DFB4(u8, u8);
-void sub_800AB9C(void);
-void sub_800B1F4(void);
+void PrepareSendLinkCmd2FFE_or_RfuCmd6600(void);
+void SetWirelessCommType1(void);
 void sub_8009734(void);
 void sub_800A620(void);
-void sub_80FBB4C(void);
+void LinkRfu_DestroyIdleTask(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
-void sub_800AAC0(void);
+void Link_TryStartSend5FFF(void);
 void OpenLink(void);
 bool8 IsLinkMaster(void);
 void CheckShouldAdvanceLinkState(void);
-void sub_800AA80(u16 a0);
+void Link_StartSend5FFFwithParam(u16 a0);
 void sub_80098D8(void);
 void CloseLink(void);
 bool8 IsLinkTaskFinished(void);
 bool32 sub_800B270(void);
 void ResetSerial(void);
 void sub_8054A28(void);
-void sub_800B1F4(void);
+void SetWirelessCommType1(void);
 void LoadWirelessStatusIndicatorSpriteGfx(void);
 void CreateWirelessStatusIndicatorSprite(u8, u8);
 void sub_8009FE8(void);
 void ClearLinkCallback_2(void);
-void sub_80FA42C(void);
-void sub_800B284(struct LinkPlayer * linkPlayer);
+void LinkRfu_SetRfuFuncToSend6600(void);
+void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
 bool8 sub_800A474(u8 a0);
 void LinkVSync(void);
 bool8 HandleLinkConnection(void);
-void sub_800B0B4(void);
-void sub_800B110(u32 who);
-void sub_800ACBC(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
+void PrepareLocalLinkPlayerBlock(void);
+void LinkPlayerFromBlock(u32 who);
+void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
 u8 sub_800A8D4(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 81dd7fdf0..86d55047d 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -3,169 +3,78 @@
 
 #include "global.h"
 #include "librfu.h"
-
-// RfuTgtData.gname is read as these structs.
-struct GFtgtGnameSub
-{
-    u16 unk_00_0:4;
-    u16 unk_00_4:1;
-    u16 unk_00_5:1;
-    u16 unk_00_6:1;
-    u16 isChampion:1;
-    u16 hasNationalDex:1;
-    u16 gameClear:1;
-    u16 unk_01_2:4;
-    u16 unk_01_6:2;
-    u8 playerTrainerId[2];
-};
-
-struct __attribute__((packed, aligned(2))) GFtgtGname
-{
-    struct GFtgtGnameSub unk_00;
-    u8 unk_04[4];
-    u16 species:10;
-    u16 type:6;
-    u8 unk_0a_0:7;
-    u8 unk_0a_7:1;
-    u8 playerGender:1;
-    u8 level:7;
-    u8 unk_0c;
-};
-
-struct Padded_U8
-{
-    u8 value;
-};
-
-struct UnkLinkRfuStruct_02022B2C
+#include "AgbRfu_LinkManager.h"
+
+#define RFU_COMMAND_0x8800 0x8800
+#define RFU_COMMAND_0x8900 0x8900
+#define RFU_COMMAND_0xa100 0xa100
+#define RFU_COMMAND_0x7700 0x7700
+#define RFU_COMMAND_0x7800 0x7800
+#define RFU_COMMAND_0x6600 0x6600
+#define RFU_COMMAND_0x5f00 0x5f00
+#define RFU_COMMAND_0x2f00 0x2f00
+#define RFU_COMMAND_0xbe00 0xbe00
+#define RFU_COMMAND_0xee00 0xee00
+#define RFU_COMMAND_0xed00 0xed00
+
+struct RfuBlockSend
 {
-    u8 maxMFrame;
-    u8 mcTimer;
-    u16 availSlotFlag;
-    u8 mbootFlag;
-    u16 serialNo;
-    struct GFtgtGname *gname;
-    u8 *uname;
-    u8 unk_10;
-    u8 unk_11;
-    u16 unk_12;
-    u16 unk_14;
-};
-
-struct UnkLinkRfuStruct_02022B44
-{
-    u8 fill_00[6];
-    u16 unk_06;
-    u8 fill_08[6];
-    vu8 unk_0e;
-    u8 unk_0f;
-    u8 fill_10[0x54];
-    u16 unk_64;
-    u8 fill_66[0x1d];
-    u8 unk_83;
-    u8 fill_84[0x58];
-};
-
-struct UnkRfuStruct_1
-{
-    /* 0x000 */ u8 unk_00;
-    /* 0x001 */ u8 unk_01;
-    /* 0x002 */ vu8 unk_02;
-    /* 0x003 */ vu8 unk_03;
-    /* 0x004 */ u8 unk_04;
-    /* 0x005 */ u8 unk_05;
-    /* 0x006 */ u8 unk_06;
-    /* 0x007 */ u8 unk_07;
-    /* 0x008 */ u8 unk_08;
-    /* 0x009 */ u8 unk_09;
-    /* 0x00a */ u8 unk_0a;
-    /* 0x00b */ u8 unk_0b;
-    /* 0x00c */ u8 unk_0c;
-    /* 0x00d */ u8 unk_0d;
-    /* 0x00e */ u8 unk_0e;
-    /* 0x00f */ u8 unk_0f;
-    /* 0x010 */ u8 unk_10;
-    /* 0x011 */ u8 unk_11;
-    /* 0x012 */ u8 unk_12;
-    // aligned
-    /* 0x014 */ u16 unk_14;
-    /* 0x016 */ u16 unk_16;
-    /* 0x018 */ u16 unk_18;
-    /* 0x01a */ u16 unk_1a;
-    /* 0x01c */ u16 unk_1c;
-    /* 0x01e */ u16 unk_1e;
-    /* 0x020 */ const u16 *unk_20;
-    /* 0x024 */ u8 unk_24;
-    /* 0x026 */ u16 unk_26;
-    /* 0x028 */ u16 unk_28[RFU_CHILD_MAX];
-    /* 0x030 */ u8 unk_30;
-    // aligned
-    /* 0x032 */ u16 unk_32;
-    /* 0x034 */ u16 unk_34[RFU_CHILD_MAX];
-    /* 0x03c */ const struct UnkLinkRfuStruct_02022B2C *unk_3c;
-    /* 0x040 */ void (*unk_40)(u8, u8);
-    /* 0x044 */ void (*unk_44)(u16);
-};
-
-struct UnkRfuStruct_2_Sub_6c
-{
-    /* 0x00 */ u16 unk_00;
-    /* 0x02 */ u16 unk_02;
-    /* 0x04 */ const u8 *unk_04;
-    /* 0x08 */ u32 unk_08;
-    /* 0x0c */ u32 unk_0c;
-    /* 0x10 */ u8 unk_10;
-    /* 0x11 */ u8 unk_11;
-    /* 0x12 */ u8 unk_12;
+    /* 0x00 */ u16 next;
+    /* 0x02 */ u16 count; // max 21
+    /* 0x04 */ const u8 *payload;
+    /* 0x08 */ u32 receivedFlags;
+    /* 0x0c */ u32 failedFlags;
+    /* 0x10 */ u8 sending;
+    /* 0x11 */ u8 owner;
+    /* 0x12 */ u8 receiving;
 };
 
 struct UnkRfuStruct_2_Sub_124
 {
-    /* 0x000 */ u8 unk_00[20][70];
-    /* 0x578 */ vu8 unk_8c0;
-    /* 0x579 */ vu8 unk_8c1;
-    /* 0x57a */ vu8 unk_8c2;
-    /* 0x57b */ vu8 unk_8c3;
+    /* 0x000 */ u8 slots[20][70];
+    /* 0x578 */ vu8 recv_slot;
+    /* 0x579 */ vu8 send_slot;
+    /* 0x57a */ vu8 count;
+    /* 0x57b */ vu8 full;
 };
 
 struct UnkRfuStruct_2_Sub_9e8
 {
-    /* 0x000 */ u8 unk_00[40][14];
-    /* 0x230 */ vu8 unk_230;
-    /* 0x231 */ vu8 unk_231;
-    /* 0x232 */ vu8 unk_232;
-    /* 0x233 */ vu8 unk_233;
+    /* 0x000 */ u8 slots[40][14];
+    /* 0x230 */ vu8 recv_slot;
+    /* 0x231 */ vu8 send_slot;
+    /* 0x232 */ vu8 count;
+    /* 0x233 */ vu8 full;
 };
 
 struct UnkRfuStruct_2_Sub_c1c
 {
-    /* 0x00 */ u8 unk_00[2][14];
-    /* 0x1c */ vu8 unk_1c;
-    /* 0x1d */ vu8 unk_1d;
-    /* 0x1e */ vu8 unk_1e;
+    /* 0x00 */ u8 slots[2][14];
+    /* 0x1c */ vu8 recv_slot;
+    /* 0x1d */ vu8 send_slot;
+    /* 0x1e */ vu8 count;
 };
 
 struct UnkRfuStruct_Sub_Unused
 {
-    /* 0x000 */ u8 unk_00[2][256];
-    /* 0x200 */ vu8 unk_200;
-    /* 0x201 */ vu8 unk_201;
-    /* 0x202 */ vu8 unk_202;
-    /* 0x203 */ vu8 unk_203;
+    /* 0x000 */ u8 slots[2][256];
+    /* 0x200 */ vu8 recv_slot;
+    /* 0x201 */ vu8 send_slot;
+    /* 0x202 */ vu8 count;
+    /* 0x203 */ vu8 full;
 };
 
-struct UnkRfuStruct_2
+typedef struct UnkRfuStruct_2
 {
     /* 0x000 */ void (*RfuFunc)(void);
-    /* 0x004 */ u16 unk_04;
+    /* 0x004 */ u16 state;
     /* 0x006 */ u8 filler_06[4];
-    /* 0x00a */ u16 unk_0a;
-    /* 0x00c */ u8 unk_0c; // parentChildMode?
+    /* 0x00a */ u16 linkman_msg;
+    /* 0x00c */ u8 parent_child;
     /* 0x00d */ u8 playerCount;
     /* 0x00e */ u8 unk_0e;
     /* 0x00f */ u8 unk_0f;
-    /* 0x010 */ u16 unk_10;
-    /* 0x012 */ u16 unk_12;
+    /* 0x010 */ u16 linkman_param[2];
     /* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
     /* 0x04c */ u8 unk_4c[14];
     /* 0x05a */ u8 unk_5a;
@@ -175,30 +84,30 @@ struct UnkRfuStruct_2
     /* 0x066 */ u8 unk_66;
     /* 0x067 */ u8 unk_67;
     /* 0x068 */ u8 filler_68[4];
-    /* 0x06c */ struct UnkRfuStruct_2_Sub_6c unk_6c;
-    /* 0x080 */ struct UnkRfuStruct_2_Sub_6c unk_80[5];
-    /* 0x0e4 */ u8 unk_e4[5];
-    /* 0x0e9 */ u8 unk_e9[5];
-    /* 0x0ee */ vu8 unk_ee;
+    /* 0x06c */ struct RfuBlockSend cmd_8800_sendbuf;
+    /* 0x080 */ struct RfuBlockSend cmd_8800_recvbuf[5];
+    /* 0x0e4 */ u8 cmd5f00Ack[5];
+    /* 0x0e9 */ u8 cmd_6600_recvd[5];
+    /* 0x0ee */ vu8 errorState;
     /* 0x0ef */ u8 unk_ef;
-    /* 0x0f0 */ u8 unk_f0;
+    /* 0x0f0 */ u8 linkLossRecoveryState;
     /* 0x0f1 */ u8 unk_f1;
     /* 0x0f2 */ u16 unk_f2[6];
-    /* 0x0fe */ u16 unk_fe;
-    /* 0x100 */ u16 unk_100;
+    /* 0x0fe */ u16 cmd_6600_timer;
+    /* 0x100 */ u16 cmd_6600_count;
     /* 0x102 */ u8 unk_102;
     /* 0x104 */ struct RfuTgtData unk_104;
     /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124;
     /* 0x6a0 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8;
     /* 0x8d4 */ struct UnkRfuStruct_2_Sub_c1c unk_c1c;
     /* 0x8f4 */ vu8 unk_c3c;
-    /* 0x8f5 */ u8 unk_c3d;
-    /* 0x8f6 */ vu8 unk_c3e;
+    /* 0x8f5 */ u8 reconnectedParentIdx;
+    /* 0x8f6 */ vu8 child_slot;
     /* 0x8f7 */ u8 unk_c3f[70];
     /* 0x93d */ u8 unk_c85;
     /* 0x93e */ u8 unk_c86;
-    /* 0x93f */ u8 unk_c87[5][7][2];
-    /* 0x985 */ u8 unk_ccd;
+    /* 0x93f */ u8 recvCmds[5][7][2];
+    /* 0x985 */ u8 parentId;
     /* 0x986 */ u8 unk_cce; // childId
     /* 0x987 */ u8 unk_ccf;
     /* 0x988 */ vu8 unk_cd0;
@@ -209,43 +118,42 @@ struct UnkRfuStruct_2
     /* 0x993 */ vu8 unk_cdb;
     /* 0x994 */ vu8 unk_cdc;
     /* 0x995 */ u8 unk_cdd;
-    /* 0x996 */ u8 unk_cde[RFU_CHILD_MAX];
-    /* 0x99a */ u8 unk_ce2;
-    /* 0x99b */ u8 unk_ce3;
+    /* 0x996 */ u8 linkPlayerIdx[RFU_CHILD_MAX];
+    /* 0x99a */ u8 bm_PartnerFlags;
+    /* 0x99b */ u8 bm_DisconnectSlot;
     /* 0x99c */ u8 unk_ce4;
     /* 0x99d */ u8 unk_ce5;
-    /* 0x99e */ u8 unk_ce6;
-    /* 0x99f */ u8 unk_ce7;
+    /* 0x99e */ u8 unionRoomChatters;
+    /* 0x99f */ u8 acceptSlot_flag;
     /* 0x9a0 */ bool8 unk_ce8;
     /* 0x9a1 */ u8 unk_ce9;
     /* 0x9a2 */ u8 unk_cea[RFU_CHILD_MAX];
     /* 0x9a6 */ u8 unk_cee[RFU_CHILD_MAX];
-}; // size: 0x9AC
+} GF_RFU_MANAGER; // size: 0x9AC
 
-extern struct UnkRfuStruct_1 gUnknown_3005E10;
 extern struct GFtgtGname gHostRFUtgtGnameBuffer;
 extern u8 gHostRFUtgtUnameBuffer[];
 
+// GameFreak signatures
 void AddTextPrinterToWindow1(const u8 *str);
 bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src);
 void LinkRfu_FatalError(void);
 void MG_DrawCheckerboardPattern(void);
-void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
+void Rfu_BeginBuildAndSendCommand5F(void);
 bool8 IsLinkRfuTaskFinished(void);
 void DestroyWirelessStatusIndicatorSprite(void);
 void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
 void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
 void MEvent_CreateTask_Leader(u32 arg0);
-void sub_80F9E2C(void * data);
-u8 sub_8116DE0(void);
-void sub_80FBB4C(void);
+void RfuPrepareSend0x2f00(void * data);
+u8 CreateTask_ListenToWireless(void);
+void LinkRfu_DestroyIdleTask(void);
 void sub_80F86F4(void);
 void sub_80FB128(bool32 a0);
-u32 sub_80FD3A4(void);
 bool32 IsSendingKeysToRfu(void);
 void Rfu_set_zero(void);
 u8 GetRfuPlayerCount(void);
-void sub_80F9828(void);
+void StartSendingKeysToRfu(void);
 u8 LinkRfu_GetMultiplayerId(void);
 bool32 Rfu_InitBlockSend(const u8 * src, size_t size);
 bool8 sub_80FA0F8(u8 a0);
@@ -253,78 +161,65 @@ u8 Rfu_GetBlockReceivedStatus(void);
 void Rfu_SetBlockReceivedFlag(u8 who);
 void Rfu_ResetBlockReceivedFlag(u8 who);
 bool8 Rfu_IsMaster(void);
-void sub_80F85F8(void);
-bool32 sub_80FAE94(void);
-bool32 sub_80FAEF0(void);
+void ResetLinkRfuGFLayer(void);
+bool32 LinkRfuMain1(void);
+bool32 LinkRfuMain2(void);
 bool32 IsRfuRecvQueueEmpty(void);
 u32 GetRfuRecvQueueLength(void);
-void sub_80F8DC0(void);
-void sub_80FBB20(void);
+void LinkRfu_Shutdown(void);
+void LinkRfu_CreateIdleTask(void);
 bool8 sub_80FA484(bool32 a0);
 void var_800D_set_xB(void);
-struct GFtgtGname *sub_80F9800(void);
+struct GFtgtGname *GetHostRFUtgtGname(void);
 void UpdateWirelessStatusIndicatorSprite(void);
 void InitRFU(void);
-void sub_80FEB14(void);
-bool32 sub_80FBA00(void);
-
-void sub_80FC478(struct UnkRfuStruct_2_Sub_124 *ptr);
-void sub_80FC4D4(struct UnkRfuStruct_2_Sub_9e8 *ptr);
-
-void sub_80FD4B0(const struct UnkLinkRfuStruct_02022B2C *unk0);
-u8 sub_80FD538(u8 r5, u16 r7, u16 r8, const u16 *r6);
-void sub_80FD760(bool8 a0);
-void sub_80FEA10(void (*func)(u16));
-void sub_80FB9E4(u8 a0, u16 a1);
-u8 sub_80FB9F4(void);
-void LinkRfu_REQ_SendData_HandleParentRelationship(bool8 clockChangeFlag);
-void sub_80FC588(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2);
-void sub_80FD52C(void);
-u8 sub_80FD610(u16 parentId, u16 unk_1a);
-bool8 sub_80FC79C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2);
-bool8 sub_80FC888(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2);
-void sub_80FC828(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2);
-bool8 sub_80FC6E8(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1);
-void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1);
-u8 sub_80FEA34(u8 a0, u16 a1);
-void sub_80FDA30(u32 a0);
-void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3);
-void LinkRfu_syncVBlank_(void);
-s32 sub_80FD430(void (*func1)(u8, u8), void (*func2)(u16));
-void sub_80FEB3C(void);
-void sub_80FAFE0(u8 a0);
-bool32 sub_80FA44C(u32 a0);
+bool32 RfuIsErrorStatus1or2(void);
+
+void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *ptr);
+void RFU_queue_40_14_reset(struct UnkRfuStruct_2_Sub_9e8 *ptr);
+
+void RfuSetErrorStatus(u8 a0, u16 msg);
+u8 RfuGetErrorStatus(void);
+void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2);
+bool8 RFU_queue_40_14_send(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2);
+bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2);
+void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2);
+bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1);
+void RFU_queue_40_14_recv(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1);
+void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders);
+void UpdateGameData_GroupLockedIn(bool8 started);
+bool32 RfuSerialNumberIsValid(u32 a0);
 bool8 sub_80FC1B0(void);
-bool8 sub_80F8F40(void);
-void sub_80F8F5C(void);
+bool8 LmanAcceptSlotFlagIsNotZero(void);
+void LinkRfu_StopManagerAndFinalizeSlots(void);
 bool32 sub_80FA5D4(void);
 bool32 sub_80FC1CC(void);
-bool32 sub_80F8F7C(bool32 a0);
-bool32 sub_80FA634(u16 a0, const u8 *a1);
-void sub_80FA670(u8 a0, u16 a1, const u8 *a2);
-u32 sub_80FA6FC(u16 a0, const u8 *a1);
-void SetHostRFUtgtGname(u8 a0, u32 a1, u32 a2);
-void sub_80FBB8C(u32 a0);
-void sub_80FBD4C(const u8 *ptr, u16 a1);
+bool32 WaitRfuState(bool32 a0);
+bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName);
+void SendByteToPartnerByIdAndName(u8 a0, u16 a1, const u8 *a2);
+u32 WaitSendByteToPartnerByIdAndName(u16 a0, const u8 *a1);
+void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 a2);
+void InitializeRfuLinkManager_LinkLeader(u32 availSlots);
+void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId);
 void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
-void sub_80FBBD8(void);
-void sub_80FA6BC(void);
-void sub_80FBF54(const u8 *src, u16 trainerId);
-void sub_80FB008(u8 a0, u32 a1, u32 a2);
+void InitializeRfuLinkManager_JoinGroup(void);
+void LinkRfuNIsend8(void);
+void CreateTask_RfuReconnectWithParent(const u8 *src, u16 trainerId);
+void UpdateGameDataWithActivitySpriteGendersFlag(u8 activity, u32 child_sprite_genders, u32 started);
 void RecordMixTrainerNames(void);
-void sub_80F8CFC();
-void sub_80F8D14();
-void sub_80FAF74(bool32 a0, bool32 a1);
+void LinkRfu_CreateConnectionAsParent();
+void LinkRfu_StopManagerBeforeEnteringChat();
+void SetGnameBufferWonderFlags(bool32 hasNews, bool32 hasCard);
 void ClearAndInitHostRFUtgtGname(void);
 void sub_80F8FA0(void);
-void sub_80FAFA0(u32 type, u32 species, u32 level);
-bool32 sub_80FBB0C(void);
-void sub_80FBC00(void);
+void RfuUpdatePlayerGnameStateAndSend(u32 type, u32 species, u32 level);
+bool32 IsUnionRoomListenTaskActive(void);
+void InitializeRfuLinkManager_EnterUnionRoom(void);
 void sub_80FBD6C(u32 a0);
 void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2);
 bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name);
-bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx);
-bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx);
+bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx);
+bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx);
 bool32 GetRfuUnkCE8(void);
 void sub_80FA4A8(void);
 void sub_80FB9D0(void);
diff --git a/include/menu.h b/include/menu.h
index b6d757f85..49dd43e26 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -30,7 +30,7 @@ s8 sub_812EAE4(u16 species, u32 personality, u8 a2);
 // list_menu
 void sub_8107CD8(u8 palOffset, u16 speciesId);
 void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
-void sub_8107D38(u8 palOffset, u8 palId);
+void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
 void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
 
 // menu
diff --git a/include/mevent.h b/include/mevent.h
index 85782f20a..4f3e365f7 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -13,7 +13,7 @@ struct MEventClientHeaderStruct
     u16 id;
     u16 unk_16[4];
     struct MEventBuffer_3430_Sub unk_20;
-    u8 unk_44;
+    u8 maxDistributionMons;
     u8 playerName[7];
     u8 playerTrainerId[4];
     u16 easyChatProfile[6];
@@ -33,21 +33,38 @@ struct MEvent_Str_2
     u8 fill_00[0x40];
 };
 
+struct UnkStruct_8467FB8
+{
+    u8 textPal1:4;
+    u8 textPal2:4;
+    u8 textPal3:4;
+    u8 index:4;
+    const u8 * tiles;
+    const u8 * map;
+    const u16 * pal;
+};
+
+extern const u16 gCard1Pal[];
+extern const u16 gCard2Pal[];
+extern const u16 gCard3Pal[];
+extern const u16 gCard4Pal[];
+extern const u16 gCard5Pal[];
+
 struct MEWonderNewsData * GetSavedWonderNews(void);
 struct MEWonderCardData * GetSavedWonderCard(void);
 struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void);
 struct MENewsJisanStruct * GetMENewsJisanStructPtr(void);
-bool32 sub_8143DC8(const struct MEWonderNewsData * src);
+bool32 OverwriteSavedWonderNewsWithReceivedNews(const struct MEWonderNewsData * src);
 bool32 ValidateReceivedWonderNews(void);
 bool32 ValidateReceivedWonderCard(void);
-bool32 sub_8143EF4(const u8 * src);
-bool32 sub_8143F68(const struct MEWonderCardData * data);
-void sub_814410C(struct MEWonderCardData * buffer);
-bool32 sub_8144254(const u16 * data);
+bool32 MEvent_HaveAlreadyReceivedWonderNews(const u8 * src);
+bool32 OverwriteSavedWonderCardWithReceivedCard(const struct MEWonderCardData * data);
+void MEvent_WonderCardResetUnk08_6(struct MEWonderCardData * buffer);
+bool32 MEvent_ReceiveDistributionMon(const u16 * data);
 void BuildMEventClientHeader(struct MEventClientHeaderStruct * data);
 bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data);
 u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
-u32 sub_8144434(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
+u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused);
 bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1);
 u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command);
 bool32 InitWonderCardResources(struct MEWonderCardData * r5, struct MEventBuffer_3430_Sub * r6);
@@ -66,12 +83,12 @@ void MENews_RemoveScrollIndicatorArrowPair(void);
 bool32 WonderNews_Test_Unk_02(void);
 bool32 WonderCard_Test_Unk_08_6(void);
 u32 MENews_GetInput(u16 input);
-void sub_8143D24(void);
-u16 sub_81445C0(u32 command);
-void sub_8144714(u32 a0, u32 a1);
+void InitMEventData(void);
+u16 MEvent_GetBattleCardCount(u32 command);
+void MEvent_RecordIdOfWonderCardSenderByEventType(u32 eventId, u32 trainerId);
 u16 *GetMEventProfileECWordsMaybe(void);
-void sub_81446C4(void);
-bool32 sub_81446D0(u16 a0);
+void ResetReceivedWonderCardFlag(void);
+bool32 MEventHandleReceivedWonderCard(u16 cardId);
 u16 GetWonderCardFlagId(void);
 
 #endif //GUARD_MEVENT_H
diff --git a/include/mevent_server.h b/include/mevent_server.h
index 1e9ef7bef..a7c7a3f23 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -48,6 +48,7 @@ struct mevent_client_cmd
 #define CLI_RECVBUF    {.instr = 12, .parameter = 0}
 #define CLI_REQWORD    {.instr = 13, .parameter = 0}
 #define CLI_SNDWORD    {.instr = 14, .parameter = 0}
+#define CLI_RECVMON    {.instr = 16, .parameter = 0}
 #define CLI_RECVRAM    {.instr = 17, .parameter = 0}
 #define CLI_SENDALL    {.instr = 20, .parameter = 0}
 
diff --git a/include/overworld.h b/include/overworld.h
index a7031e56d..8242615c7 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -147,7 +147,7 @@ void Overworld_ResetStateAfterTeleport(void);
 void Overworld_FadeOutMapMusic(void);
 void CB2_LoadMap(void);
 bool8 BGMusicStopped(void);
-bool8 is_light_level_8_or_9(u8 mapType);
+bool8 IsMapTypeIndoors(u8 mapType);
 bool32 sub_8055C9C(void);
 void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
@@ -156,7 +156,7 @@ u8 GetCurrentMapType(void);
 u8 get_map_light_from_warp0(void);
 const struct MapHeader *warp1_get_mapheader(void);
 void sub_8055F88(void);
-void sub_8056788(void);
+void CB2_ReturnToFieldCableClub(void);
 void ResetGameStats(void);
 
 void Overworld_CreditsMainCB(void);
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index 0e9094752..fa4105a0e 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -5,6 +5,6 @@
 
 void ResetPokeJumpResults(void);
 bool32 IsSpeciesAllowedInPokemonJump(u16 species);
-void sub_8147AA8(u16 species, MainCallback callback);
+void StartPokemonJump(u16 species, MainCallback callback);
 
 #endif // GUARD_POKEMON_JUMP_H
diff --git a/include/renewable_hidden_items.h b/include/renewable_hidden_items.h
index 0de109528..3a0385c00 100644
--- a/include/renewable_hidden_items.h
+++ b/include/renewable_hidden_items.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_RENEWABLE_HIDDEN_ITEMS_H
 #define GUARD_RENEWABLE_HIDDEN_ITEMS_H
 
-bool32 sub_815D834(void);
 void IncrementRenewableHiddenItemStepCounter(void);
 void TryRegenerateRenewableHiddenItems(void);
 void SetAllRenewableItemFlags(void);
diff --git a/include/rfu_union_tool.h b/include/rfu_union_tool.h
index b8b5cd664..7fc7fd4cb 100644
--- a/include/rfu_union_tool.h
+++ b/include/rfu_union_tool.h
@@ -3,15 +3,14 @@
 
 #include "union_room.h"
 
-void sub_811C1C8(void);
-void sub_811BAAC(u8 *spriteIds, s32 arg1);
-void sub_811BB40(u8 *spriteIds);
-void sub_811BB68(void);
-void sub_811BECC(struct UnkStruct_URoom *arg0);
-void sub_811BEDC(struct UnkStruct_URoom *arg0);
-bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
-void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
 u8 ZeroUnionObjWork(struct UnionObj * ptr);
-void sub_811BA78(void);
+void DeleteUnionObjWorkAndStopTask(void);
+void CreateGroupMemberObjectsInvisible(u8 *spriteIds, s32 group);
+void DestroyGroupMemberObjects(u8 *spriteIds);
+void MakeGroupAssemblyAreasPassable(void);
+void ScheduleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p);
+void HandleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p);
+bool32 RfuUnionTool_GetGroupAndMemberInFrontOfPlayer(struct UnkStruct_Main0 *main0_p, s16 *member_p, s16 *group_p, u8 *spriteIds);
+void UpdateUnionGroupMemberFacing(u32 member, u32 group, struct UnkStruct_Main0 *main0_p);
 
 #endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H
diff --git a/include/script.h b/include/script.h
index c0b23e248..2fb732396 100644
--- a/include/script.h
+++ b/include/script.h
@@ -48,7 +48,7 @@ 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 RunOnLoadMapScript(void);
 void mapheader_run_script_with_tag_x3(void);
 void mapheader_run_script_with_tag_x5(void);
 void mapheader_run_script_with_tag_x7(void);
@@ -62,7 +62,7 @@ u8 *GetRamScript(u8 objectId, u8 *script);
 bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
-bool32 sub_8069DFC(void);
+bool32 ValidateRamScript(void);
 void MEventSetRamScript(u8 * script, u16 scriptSize);
 u8 * sub_8069E48(void);
 void sub_8069998(u8 var);
diff --git a/include/sprite.h b/include/sprite.h
index 7432306a4..acf8f719c 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -315,6 +315,6 @@ void CopyFromSprites(u8 *dest);
 u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
 void ClearSpriteCopyRequests(void);
 void ResetAffineAnimData(void);
-void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3);
+void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod);
 
 #endif //GUARD_SPRITE_H
diff --git a/include/strings.h b/include/strings.h
index 5c8ffde4b..d468af4f3 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1100,4 +1100,30 @@ extern const u8 gText_Symbols[];
 extern const u8 gText_Register2[];
 extern const u8 gText_Exit[];
 
+// wireless_communication_status_screen
+extern const u8 gUnknown_841E2B4[];
+extern const u8 gUnknown_841E2BF[];
+extern const u8 gUnknown_841E2C9[];
+extern const u8 gUnknown_841E2D4[];
+extern const u8 gText_WirelessCommunicationStatus[];
+extern const u8 gText_PeopleTrading[];
+extern const u8 gText_PeopleBattling[];
+extern const u8 gText_PeopleInUnionRoom[];
+extern const u8 gText_PeopleCommunicating[];
+
+// mevent
+extern const u8 gJPText_ReceiveMysteryGiftWithEReader[];
+extern const u8 gJPText_SelectConnectFromEReaderMenu[];
+extern const u8 gJPText_SelectConnectWithGBA[];
+extern const u8 gJPText_LinkIsIncorrect[];
+extern const u8 gJPText_CardReadingHasBeenHalted[];
+extern const u8 gJPText_Connecting[];
+extern const u8 gJPText_ConnectionErrorCheckLink[];
+extern const u8 gJPText_ConnectionErrorTryAgain[];
+extern const u8 gJPText_AllowEReaderToLoadCard[];
+extern const u8 gJPText_ConnectionComplete[];
+extern const u8 gJPText_NewTrainerHasComeToSevii[];
+extern const u8 gJPText_PleaseWaitAMoment[];
+extern const u8 gJPText_WriteErrorUnableToSaveData[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/trainer_tower.h b/include/trainer_tower.h
index 9c1ac0631..72c0f236c 100644
--- a/include/trainer_tower.h
+++ b/include/trainer_tower.h
@@ -6,7 +6,9 @@ void InitTrainerTowerBattleStruct(void);
 void FreeTrainerTowerBattleStruct(void);
 u8 GetTrainerTowerTrainerFrontSpriteId(void);
 void ResetTrainerTowerResults(void);
-void sub_815DA28(u8 *text);
-u8 sub_815DA10(void);
+void GetTrainerTowerOpponentWinText(u8 *dest, u8 opponentIdx);
+void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx);
+void GetTrainerTowerOpponentName(u8 *text);
+u8 GetTrainerTowerOpponentClass(void);
 
 #endif //GUARD_TRAINER_TOWER_H
diff --git a/include/union_room.h b/include/union_room.h
index 7e48b3e6e..e24bcd480 100644
--- a/include/union_room.h
+++ b/include/union_room.h
@@ -4,28 +4,34 @@
 #include "global.h"
 #include "link_rfu.h"
 
-struct UnkStruct_Shared
+// Return value of IsRequestedTypeAndSpeciesInPlayerParty
+#define UR_TRADE_MATCH  0
+#define UR_TRADE_NOTYPE 1
+#define UR_TRADE_NOEGG  2
+
+#define UROOM_MAX_GROUP_COUNT 8
+#define UROOM_MAX_PARTY_SIZE  5
+
+struct UnionGnameUnamePair
 {
     struct GFtgtGname gname;
-    u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1];
+    u8 ALIGNED(4) uname[PLAYER_NAME_LENGTH + 1];
 };
 
 struct UnkStruct_x1C
 {
-    struct UnkStruct_Shared unk0;
-    u8 unk18:1;
+    struct UnionGnameUnamePair gname_uname;
+    u8 active:1;
 };
 
 struct UnkStruct_x20
 {
-    struct UnkStruct_Shared unk;
+    struct UnionGnameUnamePair gname_uname;
     u16 field_18;
-    u8 field_1A_0:2;
-    u8 field_1A_1:1;
+    u8 groupScheduledAnim:2;
+    bool8 field_1A_1:1;
     u8 field_1B;
-    u8 field_1D;
-    u8 field_1E;
-    u8 field_1F;
+    u32 field_1C; // unused
 };
 
 // These arrays are dynamically allocated but must be
@@ -51,17 +57,17 @@ struct UnkStruct_Leader
     struct UnkStruct_Main0 * field_8;
     u8 state;
     u8 textState;
-    u8 field_E;
+    u8 delayTimerAfterOk;
     u8 listWindowId;
-    u8 field_10;
-    u8 field_11;
+    u8 bButtonCancelWindowId;
+    u8 nPlayerModeWindowId;
     u8 listTaskId;
-    u8 field_13;
-    u8 field_14;
+    u8 playerCount;
+    u8 messageWindowId;
     u8 field_15;
     u8 field_16;
-    u8 field_17;
-    u8 field_18;
+    u8 listenTaskId;
+    u8 activity;
     u8 field_19;
     u16 field_1A;
 };
@@ -72,18 +78,18 @@ struct UnkStruct_Group
     struct UnkStruct_Main4 * field_4;
     u8 state;
     u8 textState;
-    u8 field_A;
+    u8 field_A; // unused
     u8 listWindowId;
-    u8 field_C;
-    u8 field_D;
+    u8 bButtonCancelWindowId;
+    u8 playerNameAndIdWindowId;
     u8 listTaskId;
-    u8 field_F;
+    u8 leaderId;
     u8 field_10;
-    u8 field_11;
-    u8 field_12;
-    u8 field_13;
-    u8 field_14;
-    u8 field_15;
+    u8 listenTaskId;
+    u8 cardOrNews;
+    u8 field_13; // referenced but never set
+    u8 refreshTimer;
+    u8 delayBeforePrint;
 };
 
 struct UnionObj
@@ -109,19 +115,21 @@ struct UnkStruct_URoom
     /* 0x018 */ u8 field_18;
     /* 0x019 */ u8 field_19;
     /* 0x01A */ u8 field_1A;
-    /* 0x01B */ u8 field_1B;
-    /* 0x01C */ u8 field_1C;
-    /* 0x01D */ u8 field_1D;
-    /* 0x01E */ u8 field_1E;
+    /* 0x01B */ u8 topListMenuWindowId;
+    /* 0x01C */ u8 topListMenuListMenuId;
+    /* 0x01D */ u8 tradeBoardSelectWindowId;
+    /* 0x01E */ u8 tradeBoardDetailsWindowId;
     /* 0x01F */ u8 field_1F;
     /* 0x020 */ u8 field_20;
     /* 0x021 */ u8 spriteIds[40];
     /* 0x049 */ u8 field_49;
-    /* 0x04A */ u8 field_4A;
-    /* 0x04C */ u16 field_4C[6];
-    /* 0x058 */ u8 field_58[4][11];
-    /* 0x084 */ u16 field_98;
-    /* 0x086 */ u16 field_9A[3];
+    /* 0x04A */ u8 tradeBoardListMenuId;
+
+        // For communication with potential link partners
+    /* 0x04C */ u16 playerSendBuffer[6];
+    /* 0x058 */ u8 activityRequestStrbufs[4][11];
+    /* 0x084 */ u16 partnerYesNoResponse;
+    /* 0x086 */ u16 recvActivityRequest[3];  // activity[, species, level]
     /* 0x08C */ struct UnionObj unionObjs[8];
     /* 0x0AC */ u8 trainerCardStrbufs[12][15];
     /* 0x160 */ u8 field_174[48];
@@ -150,10 +158,10 @@ struct UnionRoomTrade
     u32 personality;
 };
 
-extern struct GFtgtGnameSub gUnknown_203B064;
+extern struct GFtgtGnameSub gPartnerTgtGnameSub;
 extern u16 gUnionRoomOfferedSpecies;
 extern u8 gUnionRoomRequestedMonType;
 
-void sub_81173C0(u16 battleFlags);
+void StartUnionRoomBattle(u16 battleFlags);
 
 #endif //GUARD_UNION_ROOM_H
diff --git a/include/union_room_battle.h b/include/union_room_battle.h
new file mode 100644
index 000000000..ffccf197f
--- /dev/null
+++ b/include/union_room_battle.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_UNION_ROOM_BATTLE_H
+#define GUARD_UNION_ROOM_BATTLE_H
+
+void CB2_UnionRoomBattle(void);
+
+#endif //GUARD_UNION_ROOM_BATTLE_H
diff --git a/include/union_room_message.h b/include/union_room_message.h
index b7de673ba..db24aca15 100644
--- a/include/union_room_message.h
+++ b/include/union_room_message.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-extern const u8 gUnknown_84571AC[];
+extern const u8 gUnionRoomActivity_Blank[];
 extern const u8 gUnknown_84571B0[];
 extern const u8 gUnknown_84571B4[];
 extern const u8 gUnknown_84571B8[];
@@ -31,8 +31,8 @@ extern const u8 gUnknown_84577BC[];
 extern const u8 gUnknown_84577F8[];
 extern const u8 *const gUnknown_8457838[];
 extern const u8 gUnknown_84578BC[];
-extern const u8 *const gUnknown_8457A34[];
-extern const u8 *const gUnknown_8457B04[][2];
+extern const u8 *const gURText_PleaseWaitMsgs[];
+extern const u8 *const gURText_FriendPromptsForActivity[][2];
 extern const u8 *const gUnknown_8457BCC[];
 extern const u8 *const gUnknown_8457C20[];
 extern const u8 gUnknown_8457C48[];
@@ -46,7 +46,7 @@ extern const u8 gUnknown_8457E44[];
 extern const u8 gUnknown_8457E60[];
 extern const u8 *const gUnknown_8457F80[][2];
 extern const u8 gUnknown_8457F90[];
-extern const u8 *const gUnknown_84580F4[][4];
+extern const u8 *const gResponseToURoomActivityInviteStringPtrs[][4];
 extern const u8 *const gUnknown_8458230[][2][3];
 extern const u8 *const gUnknown_8458314[];
 extern const u8 *const gUnknown_84583B4[];
@@ -63,7 +63,7 @@ extern const u8 *const gUnknown_8458A78[2][4];
 extern const u8 gUnknown_8458A98[];
 extern const u8 gUnknown_8458AB8[];
 extern const u8 gUnknown_8458B44[];
-extern const u8 gUnknown_8458CD4[];
+extern const u8 gURText_PleaseChooseTypeOfMon[];
 extern const u8 gUnknown_8458D1C[];
 extern const u8 gUnknown_8458D54[];
 extern const u8 gUnknown_8458D78[];
@@ -75,7 +75,7 @@ extern const u8 gUnknown_8458E70[];
 extern const u8 gUnknown_8458ED0[];
 extern const u8 gUnknown_8458F04[];
 extern const u8 gUnknown_8458F9C[];
-extern const u8 gUnknown_8458FBC[];
+extern const u8 gText_EggTrade[];
 extern const u8 gUnknown_8458FC8[];
 extern const u8 gUnknown_8458FE4[];
 extern const u8 gUnknown_84591DC[];
@@ -91,20 +91,20 @@ extern const u8 gUnknown_8459360[];
 extern const u8 gUnknown_8459368[];
 extern const u8 gUnknown_8459370[];
 extern const u8 gUnknown_8459378[];
-extern const u8 gUnknown_8459394[];
-extern const u8 gUnknown_84593A4[];
-extern const u8 gUnknown_84593B4[];
-extern const u8 gUnknown_84593C4[];
-extern const u8 gUnknown_84593D4[];
-extern const u8 gUnknown_84593E4[];
-extern const u8 gUnknown_84593F4[];
-extern const u8 gUnknown_84593DC[];
-extern const u8 gUnknown_8459400[];
-extern const u8 gUnknown_8459410[];
-extern const u8 gUnknown_845941C[];
-extern const u8 gUnknown_845942C[];
-extern const u8 gUnknown_8459434[];
-extern const u8 gUnknown_8459440[];
+extern const u8 gUnionRoomActivity_SingleBattle[];
+extern const u8 gUnionRoomActivity_DoubleBattle[];
+extern const u8 gUnionRoomActivity_MultiBattle[];
+extern const u8 gUnionRoomActivity_PokemonTrades[];
+extern const u8 gUnionRoomActivity_Chat[];
+extern const u8 gUnionRoomActivity_WonderCards[];
+extern const u8 gunionRoomActivity_WonderNews[];
+extern const u8 gUnionRoomActivity_Cards[];
+extern const u8 gUnionRoomActivity_PokemonJump[];
+extern const u8 gUnionRoomActivity_BerryCrush[];
+extern const u8 gUnionRoomActivity_BerryPicking[];
+extern const u8 gUnionRoomActivity_Search[];
+extern const u8 gUnionRoomActivity_SpinTradeJP[];
+extern const u8 gUnionRoomActivity_ItemTradeJP[];
 extern const u8 *const gUnknown_84594B0[];
 extern const u8 gUnknown_84594C4[];
 extern const u8 gUnknown_8459504[];
diff --git a/include/unk_810c3a4.h b/include/unk_810c3a4.h
deleted file mode 100644
index 11a91b5ef..000000000
--- a/include/unk_810c3a4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef GUARD_UNK_810C3A4_H
-#define GUARD_UNK_810C3A4_H
-
-#define GET_VS_SEEKER_COUNTER_0() (gSaveBlock1Ptr->trainerRematch.stepCounter & 0xFF)
-#define GET_VS_SEEKER_COUNTER_1() (gSaveBlock1Ptr->trainerRematch.stepCounter >> 8)
-#define SET_VS_SEEKER_COUNTER_0(x) ({\
-    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0xFF00;\
-    gSaveBlock1Ptr->trainerRematch.stepCounter |= (x);\
-})
-#define SET_VS_SEEKER_COUNTER_1(x) ({\
-    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0x00FF;\
-    gSaveBlock1Ptr->trainerRematch.stepCounter |= ((x) << 8);\
-})
-#define INC_VS_SEEKER_COUNTER_0() ({\
-    u8 x = GET_VS_SEEKER_COUNTER_0();\
-    if (x < 100) gSaveBlock1Ptr->trainerRematch.stepCounter++;\
-})
-#define INC_VS_SEEKER_COUNTER_1() ({\
-    u8 x = GET_VS_SEEKER_COUNTER_1();\
-    if (x < 100) {x++; SET_VS_SEEKER_COUNTER_1(x);}\
-})
-
-void sub_810C604(void);
-void sub_810C640(void);
-
-#endif //GUARD_UNK_810C3A4_H
diff --git a/include/unk_815C980.h b/include/unk_815C980.h
deleted file mode 100644
index a3249a8e2..000000000
--- a/include/unk_815C980.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef GUARD_UNK_815C980_H
-#define GUARD_UNK_815C980_H
-
-struct UnkStruct3
-{
-    u8 field_0_0:2;
-    u8 shape:2;
-    u8 size:2;
-    u8 priority:2;
-    u8 field_1;
-    u8 xDelta;
-    s16 x;
-    s16 y;
-    const struct SpriteSheet *spriteSheet;
-    const struct SpritePalette *spritePal;
-};
-
-void sub_815C9F4(void);
-void sub_815D108(u32 id);
-void sub_815D1A8(u32 id, bool32 arg1);
-bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2);
-void sub_815CD70(u32 id, s32 arg1);
-
-#endif //GUARD_UNK_815C980_H
diff --git a/include/unk_815c27c.h b/include/unk_815c27c.h
deleted file mode 100644
index 02c886895..000000000
--- a/include/unk_815c27c.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GUARD_UNK_815C27C_H
-#define GUARD_UNK_815C27C_H
-
-void EReaderHelper_SerialCallback(void);
-void EReaderHelper_Timer3Callback(void);
-void EReaderHelper_SaveRegsState(void);
-void EReaderHelper_ClearsSendRecvMgr(void);
-void EReaderHelper_RestoreRegsState(void);
-u16 EReaderHandleTransfer(u8, size_t, const void *, void *);
-
-#endif //GUARD_UNK_815C27C_H
diff --git a/include/vs_seeker.h b/include/vs_seeker.h
index fdd6839df..2d88417fa 100644
--- a/include/vs_seeker.h
+++ b/include/vs_seeker.h
@@ -3,6 +3,9 @@
 
 #include "global.h"
 
+void sub_810C604(void);
+void sub_810C640(void);
+
 void Task_VsSeeker_0(u8 taskId);
 void sub_810CB90(void);
 void sub_810CDE8(void);
diff --git a/ld_script.txt b/ld_script.txt
index 021686fcb..341c816e3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -95,7 +95,7 @@ SECTIONS {
         asm/field_player_avatar.o(.text);
         asm/event_object_movement.o(.text);
         asm/field_ground_effect.o(.text);
-        asm/event_object_80688E4.o(.text);
+        src/event_object_80688E4.o(.text);
         asm/field_message_box.o(.text);
         src/event_object_lock.o(.text);
         src/text_window_graphics.o(.text);
@@ -226,7 +226,7 @@ SECTIONS {
         src/map_preview_screen.o(.text);
         src/link_rfu_2.o(.text);
         src/link_rfu_3.o(.text);
-        src/link_rfu.o(.text);
+        src/AgbRfu_LinkManager.o(.text);
         asm/easy_chat_2.o(.text);
         src/pokedex_screen.o(.text);
         asm/pokedex_screen.o(.text);
@@ -270,7 +270,8 @@ SECTIONS {
         src/mevent_server_helpers.o(.text);
         src/mevent_client.o(.text);
         src/mevent_server.o(.text);
-        src/mevent_8145654.o(.text);
+        src/mevent_show_card.o(.text);
+        src/mevent_show_news.o(.text);
         src/menews_jisan.o(.text);
         src/seagallop.o(.text);
         asm/pokemon_jump.o(.text);
@@ -289,13 +290,13 @@ SECTIONS {
         asm/dodrio_berry_picking_2.o(.text);
         src/teachy_tv.o(.text);
         src/ereader_helpers.o(.text);
-        src/unk_815C980.o(.text);
+        src/digit_obj_util.o(.text);
         src/ss_anne.o(.text);
         src/cereader_tool.o(.text);
         src/renewable_hidden_items.o(.text);
         src/trainer_tower.o(.text);
         src/berry_powder.o(.text);
-        src/unk_815F138.o(.text);
+        src/minigame_countdown.o(.text);
         src/berry_fix_program.o(.text);
     } =0
 
@@ -322,7 +323,7 @@ SECTIONS {
         src/agb_flash_mx.o(.text);
         src/agb_flash_le.o(.text);
         src/librfu_stwi.o(.text);
-        asm/librfu_intr.o(.text);
+        src/librfu_intr.o(.text);
         src/librfu_rfu.o(.text);
         src/librfu_sio32id.o(.text);
         src/isagbprn.o(.text);
@@ -422,7 +423,7 @@ SECTIONS {
         data/field_player_avatar.o(.rodata);
         data/event_object_movement.o(.rodata);
         data/field_ground_effect.o(.rodata);
-        data/event_object_80688E4.o(.rodata);
+        src/event_object_80688E4.o(.rodata);
         src/scrcmd.o(.rodata);
         src/coord_event_weather.o(.rodata);
         src/field_tasks.o(.rodata);
@@ -558,7 +559,8 @@ SECTIONS {
         src/mevent_server_helpers.o(.rodata);
         src/mevent_client.o(.rodata);
         src/mevent_server.o(.rodata);
-        src/mevent_8145654.o(.rodata);
+        src/mevent_show_card.o(.rodata);
+        src/mevent_show_news.o(.rodata);
         src/mevent_scripts.o(.rodata);
         src/menews_jisan.o(.rodata);
         src/menews_jisan.o(.rodata.str1.4);
@@ -573,13 +575,13 @@ SECTIONS {
         src/dodrio_berry_picking.o(.rodata);
         src/battle_controller_pokedude.o(.rodata);
         src/teachy_tv.o(.rodata);
-        src/unk_815C980.o(.rodata);
+        src/digit_obj_util.o(.rodata);
         data/data_8479668.o(.rodata);
         src/ss_anne.o(.rodata);
         src/cereader_tool.o(.rodata);
         src/renewable_hidden_items.o(.rodata);
         src/trainer_tower.o(.rodata);
-        src/unk_815F138.o(.rodata);
+        src/minigame_countdown.o(.rodata);
         src/berry_fix_program.o(.rodata);
         data/data_8479668.o(.rodata.after_trainer_tower);
 
diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c
new file mode 100644
index 000000000..e4127ee09
--- /dev/null
+++ b/src/AgbRfu_LinkManager.c
@@ -0,0 +1,1398 @@
+#include "global.h"
+#include "librfu.h"
+#include "link_rfu.h"
+
+#define RN_ACCEPT           0x01
+#define RN_NAME_TIMER_CLEAR 0x02
+#define RN_DISCONNECT       0x04
+
+#define LINK_RECOVERY_OFF        0x00
+#define LINK_RECOVERY_START      0x01
+#define LINK_RECOVERY_EXE        0x02
+#define LINK_RECOVERY_IMPOSSIBLE 0x04
+
+#define FSP_ON    0x01
+#define FSP_START 0x02
+
+LINK_MANAGER lman;
+
+static void rfu_LMAN_clearVariables(void);
+static void rfu_LMAN_settingPCSWITCH(u32 rand);
+static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult);
+static void rfu_LMAN_MSC_callback(u16 reqCommandId);
+static void rfu_LMAN_PARENT_checkRecvChildName(void);
+static void rfu_LMAN_CHILD_checkSendChildName(void);
+static void rfu_LMAN_CHILD_checkSendChildName2(void);
+static void rfu_LMAN_CHILD_linkRecoveryProcess(void);
+static u8 rfu_LMAN_CHILD_checkEnableParentCandidate(void);
+static void rfu_LMAN_occureCallback(u8 msg, u8 param_count);
+static void rfu_LMAN_disconnect(u8 bmDisconnectSlot);
+static void rfu_LMAN_reflectCommunicationStatus(u8 bm_disconnectedSlot);
+static void rfu_LMAN_checkNICommunicateStatus(void);
+static void rfu_LMAN_managerChangeAgbClockMaster(void);
+
+u32 rfu_LMAN_REQBN_softReset_and_checkID(void)
+{
+    u32 id = rfu_REQBN_softReset_and_checkID();
+    if (id == RFU_ID)
+        lman.RFU_powerOn_flag = 1;
+    if (lman.state != LMAN_FORCED_STOP_AND_RFU_RESET && lman.state != LMAN_STATE_SOFT_RESET_AND_CHECK_ID)
+    {
+        lman.state = lman.next_state = LMAN_STATE_READY;
+    }
+    lman.pcswitch_flag = 0;
+    lman.reserveDisconnectSlot_flag = 0;
+    lman.acceptCount = 0;
+    lman.acceptSlot_flag = 0;
+    lman.parent_child = MODE_NEUTRAL;
+    rfu_LMAN_managerChangeAgbClockMaster();
+    return id;
+}
+
+void rfu_LMAN_REQ_sendData(u8 clockChangeFlag)
+{
+    if (gRfuLinkStatus->parentChild == MODE_CHILD)
+    {
+        if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_ON)
+            clockChangeFlag = TRUE;
+        else
+            clockChangeFlag = FALSE;
+    }
+    else
+        lman.parentAck_flag = 0;
+    rfu_REQ_sendData(clockChangeFlag);
+}
+
+u8 rfu_LMAN_initializeManager(void (*LMAN_callback_p)(u8, u8), void (*MSC_callback_p)(u16))
+{
+    if (LMAN_callback_p == NULL)
+    {
+        return LMAN_ERROR_ILLEGAL_PARAMETER;
+    }
+    CpuFill16(0, &lman, sizeof(struct linkManagerTag));
+    lman.parent_child = MODE_NEUTRAL;
+    lman.LMAN_callback = LMAN_callback_p;
+    lman.MSC_callback = MSC_callback_p;
+    rfu_setMSCCallback(rfu_LMAN_MSC_callback);
+    rfu_setREQCallback(rfu_LMAN_REQ_callback);
+    return 0;
+}
+
+static void rfu_LMAN_endManager(void)
+{
+    CpuFill16(0, &lman, sizeof(struct linkManagerTag) - 8);
+    lman.parent_child = MODE_NEUTRAL;
+}
+
+void rfu_LMAN_initializeRFU(INIT_PARAM *init_parameters)
+{
+    rfu_LMAN_clearVariables();
+    lman.state = LMAN_STATE_SOFT_RESET_AND_CHECK_ID;
+    lman.next_state = LMAN_STATE_RESET;
+    lman.init_param = init_parameters;
+    lman.linkRecovery_enable = init_parameters->linkRecovery_enable;
+    lman.linkRecoveryTimer.count_max = init_parameters->linkRecovery_period;
+    lman.NI_failCounter_limit = init_parameters->NI_failCounter_limit;
+    if (init_parameters->fastSearchParent_flag)
+    {
+        lman.fastSearchParent_flag = FSP_ON;
+    }
+}
+
+static void rfu_LMAN_clearVariables(void)
+{
+    u8 i;
+
+    lman.state = lman.next_state = LMAN_STATE_READY;
+    lman.parent_child = MODE_NEUTRAL;
+    lman.pcswitch_flag = 0;
+    lman.child_slot = 0;
+    lman.connectSlot_flag_old = 0;
+    lman.nameAcceptTimer.active = 0;
+    lman.linkRecoveryTimer.active = 0;
+    for (i = 0; i < RFU_CHILD_MAX; i++)
+    {
+        lman.nameAcceptTimer.count[i] = 0;
+        lman.linkRecoveryTimer.count[i] = 0;
+    }
+}
+
+void rfu_LMAN_powerDownRFU(void)
+{
+    lman.state = LMAN_STATE_STOP_MODE;
+}
+
+u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_accept_period, u16 *acceptable_serialNo_list)
+{
+    u8 i;
+    u16 *serial_list;
+
+    if (lman.state != LMAN_STATE_READY && (lman.state != LMAN_STATE_WAIT_RECV_CHILD_NAME || parent_child != MODE_PARENT))
+    {
+        lman.param[0] = 1;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_MANAGER_BUSY;
+    }
+    if (rfu_getMasterSlave() == AGB_CLK_SLAVE)
+    {
+        lman.param[0] = 2;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_AGB_CLK_SLAVE;
+    }
+    for (i = 0, serial_list = acceptable_serialNo_list; i < 16; i++)
+    {
+        if (*serial_list++ == 0xFFFF)
+        {
+            break;
+        }
+    }
+    if (i == 16)
+    {
+        lman.param[0] = 4;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_ILLEGAL_PARAMETER;
+    }
+    if (parent_child > MODE_PARENT)
+    {
+        lman.pcswitch_flag = PCSWITCH_1ST_SC_START;
+        parent_child = MODE_PARENT;
+        connect_period = 0;
+    }
+    else
+    {
+        lman.pcswitch_flag = 0;
+    }
+    if (parent_child != MODE_CHILD)
+    {
+        lman.state = LMAN_STATE_START_SEARCH_CHILD;
+    }
+    else
+    {
+        lman.state = LMAN_STATE_START_SEARCH_PARENT;
+        if (lman.fastSearchParent_flag)
+        {
+            lman.fastSearchParent_flag = FSP_START;
+        }
+    }
+    lman.parent_child = parent_child;
+    lman.connect_period = connect_period;
+    lman.nameAcceptTimer.count_max = name_accept_period;
+    lman.acceptable_serialNo_list = acceptable_serialNo_list;
+    return 0;
+}
+
+u8 rfu_LMAN_CHILD_connectParent(u16 parentId, u16 connect_period)
+{
+    u8 i;
+
+    if (lman.state != LMAN_STATE_READY && (lman.state < 9 || lman.state > 11))
+    {
+        lman.param[0] = 1;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_MANAGER_BUSY;
+    }
+    if (rfu_getMasterSlave() == AGB_CLK_SLAVE)
+    {
+        lman.param[0] = 2;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_AGB_CLK_SLAVE;
+    }
+    for (i = 0; i < gRfuLinkStatus->findParentCount; i++)
+    {
+        if (gRfuLinkStatus->partner[i].id == parentId)
+        {
+            break;
+        }
+    }
+    if (gRfuLinkStatus->findParentCount == 0 || i == gRfuLinkStatus->findParentCount)
+    {
+        lman.param[0] = 3;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_PID_NOT_FOUND;
+    }
+    if (lman.state == LMAN_STATE_READY || lman.state == LMAN_STATE_START_SEARCH_PARENT)
+    {
+        lman.state = LMAN_STATE_START_CONNECT_PARENT;
+        lman.next_state = LMAN_STATE_POLL_CONNECT_PARENT;
+    }
+    else
+    {
+        lman.state = LMAN_STATE_END_SEARCH_PARENT;
+        lman.next_state = LMAN_STATE_START_CONNECT_PARENT;
+    }
+    lman.work = parentId;
+    lman.connect_period = connect_period;
+    if (lman.pcswitch_flag != 0)
+    {
+        lman.pcswitch_flag = PCSWITCH_CP;
+    }
+    return 0;
+}
+
+static void rfu_LMAN_PARENT_stopWaitLinkRecoveryAndDisconnect(u8 bm_targetSlot)
+{
+    u8 i;
+
+    if ((bm_targetSlot & lman.linkRecoveryTimer.active) == 0)
+        return;
+    lman.linkRecoveryTimer.active &= ~bm_targetSlot;
+    for (i = 0; i < RFU_CHILD_MAX; i++)
+    {
+        if ((bm_targetSlot >> i) & 1)
+        {
+            lman.linkRecoveryTimer.count[i] = 0;
+        }
+    }
+    i = gRfuLinkStatus->linkLossSlotFlag & bm_targetSlot;
+    if (i)
+    {
+        rfu_LMAN_disconnect(i);
+    }
+    lman.param[0] = i;
+    rfu_LMAN_occureCallback(LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED, i);
+}
+
+void rfu_LMAN_stopManager(u8 forced_stop_and_RFU_reset_flag)
+{
+    u8 msg = 0;
+    lman.pcswitch_flag = 0;
+    if (forced_stop_and_RFU_reset_flag)
+    {
+        rfu_LMAN_clearVariables();
+        lman.state = LMAN_FORCED_STOP_AND_RFU_RESET;
+        return;
+    }
+    switch (lman.state)
+    {
+    case LMAN_STATE_START_SEARCH_CHILD:
+        lman.state = LMAN_STATE_WAIT_RECV_CHILD_NAME;
+        lman.next_state = LMAN_STATE_READY;
+        msg = LMAN_MSG_SEARCH_CHILD_PERIOD_EXPIRED;
+        break;
+    case LMAN_STATE_POLL_SEARCH_CHILD:
+        lman.state = LMAN_STATE_END_SEARCH_CHILD;
+        lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME;
+        break;
+    case LMAN_STATE_END_SEARCH_CHILD:
+        lman.state = LMAN_STATE_END_SEARCH_CHILD;
+        lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME;
+        break;
+    case LMAN_STATE_WAIT_RECV_CHILD_NAME:
+        break;
+    case LMAN_STATE_START_SEARCH_PARENT:
+        lman.state = lman.next_state = LMAN_STATE_READY;
+        msg = LMAN_MSG_SEARCH_PARENT_PERIOD_EXPIRED;
+        break;
+    case LMAN_STATE_POLL_SEARCH_PARENT:
+        lman.state = LMAN_STATE_END_SEARCH_PARENT;
+        lman.next_state = LMAN_STATE_READY;
+        break;
+    case LMAN_STATE_END_SEARCH_PARENT:
+        lman.state = LMAN_STATE_END_SEARCH_PARENT;
+        lman.next_state = LMAN_STATE_READY;
+        break;
+    case LMAN_STATE_START_CONNECT_PARENT:
+        lman.state = lman.next_state = LMAN_STATE_READY;
+        msg = LMAN_MSG_CONNECT_PARENT_FAILED;
+        break;
+    case LMAN_STATE_POLL_CONNECT_PARENT:
+        lman.state = LMAN_STATE_END_CONNECT_PARENT;
+        break;
+    case LMAN_STATE_END_CONNECT_PARENT:
+        lman.state = LMAN_STATE_END_CONNECT_PARENT;
+        break;
+    case LMAN_STATE_SEND_CHILD_NAME:
+        break;
+    case LMAN_STATE_START_LINK_RECOVERY:
+        lman.state = lman.state_bak[0];
+        lman.next_state = lman.state_bak[1];
+        rfu_LMAN_disconnect(gRfuLinkStatus->linkLossSlotFlag);
+        lman.param[0] = gRfuLinkStatus->linkLossSlotFlag;
+        rfu_LMAN_occureCallback(LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED, 1);
+        return;
+    case LMAN_STATE_POLL_LINK_RECOVERY:
+        lman.state = LMAN_STATE_END_LINK_RECOVERY;
+        break;
+    case LMAN_STATE_END_LINK_RECOVERY:
+        lman.state = LMAN_STATE_END_LINK_RECOVERY;
+        break;
+    default:
+        lman.state = lman.next_state = LMAN_STATE_READY;
+        msg = LMAN_MSG_MANAGER_STOPPED;
+        break;
+    }
+    if (lman.state == LMAN_STATE_READY)
+    {
+        rfu_LMAN_occureCallback(msg, 0);
+    }
+}
+
+static bool8 rfu_LMAN_linkWatcher(u16 REQ_commandID)
+{
+    u8 i;
+    u8 bm_linkLossSlot;
+    u8 reason;
+    u8 bm_linkRecoverySlot;
+    u8 bm_disconnectSlot;
+
+    bool8 disconnect_occure_flag = FALSE;
+    rfu_REQBN_watchLink(REQ_commandID, &bm_linkLossSlot, &reason, &bm_linkRecoverySlot);
+    if (bm_linkLossSlot)
+    {
+        lman.param[0] = bm_linkLossSlot;
+        lman.param[1] = reason;
+        if (lman.linkRecovery_enable)
+        {
+            lman.linkRecovery_start_flag = LINK_RECOVERY_START;
+            if (lman.parent_child == MODE_CHILD && reason == REASON_DISCONNECTED)
+            {
+                lman.linkRecovery_start_flag = LINK_RECOVERY_IMPOSSIBLE;
+            }
+            if (lman.linkRecovery_start_flag == LINK_RECOVERY_START)
+            {
+                for (i = 0; i < RFU_CHILD_MAX; i++)
+                {
+                    if ((bm_linkLossSlot >> i) & 1)
+                    {
+                        lman.linkRecoveryTimer.active |= (1 << i);
+                        lman.linkRecoveryTimer.count[i] = lman.linkRecoveryTimer.count_max;
+                    }
+                }
+                rfu_LMAN_occureCallback(LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY, 1);
+            }
+            else
+            {
+                lman.linkRecovery_start_flag = 0;
+                rfu_LMAN_disconnect(bm_linkLossSlot);
+                disconnect_occure_flag = TRUE;
+                rfu_LMAN_occureCallback(LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED, 1);
+            }
+        }
+        else
+        {
+            rfu_LMAN_disconnect(bm_linkLossSlot);
+            disconnect_occure_flag = TRUE;
+            rfu_LMAN_occureCallback(LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED, 2);
+        }
+        rfu_LMAN_managerChangeAgbClockMaster();
+    }
+    if (gRfuLinkStatus->parentChild == MODE_PARENT)
+    {
+        if (bm_linkRecoverySlot)
+        {
+            for (i = 0; i < RFU_CHILD_MAX; i++)
+            {
+                if ((lman.linkRecoveryTimer.active >> i) & 1 && (bm_linkRecoverySlot >> i) & 1)
+                {
+                    lman.linkRecoveryTimer.count[i] = 0;
+                }
+            }
+            lman.linkRecoveryTimer.active &= ~bm_linkRecoverySlot;
+            lman.param[0] = bm_linkRecoverySlot;
+            rfu_LMAN_occureCallback(LMAN_MSG_LINK_RECOVERY_SUCCESSED, 1);
+        }
+        if (lman.linkRecoveryTimer.active)
+        {
+            bm_disconnectSlot = 0;
+            for (i = 0; i < RFU_CHILD_MAX; i++)
+            {
+                if ((lman.linkRecoveryTimer.active >> i) & 1 && lman.linkRecoveryTimer.count[i] && --lman.linkRecoveryTimer.count[i] == 0)
+                {
+                    lman.linkRecoveryTimer.active &= ~(1 << i);
+                    bm_disconnectSlot |= (1 << i);
+                }
+            }
+            if (bm_disconnectSlot)
+            {
+                rfu_LMAN_disconnect(bm_disconnectSlot);
+                disconnect_occure_flag = TRUE;
+                lman.param[0] = bm_disconnectSlot;
+                rfu_LMAN_occureCallback(LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED, 1);
+            }
+        }
+        if (!lman.linkRecoveryTimer.active)
+        {
+            lman.linkRecovery_start_flag = 0;
+        }
+    }
+    return disconnect_occure_flag;
+}
+
+void rfu_LMAN_syncVBlank(void)
+{
+    if (rfu_syncVBlank())
+    {
+        rfu_LMAN_occureCallback(LMAN_MSG_WATCH_DOG_TIMER_ERROR, 0);
+        rfu_LMAN_managerChangeAgbClockMaster();
+    }
+}
+
+void rfu_LMAN_manager_entity(u32 rand)
+{
+    u8 msg;
+
+    if (lman.LMAN_callback == NULL && lman.state != LMAN_STATE_READY)
+    {
+        lman.state = LMAN_STATE_READY;
+        return;
+    }
+    if (lman.pcswitch_flag)
+    {
+        rfu_LMAN_settingPCSWITCH(rand);
+    }
+    while (1)
+    {
+        if (lman.state != LMAN_STATE_READY)
+        {
+            rfu_waitREQComplete();
+            lman.active = 1;
+            switch (lman.state)
+            {
+            case LMAN_FORCED_STOP_AND_RFU_RESET:
+                if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID)
+                {
+                    msg=LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET;
+                }
+                else
+                {
+                    msg=LMAN_MSG_RFU_FATAL_ERROR;
+                }
+                lman.state = lman.next_state = LMAN_STATE_READY;
+                rfu_LMAN_occureCallback(msg, 0);
+                break;
+            case LMAN_STATE_SOFT_RESET_AND_CHECK_ID:
+                if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID)
+                {
+                    lman.state = lman.next_state;
+                    lman.next_state = LMAN_STATE_CONFIG_SYSTEM;
+                }
+                else
+                {
+                    lman.state = lman.next_state = LMAN_STATE_READY;
+                    rfu_LMAN_occureCallback(LMAN_MSG_RFU_FATAL_ERROR, 0);
+                }
+                break;
+            case LMAN_STATE_RESET:
+                rfu_REQ_reset();
+                break;
+            case LMAN_STATE_CONFIG_SYSTEM:
+                rfu_REQ_configSystem(lman.init_param->availSlot_flag, lman.init_param->maxMFrame, lman.init_param->MC_TimerCount);
+                break;
+            case LMAN_STATE_CONFIG_GAME_DATA:
+                rfu_REQ_configGameData(lman.init_param->mboot_flag, lman.init_param->serialNo, (const u8 *)lman.init_param->gameName, lman.init_param->userName);
+                break;
+            case LMAN_STATE_START_SEARCH_CHILD:
+                rfu_REQ_startSearchChild();
+                break;
+            case LMAN_STATE_POLL_SEARCH_CHILD:
+                rfu_REQ_pollSearchChild();
+                break;
+            case LMAN_STATE_END_SEARCH_CHILD:
+                rfu_REQ_endSearchChild();
+                break;
+            case LMAN_STATE_WAIT_RECV_CHILD_NAME:
+                break;
+            case LMAN_STATE_START_SEARCH_PARENT:
+                rfu_REQ_startSearchParent();
+                break;
+            case LMAN_STATE_POLL_SEARCH_PARENT:
+                rfu_REQ_pollSearchParent();
+                break;
+            case LMAN_STATE_END_SEARCH_PARENT:
+                rfu_REQ_endSearchParent();
+                break;
+            case LMAN_STATE_START_CONNECT_PARENT:
+                rfu_REQ_startConnectParent(lman.work);
+                break;
+            case LMAN_STATE_POLL_CONNECT_PARENT:
+                rfu_REQ_pollConnectParent();
+                break;
+            case LMAN_STATE_END_CONNECT_PARENT:
+                rfu_REQ_endConnectParent();
+                break;
+            case LMAN_STATE_SEND_CHILD_NAME:
+                break;
+            case LMAN_STATE_START_LINK_RECOVERY:
+                rfu_REQ_CHILD_startConnectRecovery(gRfuLinkStatus->linkLossSlotFlag);
+                break;
+            case LMAN_STATE_POLL_LINK_RECOVERY:
+                rfu_REQ_CHILD_pollConnectRecovery();
+                break;
+            case LMAN_STATE_END_LINK_RECOVERY:
+                rfu_REQ_CHILD_endConnectRecovery();
+                break;
+            case LMAN_STATE_MS_CHANGE:
+                rfu_REQ_changeMasterSlave();
+                break;
+            case LMAN_STATE_WAIT_CLOCK_MASTER:
+                break;
+            case LMAN_STATE_STOP_MODE:
+                rfu_REQ_stopMode();
+                break;
+            case LMAN_STATE_BACK_STATE:
+                break;
+            default:
+                break;
+            }
+            rfu_waitREQComplete();
+            lman.active = 0;
+        }
+        if (lman.state == LMAN_STATE_END_LINK_RECOVERY || lman.state == LMAN_STATE_MS_CHANGE)
+            ;
+        else
+            break;
+    }
+    if (gRfuLinkStatus->parentChild == MODE_PARENT)
+    {
+        if (rfu_LMAN_linkWatcher(0))
+            return;
+    }
+    rfu_LMAN_PARENT_checkRecvChildName();
+    rfu_LMAN_CHILD_checkSendChildName();
+    rfu_LMAN_CHILD_linkRecoveryProcess();
+    rfu_LMAN_checkNICommunicateStatus();
+}
+
+static void rfu_LMAN_settingPCSWITCH(u32 rand)
+{
+    if (lman.pcswitch_flag == PCSWITCH_3RD_SC_START)
+    {
+        lman.parent_child = MODE_PARENT;
+        lman.state = LMAN_STATE_START_SEARCH_CHILD;
+        lman.connect_period = lman.pcswitch_period_bak;
+        if (lman.connect_period)
+        {
+            lman.pcswitch_flag = PCSWITCH_3RD_SC;
+        }
+        else
+        {
+            lman.pcswitch_flag = PCSWITCH_1ST_SC_START;
+        }
+    }
+    if (lman.pcswitch_flag == PCSWITCH_1ST_SC_START)
+    {
+        lman.parent_child = MODE_PARENT;
+        lman.state = LMAN_STATE_START_SEARCH_CHILD;
+        lman.connect_period = rand % 140;
+        lman.pcswitch_period_bak = 140 - lman.connect_period;
+        if (lman.connect_period)
+        {
+            lman.pcswitch_flag = PCSWITCH_1ST_SC;
+        }
+        else
+        {
+            lman.pcswitch_flag = PCSWITCH_2ND_SP_START;
+        }
+    }
+    if (lman.pcswitch_flag == PCSWITCH_2ND_SP_START)
+    {
+        lman.parent_child = MODE_CHILD;
+        lman.connect_period = PCSWITCH_SP_PERIOD;
+        lman.pcswitch_flag = PCSWITCH_2ND_SP;
+        lman.state = LMAN_STATE_START_SEARCH_PARENT;
+    }
+}
+
+static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult)
+{
+    u8 status;
+    u8 *stwiRecvBuffer;
+    u8 i;
+
+    if (lman.active != 0)
+    {
+        lman.active = 0;
+        switch (reqCommandId)
+        {
+        case ID_RESET_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state;
+                lman.next_state = LMAN_STATE_CONFIG_GAME_DATA;
+            }
+            break;
+        case ID_SYSTEM_CONFIG_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state;
+                lman.next_state = LMAN_STATE_READY;
+            }
+            break;
+        case ID_GAME_CONFIG_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state = LMAN_STATE_READY;
+                rfu_LMAN_occureCallback(LMAN_MSG_INITIALIZE_COMPLETED, 0);
+            }
+            break;
+        case ID_SC_START_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state = LMAN_STATE_POLL_SEARCH_CHILD;
+            }
+            break;
+        case ID_SC_POLL_REQ:
+            if (lman.connect_period && --lman.connect_period == 0)
+            {
+                lman.state = LMAN_STATE_END_SEARCH_CHILD;
+                lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME;
+            }
+            break;
+        case ID_SC_END_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state;
+                lman.next_state = LMAN_STATE_READY;
+                if (lman.pcswitch_flag == 0)
+                {
+                    rfu_LMAN_occureCallback(LMAN_MSG_SEARCH_CHILD_PERIOD_EXPIRED, 0);
+                }
+            }
+            break;
+        case ID_SP_START_REQ:
+            if (reqResult == 0)
+            {
+                if (lman.fastSearchParent_flag == FSP_ON)
+                {
+                    if (lman.connect_period > 1)
+                    {
+                        lman.connect_period--;
+                    }
+                }
+                lman.state = lman.next_state = LMAN_STATE_POLL_SEARCH_PARENT;
+            }
+            break;
+        case ID_SP_POLL_REQ:
+            if (reqResult == 0)
+            {
+                status = rfu_LMAN_CHILD_checkEnableParentCandidate();
+                lman.param[0] = status;
+                if (status)
+                {
+                    rfu_LMAN_occureCallback(LMAN_MSG_PARENT_FOUND, 1);
+                }
+                if (lman.fastSearchParent_flag && lman.connect_period != 1 && gRfuLinkStatus->findParentCount == RFU_CHILD_MAX)
+                {
+                    rfu_REQ_endSearchParent();
+                    rfu_waitREQComplete();
+                    lman.state = LMAN_STATE_START_SEARCH_PARENT;
+                    lman.fastSearchParent_flag = FSP_ON;
+                }
+            }
+            if (lman.connect_period && --lman.connect_period == 0)
+            {
+                lman.state = LMAN_STATE_END_SEARCH_PARENT;
+                lman.next_state = LMAN_STATE_READY;
+            }
+            break;
+        case ID_SP_END_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state;
+                if (lman.pcswitch_flag == 0)
+                {
+                    if (lman.state == LMAN_STATE_READY)
+                    {
+                        rfu_LMAN_occureCallback(LMAN_MSG_SEARCH_PARENT_PERIOD_EXPIRED, 0);
+                    }
+                }
+                else if (lman.pcswitch_flag != PCSWITCH_CP)
+                {
+                    lman.state = LMAN_STATE_START_SEARCH_CHILD;
+                    lman.pcswitch_flag = PCSWITCH_3RD_SC_START;
+                }
+            }
+            break;
+        case ID_CP_START_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state = LMAN_STATE_POLL_CONNECT_PARENT;
+            }
+            break;
+        case ID_CP_POLL_REQ:
+            if (reqResult == 0 && !rfu_getConnectParentStatus(&status, &lman.child_slot) && !status)
+            {
+                lman.state = LMAN_STATE_END_CONNECT_PARENT;
+            }
+            if (lman.connect_period && --lman.connect_period == 0)
+            {
+                lman.state = LMAN_STATE_END_CONNECT_PARENT;
+            }
+            break;
+        case ID_CP_END_REQ:
+            if (reqResult == 0 && !rfu_getConnectParentStatus(&status, &lman.child_slot))
+            {
+                if (!status)
+                {
+                    lman.state = LMAN_STATE_MS_CHANGE;
+                    lman.next_state = LMAN_STATE_SEND_CHILD_NAME;
+                    lman.work = 0x22;
+                    lman.param[0] = lman.child_slot;
+                }
+                else
+                {
+                    lman.state = lman.next_state = LMAN_STATE_READY;
+                    lman.work = 0x23;
+                    lman.param[0] = status;
+                    if (lman.pcswitch_flag)
+                    {
+                        lman.pcswitch_flag = PCSWITCH_2ND_SP_START;
+                        lman.state = LMAN_STATE_START_SEARCH_PARENT;
+                    }
+                }
+                rfu_LMAN_occureCallback(lman.work, 0x01);
+                lman.work = 0;
+            }
+            break;
+        case ID_CPR_START_REQ:
+            if (reqResult == 0)
+            {
+                lman.param[0] = gRfuLinkStatus->linkLossSlotFlag;
+                lman.state = lman.next_state = LMAN_STATE_POLL_LINK_RECOVERY;
+                for (lman.child_slot = 0; lman.child_slot < RFU_CHILD_MAX; lman.child_slot++)
+                {
+                    if ((gRfuLinkStatus->linkLossSlotFlag >> lman.child_slot) & 1)
+                    {
+                        break;
+                    }
+                }
+            }
+            break;
+        case ID_CPR_POLL_REQ:
+            if (reqResult == 0 && !rfu_CHILD_getConnectRecoveryStatus(&status) && status < 2)
+            {
+                lman.state = LMAN_STATE_END_LINK_RECOVERY;
+            }
+            if (lman.linkRecoveryTimer.count[lman.child_slot] && --lman.linkRecoveryTimer.count[lman.child_slot] == 0)
+            {
+                lman.state = LMAN_STATE_END_LINK_RECOVERY;
+            }
+            break;
+        case ID_CPR_END_REQ:
+            if (reqResult == 0 && !rfu_CHILD_getConnectRecoveryStatus(&status))
+            {
+                if (!status)
+                {
+                    lman.state = LMAN_STATE_MS_CHANGE;
+                    lman.next_state = LMAN_STATE_BACK_STATE;
+                    lman.work = 0x32;
+                }
+                else
+                {
+                    lman.state = lman.next_state = LMAN_STATE_READY;
+                    rfu_LMAN_disconnect(gRfuLinkStatus->linkLossSlotFlag);
+                    lman.work = 0x33;
+                }
+                lman.linkRecoveryTimer.count[lman.child_slot] = 0;
+                lman.linkRecoveryTimer.active = 0;
+                lman.linkRecovery_start_flag = 0;
+                rfu_LMAN_occureCallback(lman.work, 0x01);
+                lman.work = 0;
+            }
+            break;
+        case ID_MS_CHANGE_REQ:
+            if (reqResult == 0)
+            {
+                if (lman.next_state == LMAN_STATE_BACK_STATE)
+                {
+                    lman.state = lman.state_bak[0];
+                    lman.next_state = lman.state_bak[1];
+                    lman.childClockSlave_flag = RFU_CHILD_CLOCK_SLAVE_ON;
+                    rfu_LMAN_occureCallback(LMAN_MSG_CHANGE_AGB_CLOCK_SLAVE, 0);
+                }
+                else if (lman.next_state == LMAN_STATE_SEND_CHILD_NAME)
+                {
+                    lman.state = lman.next_state;
+                    lman.childClockSlave_flag = RFU_CHILD_CLOCK_SLAVE_ON;
+                    rfu_LMAN_occureCallback(LMAN_MSG_CHANGE_AGB_CLOCK_SLAVE, 0);
+                    lman.nameAcceptTimer.active |= 1 << lman.child_slot;
+                    lman.nameAcceptTimer.count[lman.child_slot] = lman.nameAcceptTimer.count_max;
+                    rfu_clearSlot(TYPE_NI_SEND, lman.child_slot);
+                    status = rfu_NI_CHILD_setSendGameName(lman.child_slot, 0x0e);
+                    if (status)
+                    {
+                        lman.state = lman.next_state = LMAN_STATE_READY;
+                        rfu_LMAN_managerChangeAgbClockMaster();
+                        rfu_LMAN_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
+                        lman.param[0] = status;
+                        rfu_LMAN_occureCallback(LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED, 1);
+                    }
+                }
+            }
+            break;
+        case ID_STOP_MODE_REQ:
+            if (reqResult == 0)
+            {
+                lman.state = lman.next_state = LMAN_STATE_READY;
+                rfu_LMAN_occureCallback(LMAN_MSG_RFU_POWER_DOWN, 0);
+            }
+            break;
+        }
+        lman.active = 1;
+    }
+    else if (reqResult == 3 && lman.msc_exe_flag && (reqCommandId == ID_DATA_TX_REQ || reqCommandId == ID_DATA_RX_REQ || reqCommandId == ID_MS_CHANGE_REQ))
+    {
+        rfu_REQ_RFUStatus();
+        rfu_waitREQComplete();
+        rfu_getRFUStatus(&status);
+        if (status == 0 && gRfuLinkStatus->parentChild == MODE_CHILD)
+        {
+            stwiRecvBuffer = rfu_getSTWIRecvBuffer() + 4;
+            *stwiRecvBuffer++ = gRfuLinkStatus->connSlotFlag;
+            *stwiRecvBuffer = REASON_LINK_LOSS;
+            rfu_LMAN_linkWatcher(ID_DISCONNECTED_AND_CHANGE_REQ);
+            reqResult = 0;
+        }
+    }
+    switch (reqCommandId)
+    {
+    case ID_DISCONNECT_REQ:
+        if (reqResult == 0)
+        {
+            lman.param[0] = *(rfu_getSTWIRecvBuffer() + 8);
+            rfu_LMAN_reflectCommunicationStatus(lman.param[0]);
+            if (lman.linkRecoveryTimer.active)
+            {
+                lman.linkRecoveryTimer.active &= ~lman.param[0];
+                for (i = 0; i < RFU_CHILD_MAX; i++)
+                {
+                    if ((lman.param[0] >> i) & 1)
+                    {
+                        lman.linkRecoveryTimer.count[i] = 0;
+                    }
+                }
+                if (lman.parent_child == MODE_CHILD)
+                {
+                    lman.state = lman.next_state = LMAN_STATE_READY;
+                }
+            }
+            status = lman.acceptSlot_flag & lman.param[0];
+            for (i = 0; i < RFU_CHILD_MAX; i++)
+            {
+                if ((status >> i) & 1 && lman.acceptCount)
+                {
+                    lman.acceptCount--;
+                }
+            }
+            lman.acceptSlot_flag &= ~lman.param[0];
+            if (lman.pcswitch_flag)
+            {
+                if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
+                {
+                    if (lman.pcswitch_flag == PCSWITCH_SC_LOCK)
+                    {
+                        lman.connect_period = lman.pcswitch_period_bak;
+                        lman.pcswitch_flag = PCSWITCH_3RD_SC;
+                        lman.state = LMAN_STATE_POLL_SEARCH_CHILD;
+                    }
+                    else if (lman.state != LMAN_STATE_POLL_SEARCH_CHILD && lman.state != LMAN_STATE_END_SEARCH_CHILD)
+                    {
+                        lman.pcswitch_flag = PCSWITCH_1ST_SC_START;
+                        lman.state = LMAN_STATE_START_SEARCH_CHILD;
+                    }
+                }
+            }
+            if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
+            {
+                if (lman.state == LMAN_STATE_READY)
+                {
+                    lman.parent_child = MODE_NEUTRAL;
+                }
+            }
+            if (lman.active == 0)
+            {
+                rfu_LMAN_occureCallback(LMAN_MSG_LINK_DISCONNECTED_BY_USER, 1);
+            }
+        }
+        break;
+    case ID_DATA_RX_REQ:
+        rfu_LMAN_CHILD_checkSendChildName2();
+        if (gRfuLinkStatus->parentChild != MODE_NEUTRAL)
+        {
+            rfu_LMAN_occureCallback(LMAN_MSG_RECV_DATA_REQ_COMPLETED, 0);
+        }
+        break;
+    case ID_RESET_REQ:
+    case ID_STOP_MODE_REQ:
+        if (reqResult == 0)
+        {
+            lman.reserveDisconnectSlot_flag = 0;
+            lman.acceptCount = 0;
+            lman.acceptSlot_flag = 0;;
+            lman.parent_child = MODE_NEUTRAL;
+            rfu_LMAN_managerChangeAgbClockMaster();
+            if (reqCommandId == ID_STOP_MODE_REQ)
+            {
+                rfu_LMAN_endManager();
+            }
+        }
+        break;
+    }
+    if (reqResult != 0)
+    {
+        if (reqCommandId == ID_SP_START_REQ && reqResult != 0 && lman.pcswitch_flag == PCSWITCH_2ND_SP)
+        {
+            gRfuLinkStatus->parentChild = MODE_PARENT;
+            gRfuLinkStatus->connSlotFlag = 0xF;
+            rfu_LMAN_disconnect(15);
+            rfu_waitREQComplete();
+            return;
+        }
+        else
+        {
+            lman.param[0] = reqCommandId;
+            lman.param[1] = reqResult;
+            if (lman.active)
+            {
+                lman.state = lman.next_state = LMAN_STATE_READY;
+            }
+            rfu_LMAN_occureCallback(LMAN_MSG_REQ_API_ERROR, 2);
+            rfu_LMAN_managerChangeAgbClockMaster();
+        }
+    }
+    if (reqCommandId == ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ)
+    {
+        rfu_LMAN_occureCallback(LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA, 0);
+        rfu_LMAN_managerChangeAgbClockMaster();
+    }
+}
+
+static void rfu_LMAN_MSC_callback(u16 reqCommandId)
+{
+    u8 active_bak;
+    u8 thisAck_flag;
+
+    active_bak = lman.active;
+    lman.active = 0;
+    lman.msc_exe_flag = 1;
+    if (gRfuLinkStatus->parentChild == MODE_CHILD)
+    {
+        rfu_LMAN_linkWatcher(reqCommandId);
+        if (lman.childClockSlave_flag != RFU_CHILD_CLOCK_SLAVE_ON)
+        {
+            rfu_LMAN_managerChangeAgbClockMaster();
+            lman.msc_exe_flag = 0;
+            lman.active = active_bak;
+            return;
+        }
+    }
+    else
+    {
+        if (!rfu_UNI_PARENT_getDRAC_ACK(&thisAck_flag))
+        {
+            lman.parentAck_flag |= thisAck_flag;
+        }
+    }
+    if (lman.MSC_callback != NULL)
+    {
+        lman.MSC_callback(reqCommandId);
+        rfu_waitREQComplete();
+        if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_OFF_REQ)
+        {
+            rfu_LMAN_managerChangeAgbClockMaster();
+        }
+    }
+    lman.msc_exe_flag = 0;
+    lman.active = active_bak;
+}
+
+static void rfu_LMAN_PARENT_checkRecvChildName(void)
+{
+    u8 newSlot;
+    u8 newAcceptSlot;
+    u8 i;
+    u8 flags;
+    u8 tgtSlot;
+    const u16 *ptr;
+
+    if (lman.state == LMAN_STATE_START_SEARCH_CHILD || lman.state == LMAN_STATE_POLL_SEARCH_CHILD || lman.state == LMAN_STATE_END_SEARCH_CHILD || lman.state == LMAN_STATE_WAIT_RECV_CHILD_NAME)
+    {
+        newSlot = ((gRfuLinkStatus->connSlotFlag ^ lman.connectSlot_flag_old) & gRfuLinkStatus->connSlotFlag) & ~gRfuLinkStatus->getNameFlag;
+        lman.connectSlot_flag_old = gRfuLinkStatus->connSlotFlag;
+        if (newSlot)
+        {
+            lman.param[0] = newSlot;
+            rfu_LMAN_occureCallback(LMAN_MSG_NEW_CHILD_CONNECT_DETECTED, 1);
+        }
+        newAcceptSlot = 0x00;
+        for (i = 0; i < RFU_CHILD_MAX; i++)
+        {
+            tgtSlot = 1 << i;
+            flags = 0x00;
+            if (newSlot & tgtSlot)
+            {
+                lman.nameAcceptTimer.count[i] = lman.nameAcceptTimer.count_max;
+                lman.nameAcceptTimer.active |= tgtSlot;
+            }
+            else if (lman.nameAcceptTimer.active & tgtSlot)
+            {
+                if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS)
+                {
+                    if (gRfuSlotStatusNI[i]->recv.dataType == 1)
+                    {
+                        flags = RN_NAME_TIMER_CLEAR;
+                        for (ptr = lman.acceptable_serialNo_list; *ptr != 0xFFFF; ptr++)
+                        {
+                            if (gRfuLinkStatus->partner[i].serialNo == *ptr)
+                            {
+                                lman.acceptSlot_flag |= tgtSlot;
+                                lman.acceptCount++;
+                                newAcceptSlot |= tgtSlot;
+                                flags |= RN_ACCEPT;
+                                break;
+                            }
+                        }
+                        if (!(flags & RN_ACCEPT))
+                        {
+                            flags |= RN_DISCONNECT;
+                        }
+                    }
+                }
+                else if (--lman.nameAcceptTimer.count[i] == 0)
+                {
+                    flags = RN_NAME_TIMER_CLEAR | RN_DISCONNECT;
+                }
+                if (flags & RN_NAME_TIMER_CLEAR)
+                {
+                    lman.nameAcceptTimer.active &= ~tgtSlot;
+                    lman.nameAcceptTimer.count[i] = 0;
+                    rfu_clearSlot(TYPE_NI_RECV, i);
+                }
+                if (flags & RN_DISCONNECT)
+                {
+                    lman.reserveDisconnectSlot_flag |= tgtSlot;
+                }
+            }
+        }
+        if (newAcceptSlot)
+        {
+            lman.param[0] = newAcceptSlot;
+            rfu_LMAN_occureCallback(LMAN_MSG_NEW_CHILD_CONNECT_ACCEPTED, 1);
+        }
+        if (lman.reserveDisconnectSlot_flag)
+        {
+            flags = 1;
+            if (gRfuLinkStatus->sendSlotUNIFlag)
+            {
+                if (((lman.parentAck_flag & lman.acceptSlot_flag) != lman.acceptSlot_flag))
+                {
+                    flags = 0;
+                }
+            }
+            if (flags)
+            {
+                rfu_LMAN_disconnect(lman.reserveDisconnectSlot_flag);
+                lman.param[0] = lman.reserveDisconnectSlot_flag;
+                lman.reserveDisconnectSlot_flag = 0;
+                rfu_LMAN_occureCallback(LMAN_MSG_NEW_CHILD_CONNECT_REJECTED, 1);
+            }
+        }
+        if (lman.nameAcceptTimer.active == 0 && lman.state == LMAN_STATE_WAIT_RECV_CHILD_NAME)
+        {
+            if (lman.pcswitch_flag == 0)
+            {
+                lman.state = lman.next_state = LMAN_STATE_READY;
+                rfu_LMAN_occureCallback(LMAN_MSG_END_WAIT_CHILD_NAME, 0);
+            }
+            else
+            {
+                if (lman.pcswitch_flag == PCSWITCH_1ST_SC)
+                {
+                    lman.pcswitch_flag = PCSWITCH_2ND_SP_START;
+                    lman.state = LMAN_STATE_START_SEARCH_PARENT;
+                }
+                else
+                {
+                    lman.pcswitch_flag = PCSWITCH_1ST_SC_START;
+                    lman.state = LMAN_STATE_START_SEARCH_CHILD;
+                }
+                if (lman.acceptSlot_flag)
+                {
+                    lman.connect_period = 0;
+                    lman.pcswitch_flag = PCSWITCH_SC_LOCK;
+                    lman.state = LMAN_STATE_START_SEARCH_CHILD;
+                }
+            }
+        }
+    }
+}
+
+static void rfu_LMAN_CHILD_checkSendChildName(void)
+{
+    u16 imeBak = REG_IME;
+    REG_IME = 0;
+    if (lman.state == LMAN_STATE_SEND_CHILD_NAME)
+    {
+        if (--lman.nameAcceptTimer.count[lman.child_slot] == 0 || gRfuSlotStatusNI[lman.child_slot]->send.state == SLOT_STATE_SEND_FAILED)
+        {
+            rfu_LMAN_requestChangeAgbClockMaster();
+            lman.state = LMAN_STATE_WAIT_CHANGE_CLOCK_MASTER;
+            rfu_clearSlot(TYPE_NI_SEND, lman.child_slot);
+            lman.nameAcceptTimer.active &= ~(1 << lman.child_slot);
+            lman.nameAcceptTimer.count[lman.child_slot] = 0;
+        }
+    }
+    REG_IME = imeBak;
+    if (lman.state == LMAN_STATE_WAIT_CHANGE_CLOCK_MASTER)
+    {
+        if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_ON)
+        {
+            rfu_LMAN_requestChangeAgbClockMaster();
+        }
+        if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_OFF)
+        {
+            lman.state = lman.next_state = LMAN_STATE_READY;
+            rfu_LMAN_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
+            lman.param[0] = 0;
+            rfu_LMAN_occureCallback(LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED, 1);
+        }
+    }
+}
+
+static void rfu_LMAN_CHILD_checkSendChildName2(void)
+{
+    if (lman.state == LMAN_STATE_SEND_CHILD_NAME && gRfuSlotStatusNI[lman.child_slot]->send.state == SLOT_STATE_SEND_SUCCESS)
+    {
+        lman.state = lman.next_state = LMAN_STATE_READY;
+        rfu_clearSlot(TYPE_NI_SEND, lman.child_slot);
+        lman.nameAcceptTimer.active &= ~(1 << lman.child_slot);
+        lman.nameAcceptTimer.count[lman.child_slot] = 0;
+        rfu_LMAN_occureCallback(LMAN_MSG_CHILD_NAME_SEND_COMPLETED, 0);
+    }
+}
+
+static void rfu_LMAN_CHILD_linkRecoveryProcess(void)
+{
+    if (lman.parent_child == MODE_CHILD && lman.linkRecovery_start_flag == LINK_RECOVERY_START)
+    {
+        lman.state_bak[0] = lman.state;
+        lman.state_bak[1] = lman.next_state;
+        lman.state = LMAN_STATE_START_LINK_RECOVERY;
+        lman.next_state = LMAN_STATE_POLL_LINK_RECOVERY;
+        lman.linkRecovery_start_flag = LINK_RECOVERY_EXE;
+    }
+}
+
+static u8 rfu_LMAN_CHILD_checkEnableParentCandidate(void)
+{
+    u8 i;
+    u16 *serialNo;
+    u8 flags = 0x00;
+
+    for (i = 0; i < gRfuLinkStatus->findParentCount; i++)
+    {
+        for (serialNo = lman.acceptable_serialNo_list; *serialNo != 0xFFFF; serialNo++)
+        {
+            if (gRfuLinkStatus->partner[i].serialNo == *serialNo)
+            {
+                flags |= (1 << i);
+            }
+        }
+    }
+    return flags;
+}
+
+static void rfu_LMAN_occureCallback(u8 msg, u8 param_count)
+{
+    if (lman.LMAN_callback != NULL)
+    {
+        lman.LMAN_callback(msg, param_count);
+    }
+    lman.param[0] = lman.param[1] = 0;
+}
+
+static void rfu_LMAN_disconnect(u8 bm_disconnectedSlot)
+{
+    u8 active_bak = lman.active;
+    lman.active = 1;
+    rfu_REQ_disconnect(bm_disconnectedSlot);
+    rfu_waitREQComplete();
+    lman.active = active_bak;
+}
+
+static void rfu_LMAN_reflectCommunicationStatus(u8 bm_disconnectedSlot)
+{
+    u8 i;
+
+    if (gRfuLinkStatus->sendSlotNIFlag)
+    {
+        for (i = 0; i < RFU_CHILD_MAX; i++)
+        {
+            if (gRfuSlotStatusNI[i]->send.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->send.bmSlot & bm_disconnectedSlot)
+            {
+                rfu_changeSendTarget(TYPE_NI, i, gRfuSlotStatusNI[i]->send.bmSlot & ~bm_disconnectedSlot);
+            }
+        }
+    }
+    if (gRfuLinkStatus->recvSlotNIFlag)
+    {
+        for (i = 0; i < RFU_CHILD_MAX; i++)
+        {
+            if (gRfuSlotStatusNI[i]->recv.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->recv.bmSlot & bm_disconnectedSlot)
+            {
+                rfu_NI_stopReceivingData(i);
+            }
+        }
+    }
+    if (gRfuLinkStatus->sendSlotUNIFlag)
+    {
+        gRfuLinkStatus->sendSlotUNIFlag &= ~bm_disconnectedSlot;
+        for (i = 0; i < RFU_CHILD_MAX; i++)
+        {
+            if (gRfuSlotStatusUNI[i]->send.state == SLOT_STATE_SEND_UNI && bm_disconnectedSlot & gRfuSlotStatusUNI[i]->send.bmSlot)
+            {
+                gRfuSlotStatusUNI[i]->send.bmSlot &= ~bm_disconnectedSlot;
+            }
+        }
+    }
+}
+
+static void rfu_LMAN_checkNICommunicateStatus(void)
+{
+    u8 i;
+    u8 j;
+    u8 flags;
+
+    if (lman.NI_failCounter_limit)
+    {
+        if (gRfuLinkStatus->sendSlotNIFlag)
+        {
+            for (i = 0; i < RFU_CHILD_MAX; i++)
+            {
+                if (gRfuSlotStatusNI[i]->send.state & SLOT_BUSY_FLAG)
+                {
+                    flags = 0;
+                    for (j = 0; j < RFU_CHILD_MAX; j++)
+                    {
+                        if ((gRfuSlotStatusNI[i]->send.bmSlot >> j) & 1 && gRfuSlotStatusNI[j]->send.failCounter > lman.NI_failCounter_limit)
+                        {
+                            flags |= (1 << j);
+                        }
+                        if (flags)
+                        {
+                            rfu_changeSendTarget(TYPE_NI, i, flags ^ gRfuSlotStatusNI[i]->send.bmSlot);
+                        }
+                    }
+                }
+            }
+        }
+        if (gRfuLinkStatus->recvSlotNIFlag)
+        {
+            for (i = 0; i < RFU_CHILD_MAX; i++)
+            {
+                if (gRfuSlotStatusNI[i]->recv.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->recv.failCounter > lman.NI_failCounter_limit)
+                {
+                    rfu_NI_stopReceivingData(i);
+                }
+            }
+        }
+    }
+}
+
+void rfu_LMAN_setMSCCallback(void (*MSC_callback_p)(u16))
+{
+    lman.MSC_callback = MSC_callback_p;
+    rfu_setMSCCallback(rfu_LMAN_MSC_callback);
+}
+
+static void rfu_LMAN_setLMANCallback(void (*func)(u8, u8))
+{
+    lman.LMAN_callback = func;
+}
+
+u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period)
+{
+    u16 imeBak;
+    if (lman.linkRecovery_enable && enable_flag == 0 && lman.linkRecoveryTimer.active)
+    {
+        return LMAN_ERROR_NOW_LINK_RECOVERY;
+    }
+    imeBak = REG_IME;
+    REG_IME = 0;
+    lman.linkRecovery_enable = enable_flag;
+    lman.linkRecoveryTimer.count_max = recovery_period;
+    REG_IME = imeBak;
+    return 0;
+}
+
+static u8 rfu_LMAN_setNIFailCounterLimit(u16 NI_failCounter_limit)
+{
+    if (gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag)
+    {
+        lman.param[0] = 6;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_NOW_COMMUNICATION;
+    }
+    lman.NI_failCounter_limit = NI_failCounter_limit;
+    return 0;
+}
+
+static u8 rfu_LMAN_setFastSearchParent(u8 enable_flag)
+{
+    if (lman.state == LMAN_STATE_START_SEARCH_PARENT || lman.state == LMAN_STATE_POLL_SEARCH_PARENT || lman.state == LMAN_STATE_END_SEARCH_PARENT)
+    {
+        lman.param[0] = 7;
+        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
+        return LMAN_ERROR_NOW_SEARCH_PARENT;
+    }
+    if (enable_flag)
+    {
+        lman.fastSearchParent_flag = FSP_ON;
+    }
+    else
+    {
+        lman.fastSearchParent_flag = 0;
+    }
+    return 0;
+}
+
+static void rfu_LMAN_managerChangeAgbClockMaster(void)
+{
+    if (lman.childClockSlave_flag != RFU_CHILD_CLOCK_SLAVE_OFF)
+    {
+        lman.childClockSlave_flag = RFU_CHILD_CLOCK_SLAVE_OFF;
+        rfu_LMAN_occureCallback(LMAN_MSG_CHANGE_AGB_CLOCK_MASTER, 0);
+    }
+}
+
+void rfu_LMAN_requestChangeAgbClockMaster(void)
+{
+    if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_OFF)
+    {
+        rfu_LMAN_occureCallback(LMAN_MSG_CHANGE_AGB_CLOCK_MASTER, 0);
+    }
+    else if (lman.childClockSlave_flag == RFU_CHILD_CLOCK_SLAVE_ON)
+    {
+        lman.childClockSlave_flag = RFU_CHILD_CLOCK_SLAVE_OFF_REQ;
+    }
+}
+
+void rfu_LMAN_forceChangeSP(void)
+{
+    if (lman.pcswitch_flag)
+    {
+        switch (lman.state)
+        {
+        case LMAN_STATE_START_SEARCH_CHILD:
+            lman.pcswitch_flag = PCSWITCH_2ND_SP_START;
+            lman.state = LMAN_STATE_START_SEARCH_PARENT;
+            break;
+        case LMAN_STATE_POLL_SEARCH_CHILD:
+            lman.pcswitch_flag = PCSWITCH_1ST_SC;
+            lman.connect_period = 1;
+            break;
+        case LMAN_STATE_END_SEARCH_CHILD:
+        case LMAN_STATE_WAIT_RECV_CHILD_NAME:
+            lman.pcswitch_flag = PCSWITCH_1ST_SC;
+            break;
+        case LMAN_STATE_START_SEARCH_PARENT:
+        case LMAN_STATE_POLL_SEARCH_PARENT:
+            lman.connect_period = PCSWITCH_SP_PERIOD;
+            break;
+        case LMAN_STATE_END_SEARCH_PARENT:
+            lman.connect_period = PCSWITCH_SP_PERIOD;
+            lman.state = LMAN_STATE_POLL_SEARCH_PARENT;
+            break;
+        }
+    }
+}
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index cb9e04a50..7b0a8aa47 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -831,9 +831,9 @@ void sub_802F6A8(void)
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
             if (gWirelessCommType == 0)
-                sub_800AAC0();
+                Link_TryStartSend5FFF();
             else
-                sub_800AB9C();
+                PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             gBattlerControllerFuncs[gActiveBattler] = sub_802F610;
         }
         else
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index ca2ef0b22..834b9e6b6 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -35,7 +35,7 @@ void HandleLinkBattleSetup(void)
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         if (gWirelessCommType)
-            sub_800B1F4();
+            SetWirelessCommType1();
         if (!gReceivedRemoteLinkPlayers)
             OpenLink();
         CreateTask(sub_8081A90, 0);
@@ -491,7 +491,7 @@ void sub_800DD28(void)
 
     if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_20) && (gLinkPlayers[0].linkType == 0x2211))
     {
-        sub_80FBB4C();
+        LinkRfu_DestroyIdleTask();
         for (i = 0; i < GetLinkPlayerCount(); ++i)
         {
             if (GetBlockReceivedStatus() & gBitTable[i])
diff --git a/src/battle_main.c b/src/battle_main.c
index 76f373f8f..faad8bafb 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1152,9 +1152,9 @@ static void CB2_PreInitMultiBattle(void)
         {
             ++gBattleCommunication[MULTIUSE_STATE];
             if (gWirelessCommType)
-                sub_800AB9C();
+                PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             else
-                sub_800AAC0();
+                Link_TryStartSend5FFF();
         }
         break;
     case 3:
@@ -4164,7 +4164,6 @@ bool8 TryRunFromBattle(u8 battler)
 {
     bool8 effect = FALSE;
     u8 holdEffect;
-    u8 pyramidMultiplier;
     u8 speedVar;
 
     if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
diff --git a/src/battle_message.c b/src/battle_message.c
index 4f95ae364..d8367c75e 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -22,6 +22,7 @@
 #include "constants/moves.h"
 #include "constants/items.h"
 #include "constants/trainer_classes.h"
+#include "constants/trainer_tower.h"
 
 struct BattleWindowText
 {
@@ -1294,9 +1295,9 @@ const u8 gUnknown_83FE94D[] = _("a PSYCHIC move");
 const u8 gUnknown_83FE95C[] = _("an ICE move");
 const u8 gUnknown_83FE968[] = _("a DRAGON move");
 const u8 gUnknown_83FE976[] = _("a DARK move");
-const u8 gUnknown_83FE982[] = _("TIME BOARD");
-const u8 gUnknown_83FE98D[] = _("CLEAR TIME");
-const u8 gUnknown_83FE998[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC.");
+const u8 gText_TimeBoard[] = _("TIME BOARD");
+const u8 gText_ClearTime[] = _("CLEAR TIME"); // Unused
+const u8 gText_XMinYZSec[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC.");
 const u8 gUnknown_83FE9A9[] = _("1F");
 const u8 gUnknown_83FE9AC[] = _("2F");
 const u8 gUnknown_83FE9AF[] = _("3F");
@@ -1306,7 +1307,7 @@ const u8 gUnknown_83FE9B8[] = _("6F");
 const u8 gUnknown_83FE9BB[] = _("7F");
 const u8 gUnknown_83FE9BE[] = _("8F");
 
-const u8 *const gUnknown_83FE9C4[] = {
+const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] = {
     gOtherText_Single,
     gOtherText_Double,
     gOtherText_Knockout,
@@ -1990,7 +1991,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                     toCpy = gTrainerClassNames[GetBattleTowerTrainerClassNameId()];
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
-                    toCpy = gTrainerClassNames[sub_815DA10()];
+                    toCpy = gTrainerClassNames[GetTrainerTowerOpponentClass()];
                 else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
                     toCpy = gTrainerClassNames[GetEreaderTrainerClassId()];
                 else
@@ -2014,7 +2015,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
                 {
-                    sub_815DA28(text);
+                    GetTrainerTowerOpponentName(text);
                     toCpy = text;
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER)
@@ -2054,7 +2055,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
             case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
                 {
-                    sub_815DC40(gStringVar4, 0);
+                    GetTrainerTowerOpponentLoseText(gStringVar4, 0);
                     toCpy = gStringVar4;
                 }
                 else
@@ -2065,7 +2066,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
             case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER)
                 {
-                    sub_815DBF4(gStringVar4, 0);
+                    GetTrainerTowerOpponentWinText(gStringVar4, 0);
                     toCpy = gStringVar4;
                 }
                 else
@@ -2074,11 +2075,11 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
                 }
                 break;
             case B_TXT_TRAINER2_LOSE_TEXT:
-                sub_815DC40(gStringVar4, 1);
+                GetTrainerTowerOpponentLoseText(gStringVar4, 1);
                 toCpy = gStringVar4;
                 break;
             case B_TXT_TRAINER2_WIN_TEXT:
-                sub_815DBF4(gStringVar4, 1);
+                GetTrainerTowerOpponentWinText(gStringVar4, 1);
                 toCpy = gStringVar4;
                 break;
             case B_TXT_26: // ?
diff --git a/src/cereader_tool.c b/src/cereader_tool.c
index 2c5d05018..c6e0c9a99 100644
--- a/src/cereader_tool.c
+++ b/src/cereader_tool.c
@@ -6,40 +6,40 @@
 
 u8 sub_815D654(void)
 {
-    return (gSaveBlock1Ptr->unkArray[0].unk9 + 1) % 256;
+    return (gSaveBlock1Ptr->trainerTower[0].unk9 + 1) % 256;
 }
 
 static bool32 ValidateTrainerTowerTrainer(struct TrainerTowerFloor * floor)
 {
-    if (floor->floorIdx < 1 || floor->floorIdx > 8)
+    if (floor->floorIdx < 1 || floor->floorIdx > MAX_TRAINER_TOWER_FLOORS)
         return FALSE;
-    if (floor->challengeType > 2)
+    if (floor->challengeType > CHALLENGE_TYPE_KNOCKOUT)
         return FALSE;
     if (CalcByteArraySum((const u8 *)floor, offsetof(typeof(*floor), checksum)) != floor->checksum)
         return FALSE;
     return TRUE;
 }
 
-bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata)
+bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata)
 {
-    u32 count = ttdata->count;
+    u32 numFloors = ttdata->numFloors;
     s32 i;
-    if (count < 1 || count > 8)
+    if (numFloors < 1 || numFloors > MAX_TRAINER_TOWER_FLOORS)
         return FALSE;
-    for (i = 0; i < count; i++)
+    for (i = 0; i < numFloors; i++)
     {
         if (!ValidateTrainerTowerTrainer(&ttdata->floors[i]))
             return FALSE;
     }
-    if (CalcByteArraySum((const u8 *)ttdata->floors, count * sizeof(ttdata->floors[0])) != ttdata->checksum)
+    if (CalcByteArraySum((const u8 *)ttdata->floors, numFloors * sizeof(ttdata->floors[0])) != ttdata->checksum)
         return FALSE;
     return TRUE;
 }
 
-#define SEC30_SIZE  (offsetof(struct EReaderTrainerHillSet, floors[4]))
-#define SEC31_SIZE  (sizeof(struct EReaderTrainerHillSet) - SEC30_SIZE)
+#define SEC30_SIZE  (offsetof(struct EReaderTrainerTowerSet, floors[4]))
+#define SEC31_SIZE  (sizeof(struct EReaderTrainerTowerSet) - SEC30_SIZE)
 
-static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttdata, u8 * buffer)
+static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, u8 * buffer)
 {
     AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198);
     AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199)
@@ -56,7 +56,7 @@ static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttd
     return TRUE;
 }
 
-bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata)
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata)
 {
     u8 * buffer = AllocZeroed(0x1000);
     bool32 result = CEReaderTool_SaveTrainerTower_r(ttdata, buffer);
@@ -64,7 +64,7 @@ bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata)
     return result;
 }
 
-static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttdata, void * buffer)
+static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void * buffer)
 {
     if (TryCopySpecialSaveSection(SECTOR_TTOWER(0), buffer) != 1)
         return FALSE;
@@ -79,10 +79,16 @@ static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttd
     return TRUE;
 }
 
-bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata)
+bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata)
 {
     void * buffer = AllocZeroed(0x1000);
     bool32 success = CEReaderTool_LoadTrainerTower_r(ttdata, buffer);
     Free(buffer);
     return success;
 }
+
+bool32 ReadTrainerTowerAndValidate(void)
+{
+    // Stubbed out. Populated in Emerald
+    return FALSE;
+}
diff --git a/src/coins.c b/src/coins.c
index 0f1828a96..fd5000fbd 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -4,11 +4,10 @@
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"
+#include "constants/coins.h"
 
 EWRAM_DATA static u8 sCoinsWindowId = 0;
 
-#define MAX_COINS 9999
-
 u16 GetCoins(void)
 {
     return gSaveBlock1Ptr->coins ^ gSaveBlock2Ptr->encryptionKey;
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
new file mode 100644
index 000000000..af2618615
--- /dev/null
+++ b/src/digit_obj_util.c
@@ -0,0 +1,449 @@
+#include "global.h"
+#include "malloc.h"
+#include "decompress.h"
+#include "digit_obj_util.h"
+#include "main.h"
+#include "battle.h"
+
+struct DigitPrinterAlloc
+{
+    u32 count;
+    struct DigitPrinter
+    {
+        bool8 isActive;
+        u8 firstOamId;
+        u8 strConvMode;
+        u8 oamCount;
+        u8 palTagIndex;
+        u8 size;
+        u8 shape;
+        u8 priority;
+        u8 xDelta;
+        u8 tilesPerImage;
+        u16 tileStart;
+        s16 x;
+        s16 y;
+        u16 tileTag;
+        u16 palTag;
+        u32 pow10;
+        s32 lastPrinted;
+    } *array;
+};
+
+// this file's functions
+static u8 GetFirstOamId(u8 oamCount);
+static void CopyWorkToOam(struct DigitPrinter *objWork);
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static bool32 SharesTileWithAnyActive(u32 id);
+static bool32 SharesPalWithAnyActive(u32 id);
+static u8 GetTilesPerImage(u32 shape, u32 size);
+
+// ewram
+static EWRAM_DATA struct DigitPrinterAlloc *sOamWork = {0};
+
+// const rom data
+static const u8 sTilesPerImage[4][4] =
+{
+    [ST_OAM_SQUARE]      = {
+        [ST_OAM_SIZE_0] = 0x01, // SPRITE_SIZE_8x8
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_16x16
+        [ST_OAM_SIZE_2] = 0x10, // SPRITE_SIZE_32x32
+        [ST_OAM_SIZE_3] = 0x40  // SPRITE_SIZE_64x64
+    },
+    [ST_OAM_H_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_16x8
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_32x8
+        [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_32x16
+        [ST_OAM_SIZE_3] = 0x20  // SPRITE_SIZE_64x32
+    },
+    [ST_OAM_V_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_8x16
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_8x32
+        [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_16x32
+        [ST_OAM_SIZE_3] = 0x20  // SPRITE_SIZE_32x64
+    }
+};
+
+// code
+bool32 DigitObjUtil_Init(u32 count)
+{
+    u32 i;
+
+    if (sOamWork != NULL)
+        DigitObjUtil_Teardown();
+
+    sOamWork = Alloc(sizeof(*sOamWork));
+    if (sOamWork == NULL)
+        return FALSE;
+
+    sOamWork->array = Alloc(sizeof(struct DigitPrinter) * count);
+    if (sOamWork->array == NULL)
+    {
+        Free(sOamWork);
+        return FALSE;
+    }
+
+    sOamWork->count = count;
+    for (i = 0; i < count; i++)
+    {
+        sOamWork->array[i].isActive = FALSE;
+        sOamWork->array[i].firstOamId = 0xFF;
+    }
+
+    return TRUE;
+}
+
+void DigitObjUtil_Teardown(void)
+{
+    if (sOamWork != NULL)
+    {
+        if (sOamWork->array != NULL)
+        {
+            u32 i;
+
+            for (i = 0; i < sOamWork->count; i++)
+                DigitObjUtil_DeletePrinter(i);
+
+            Free(sOamWork->array);
+        }
+
+        FREE_AND_SET_NULL(sOamWork);
+    }
+}
+
+bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template)
+{
+    u32 i;
+
+    if (sOamWork == NULL)
+        return FALSE;
+    if (sOamWork->array[id].isActive)
+        return FALSE;
+
+    sOamWork->array[id].firstOamId = GetFirstOamId(template->oamCount);
+    if (sOamWork->array[id].firstOamId == 0xFF)
+        return FALSE;
+
+    sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet->tag);
+    if (sOamWork->array[id].tileStart == 0xFFFF)
+    {
+        if (template->spriteSheet->size != 0)
+        {
+            sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet);
+        }
+        else
+        {
+            struct CompressedSpriteSheet compObjectPic;
+
+            compObjectPic = *(struct CompressedSpriteSheet*)(template->spriteSheet);
+            compObjectPic.size = GetDecompressedDataSize(template->spriteSheet->data);
+            sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic);
+        }
+
+        if (sOamWork->array[id].tileStart == 0xFFFF)
+            return FALSE;
+    }
+
+    sOamWork->array[id].palTagIndex = IndexOfSpritePaletteTag(template->spritePal->tag);
+    if (sOamWork->array[id].palTagIndex == 0xFF)
+        sOamWork->array[id].palTagIndex = LoadSpritePalette(template->spritePal);
+
+    sOamWork->array[id].strConvMode = template->strConvMode;
+    sOamWork->array[id].oamCount = template->oamCount;
+    sOamWork->array[id].x = template->x;
+    sOamWork->array[id].y = template->y;
+    sOamWork->array[id].shape = template->shape;
+    sOamWork->array[id].size = template->size;
+    sOamWork->array[id].priority = template->priority;
+    sOamWork->array[id].xDelta = template->xDelta;
+    sOamWork->array[id].tilesPerImage = GetTilesPerImage(template->shape, template->size);
+    sOamWork->array[id].tileTag = template->spriteSheet->tag;
+    sOamWork->array[id].palTag = template->spritePal->tag;
+    sOamWork->array[id].isActive = TRUE;
+
+    // Decimal left shift
+    sOamWork->array[id].pow10 = 1;
+    for (i = 1; i < template->oamCount; i++)
+        sOamWork->array[id].pow10 *= 10;
+
+    CopyWorkToOam(&sOamWork->array[id]);
+    DigitObjUtil_PrintNumOn(id, num);
+
+    return TRUE;
+}
+
+static void CopyWorkToOam(struct DigitPrinter *objWork)
+{
+    u32 i;
+    u32 oamId = objWork->firstOamId;
+    u32 x = objWork->x;
+    u32 oamCount = objWork->oamCount + 1;
+
+    CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
+    for (i = 0, oamId = objWork->firstOamId; i < oamCount; i++, oamId++)
+    {
+        gMain.oamBuffer[oamId].y = objWork->y;
+        gMain.oamBuffer[oamId].x = x;
+        gMain.oamBuffer[oamId].shape = objWork->shape;
+        gMain.oamBuffer[oamId].size = objWork->size;
+        gMain.oamBuffer[oamId].tileNum = objWork->tileStart;
+        gMain.oamBuffer[oamId].priority = objWork->priority;
+        gMain.oamBuffer[oamId].paletteNum = objWork->palTagIndex;
+
+        x += objWork->xDelta;
+    }
+
+    oamId--;
+    gMain.oamBuffer[oamId].x = objWork->x - objWork->xDelta;
+    gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    gMain.oamBuffer[oamId].tileNum = objWork->tileStart + (objWork->tilesPerImage * 10);
+}
+
+void DigitObjUtil_PrintNumOn(u32 id, s32 num)
+{
+    bool32 sign;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    sOamWork->array[id].lastPrinted = num;
+    if (num < 0)
+    {
+        sign = TRUE;
+        num *= -1;
+    }
+    else
+    {
+        sign = FALSE;
+    }
+
+    switch (sOamWork->array[id].strConvMode)
+    {
+    case 0:
+    default:
+        DrawNumObjsLeadingZeros(&sOamWork->array[id], num, sign);
+        break;
+    case 1:
+        DrawNumObjsMinusInFront(&sOamWork->array[id], num, sign);
+        break;
+    case 2:
+        DrawNumObjsMinusInBack(&sOamWork->array[id], num, sign);
+        break;
+    }
+}
+
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    u32 oamId = objWork->firstOamId;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+        oamId++;
+    }
+
+    if (sign)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+    else
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    static int oamId;
+    static int curDigit;
+    static int firstDigit;
+
+    oamId = objWork->firstOamId;
+    curDigit = 0;
+    firstDigit = -1;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        if (digit != 0 || firstDigit != -1 || pow10 == 0)
+        {
+            gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+            if (firstDigit == -1)
+                firstDigit = curDigit;
+        }
+        else
+        {
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+        }
+
+        oamId++;
+        curDigit++;
+    }
+
+    if (sign)
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+        gMain.oamBuffer[oamId].x = objWork->x + ((firstDigit - 1) * objWork->xDelta);
+    }
+    else
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    }
+}
+
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    u32 oamId = objWork->firstOamId;
+    u32 printingDigits = 0;
+    s32 nsprites = 0;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        if (digit != 0 || printingDigits != 0 || pow10 == 0)
+        {
+            printingDigits = 1;
+            gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+            oamId++;
+            nsprites++;
+        }
+    }
+
+    while (nsprites < objWork->oamCount)
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+        oamId++;
+        nsprites++;
+    }
+
+    if (sign)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+    else
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+void DigitObjUtil_DeletePrinter(u32 id)
+{
+    s32 oamId, oamCount, i;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    oamCount = sOamWork->array[id].oamCount + 1;
+    oamId = sOamWork->array[id].firstOamId;
+
+    for (i = 0; i < oamCount; i++, oamId++)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+
+    if (!SharesTileWithAnyActive(id))
+        FreeSpriteTilesByTag(sOamWork->array[id].tileTag);
+    if (!SharesPalWithAnyActive(id))
+        FreeSpritePaletteByTag(sOamWork->array[id].palTag);
+
+    sOamWork->array[id].isActive = FALSE;
+}
+
+void DigitObjUtil_HideOrShow(u32 id, bool32 hide)
+{
+    s32 oamId, oamCount, i;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    oamCount = sOamWork->array[id].oamCount + 1;
+    oamId = sOamWork->array[id].firstOamId;
+    if (hide)
+    {
+        for (i = 0; i < oamCount; i++, oamId++)
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    }
+    else
+    {
+        for (i = 0; i < oamCount; i++, oamId++)
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+        DigitObjUtil_PrintNumOn(id, sOamWork->array[id].lastPrinted);
+    }
+}
+
+static u8 GetFirstOamId(u8 oamCount)
+{
+    u32 i;
+    u16 firstOamId = 64;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (!sOamWork->array[i].isActive)
+        {
+            if (sOamWork->array[i].firstOamId != 0xFF && sOamWork->array[i].oamCount <= oamCount)
+                return sOamWork->array[i].firstOamId;
+        }
+        else
+        {
+            firstOamId += 1 + sOamWork->array[i].oamCount;
+        }
+    }
+
+    if (firstOamId + oamCount + 1 > 128)
+        return 0xFF;
+    else
+        return firstOamId;
+}
+
+static bool32 SharesTileWithAnyActive(u32 id)
+{
+    u32 i;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (sOamWork->array[i].isActive && i != id
+            && sOamWork->array[i].tileTag == sOamWork->array[id].tileTag)
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static bool32 SharesPalWithAnyActive(u32 id)
+{
+    u32 i;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (sOamWork->array[i].isActive && i != id
+            && sOamWork->array[i].palTag == sOamWork->array[id].palTag)
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static u8 GetTilesPerImage(u32 shape, u32 size)
+{
+    return sTilesPerImage[shape][size];
+}
diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c
index fc6aa14c6..4260c6f2f 100644
--- a/src/dodrio_berry_picking_2.c
+++ b/src/dodrio_berry_picking_2.c
@@ -7,7 +7,7 @@ void sub_815A5BC(s32 a0)
     struct Padded_U8 data[2];
     data[0].value = 1;
     data[1].value = a0;
-    sub_80F9E2C(data);
+    RfuPrepareSend0x2f00(data);
 }
 
 u8 sub_815A5E8(s32 a0)
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index 6909fea30..a2622bf02 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -2,16 +2,89 @@
 #include "text.h"
 #include "dynamic_placeholder_text_util.h"
 #include "string_util.h"
+#include "constants/object_events.h"
 
 static EWRAM_DATA const u8 *sStringPointers[8] = {0};
 
 static const u8 sTextColorTable[] =
 {
-     0,  0,  0, 16, 17, 17, 17, 16, 16,  0,  0, 17,  1,  0, 17, 16,
-     0, 16, 16,  0,  1,  1,  1,  1,  1,  1,  0,  0,  0,  1,  0,  0,
-    17,  1,  0,  0,  0, 16, 17,  0, 16, 16, 16,  0,  1,  0, 51, 51,
-    51, 51, 51, 51, 51, 51, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 50,
+ // [LOW_NYBBLE / 2]                               = 0xXY, // HIGH_NYBBLE
+    [OBJECT_EVENT_GFX_RED_NORMAL / 2]              = 0x00, // OBJECT_EVENT_GFX_RED_BIKE
+    [OBJECT_EVENT_GFX_RED_RUN / 2]                 = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
+    [OBJECT_EVENT_GFX_RED_FISH / 2]                = 0x00, // OBJECT_EVENT_GFX_RED_ITEM_COPY
+    [OBJECT_EVENT_GFX_RED_VS_SEEKER / 2]           = 0x10, // OBJECT_EVENT_GFX_GREEN_NORMAL
+    [OBJECT_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_RUN
+    [OBJECT_EVENT_GFX_GREEN_ITEM / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_FISH
+    [OBJECT_EVENT_GFX_GREEN_ITEM_COPY / 2]         = 0x11, // OBJECT_EVENT_GFX_GREEN_VS_SEEKER
+    [OBJECT_EVENT_GFX_RS_BRENDAN / 2]              = 0x10, // OBJECT_EVENT_GFX_RS_MAY
+    [OBJECT_EVENT_GFX_LITTLE_BOY / 2]              = 0x10, // OBJECT_EVENT_GFX_LITTLE_GIRL
+    [OBJECT_EVENT_GFX_YOUNGSTER / 2]               = 0x00, // OBJECT_EVENT_GFX_BOY
+    [OBJECT_EVENT_GFX_BUG_CATCHER / 2]             = 0x00, // OBJECT_EVENT_GFX_SITTING_BOY
+    [OBJECT_EVENT_GFX_LASS / 2]                    = 0x11, // OBJECT_EVENT_GFX_WOMAN_1
+    [OBJECT_EVENT_GFX_BATTLE_GIRL / 2]             = 0x01, // OBJECT_EVENT_GFX_MAN
+    [OBJECT_EVENT_GFX_ROCKER / 2]                  = 0x00, // OBJECT_EVENT_GFX_FAT_MAN
+    [OBJECT_EVENT_GFX_WOMAN_2 / 2]                 = 0x11, // OBJECT_EVENT_GFX_BEAUTY
+    [OBJECT_EVENT_GFX_BALDING_MAN / 2]             = 0x10, // OBJECT_EVENT_GFX_WOMAN_3
+    [OBJECT_EVENT_GFX_OLD_MAN_1 / 2]               = 0x00, // OBJECT_EVENT_GFX_OLD_MAN_2
+    [OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN / 2]      = 0x10, // OBJECT_EVENT_GFX_OLD_WOMAN
+    [OBJECT_EVENT_GFX_TUBER_M_1 / 2]               = 0x10, // OBJECT_EVENT_GFX_TUBER_F
+    [OBJECT_EVENT_GFX_TUBER_M_2 / 2]               = 0x00, // OBJECT_EVENT_GFX_CAMPER
+    [OBJECT_EVENT_GFX_PICNICKER / 2]               = 0x01, // OBJECT_EVENT_GFX_COOLTRAINER_M
+    [OBJECT_EVENT_GFX_COOLTRAINER_F / 2]           = 0x01, // OBJECT_EVENT_GFX_SWIMMER_M_WATER
+    [OBJECT_EVENT_GFX_SWIMMER_F_WATER / 2]         = 0x01, // OBJECT_EVENT_GFX_SWIMMER_M_LAND
+    [OBJECT_EVENT_GFX_SWIMMER_F_LAND / 2]          = 0x01, // OBJECT_EVENT_GFX_WORKER_M
+    [OBJECT_EVENT_GFX_WORKER_F / 2]                = 0x01, // OBJECT_EVENT_GFX_ROCKET_M
+    [OBJECT_EVENT_GFX_ROCKET_F / 2]                = 0x01, // OBJECT_EVENT_GFX_GBA_KID
+    [OBJECT_EVENT_GFX_SUPER_NERD / 2]              = 0x00, // OBJECT_EVENT_GFX_BIKER
+    [OBJECT_EVENT_GFX_BLACKBELT / 2]               = 0x00, // OBJECT_EVENT_GFX_SCIENTIST
+    [OBJECT_EVENT_GFX_HIKER / 2]                   = 0x00, // OBJECT_EVENT_GFX_FISHER
+    [OBJECT_EVENT_GFX_CHANNELER / 2]               = 0x01, // OBJECT_EVENT_GFX_CHEF
+    [OBJECT_EVENT_GFX_POLICEMAN / 2]               = 0x00, // OBJECT_EVENT_GFX_GENTLEMAN
+    [OBJECT_EVENT_GFX_SAILOR / 2]                  = 0x00, // OBJECT_EVENT_GFX_CAPTAIN
+    [OBJECT_EVENT_GFX_NURSE / 2]                   = 0x11, // OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST
+    [OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST / 2] = 0x01, // OBJECT_EVENT_GFX_UNUSED_MALE_RECEPTIONIST
+    [OBJECT_EVENT_GFX_CLERK / 2]                   = 0x00, // OBJECT_EVENT_GFX_MG_DELIVERYMAN
+    [OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE / 2]      = 0x00, // OBJECT_EVENT_GFX_PROF_OAK
+    [OBJECT_EVENT_GFX_BLUE / 2]                    = 0x00, // OBJECT_EVENT_GFX_BILL
+    [OBJECT_EVENT_GFX_LANCE / 2]                   = 0x10, // OBJECT_EVENT_GFX_AGATHA
+    [OBJECT_EVENT_GFX_DAISY / 2]                   = 0x11, // OBJECT_EVENT_GFX_LORELEI
+    [OBJECT_EVENT_GFX_MR_FUJI / 2]                 = 0x00, // OBJECT_EVENT_GFX_BRUNO
+    [OBJECT_EVENT_GFX_BROCK / 2]                   = 0x10, // OBJECT_EVENT_GFX_MISTY
+    [OBJECT_EVENT_GFX_LT_SURGE / 2]                = 0x10, // OBJECT_EVENT_GFX_ERIKA
+    [OBJECT_EVENT_GFX_KOGA / 2]                    = 0x10, // OBJECT_EVENT_GFX_SABRINA
+    [OBJECT_EVENT_GFX_BLAINE / 2]                  = 0x00, // OBJECT_EVENT_GFX_GIOVANNI
+    [OBJECT_EVENT_GFX_MOM / 2]                     = 0x01, // OBJECT_EVENT_GFX_CELIO
+    [OBJECT_EVENT_GFX_TEACHY_TV_HOST / 2]          = 0x00, // OBJECT_EVENT_GFX_GYM_GUY
+    [OBJECT_EVENT_GFX_ITEM_BALL / 2]               = 0x33, // OBJECT_EVENT_GFX_TOWN_MAP
+    [OBJECT_EVENT_GFX_POKEDEX / 2]                 = 0x33, // OBJECT_EVENT_GFX_CUT_TREE
+    [OBJECT_EVENT_GFX_ROCK_SMASH_ROCK / 2]         = 0x33, // OBJECT_EVENT_GFX_STRENGTH_BOULDER
+    [OBJECT_EVENT_GFX_FOSSIL / 2]                  = 0x33, // OBJECT_EVENT_GFX_RUBY
+    [OBJECT_EVENT_GFX_SAPPHIRE / 2]                = 0x33, // OBJECT_EVENT_GFX_OLD_AMBER
+    [OBJECT_EVENT_GFX_GYM_SIGN / 2]                = 0x33, // OBJECT_EVENT_GFX_SIGN
+    [OBJECT_EVENT_GFX_TRAINER_TIPS / 2]            = 0x33, // OBJECT_EVENT_GFX_CLIPBOARD
+    [OBJECT_EVENT_GFX_METEORITE / 2]               = 0x33, // OBJECT_EVENT_GFX_LAPRAS_DOLL
+    [OBJECT_EVENT_GFX_SEAGALLOP / 2]               = 0x23, // OBJECT_EVENT_GFX_SNORLAX
+    [OBJECT_EVENT_GFX_SPEAROW / 2]                 = 0x22, // OBJECT_EVENT_GFX_CUBONE
+    [OBJECT_EVENT_GFX_POLIWRATH / 2]               = 0x22, // OBJECT_EVENT_GFX_CLEFAIRY
+    [OBJECT_EVENT_GFX_PIDGEOT / 2]                 = 0x22, // OBJECT_EVENT_GFX_JIGGLYPUFF
+    [OBJECT_EVENT_GFX_PIDGEY / 2]                  = 0x22, // OBJECT_EVENT_GFX_CHANSEY
+    [OBJECT_EVENT_GFX_OMANYTE / 2]                 = 0x22, // OBJECT_EVENT_GFX_KANGASKHAN
+    [OBJECT_EVENT_GFX_PIKACHU / 2]                 = 0x22, // OBJECT_EVENT_GFX_PSYDUCK
+    [OBJECT_EVENT_GFX_NIDORAN_F / 2]               = 0x22, // OBJECT_EVENT_GFX_NIDORAN_M
+    [OBJECT_EVENT_GFX_NIDORINO / 2]                = 0x22, // OBJECT_EVENT_GFX_MEOWTH
+    [OBJECT_EVENT_GFX_SEEL / 2]                    = 0x22, // OBJECT_EVENT_GFX_VOLTORB
+    [OBJECT_EVENT_GFX_SLOWPOKE / 2]                = 0x22, // OBJECT_EVENT_GFX_SLOWBRO
+    [OBJECT_EVENT_GFX_MACHOP / 2]                  = 0x22, // OBJECT_EVENT_GFX_WIGGLYTUFF
+    [OBJECT_EVENT_GFX_DODUO / 2]                   = 0x22, // OBJECT_EVENT_GFX_FEAROW
+    [OBJECT_EVENT_GFX_MACHOKE / 2]                 = 0x22, // OBJECT_EVENT_GFX_LAPRAS
+    [OBJECT_EVENT_GFX_ZAPDOS / 2]                  = 0x22, // OBJECT_EVENT_GFX_MOLTRES
+    [OBJECT_EVENT_GFX_ARTICUNO / 2]                = 0x22, // OBJECT_EVENT_GFX_MEWTWO
+    [OBJECT_EVENT_GFX_MEW / 2]                     = 0x22, // OBJECT_EVENT_GFX_ENTEI
+    [OBJECT_EVENT_GFX_SUICUNE / 2]                 = 0x22, // OBJECT_EVENT_GFX_RAIKOU
+    [OBJECT_EVENT_GFX_LUGIA / 2]                   = 0x22, // OBJECT_EVENT_GFX_HO_OH
+    [OBJECT_EVENT_GFX_CELEBI / 2]                  = 0x22, // OBJECT_EVENT_GFX_KABUTO
+    [OBJECT_EVENT_GFX_DEOXYS_D / 2]                = 0x22, // OBJECT_EVENT_GFX_DEOXYS_A
+    [OBJECT_EVENT_GFX_DEOXYS_N / 2]                = 0x32, // OBJECT_EVENT_GFX_SS_ANNE
 };
 
 void DynamicPlaceholderTextUtil_Reset(void)
@@ -63,7 +136,7 @@ u8 GetColorFromTextColorTable(u16 graphicId)
     u32 test = graphicId >> 1;
     u32 shift = (graphicId & 1) << 2;
 
-    if (test > 0x4B)
+    if (test >= NELEMS(sTextColorTable))
         return 3;
     else
         return (sTextColorTable[graphicId >> 1] >> shift) & 0xF;
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index cce6cefca..df1b1c279 100644
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -1,25 +1,18 @@
 #include "global.h"
 #include "link.h"
-#include "unk_815c27c.h"
-
-enum {
-    EREADER_XFR_STATE_INIT,
-    EREADER_XFR_STATE_HANDSHAKE,
-    EREADER_XFR_STATE_START,
-    EREADER_XFR_STATE_TRANSFER,
-};
+#include "ereader_helpers.h"
 
 struct SendRecvMgr
 {
-    u8 sendOrRecv;
-    u8 state;
-    u8 field_02;
-    u8 field_03;
-    u8 field_04;
-    u32 * dataptr;
-    int cursor;
-    int size;
-    u32 checksum;
+    u8 master_slave;       // 0: clock slave; 1: clock master
+    u8 state;              // EREADER_XFR_STATE_*
+    u8 xferState;          // EREADER_XFER_*
+    u8 checksumResult;     // EREADER_CHECKSUM_*
+    u8 cancellationReason; // EREADER_CANCEL_*
+    u32 * dataptr;         // Payload source or destination
+    int cursor;            // Index of the next word
+    int size;              // Last word index
+    u32 checksum;          // Validation checksum
 };
 
 static bool16 DetermineSendRecvState(u8);
@@ -39,10 +32,9 @@ static u16 sSavedIme;
 static u16 sSavedIe;
 static u16 sSavedTm3Cnt;
 static u16 sSavedSioCnt;
-static u16 sSavedSioCnt;
 static u16 sSavedRCnt;
 
-int EReader_Send(size_t r6, const void * r5)
+int EReader_Send(size_t size, const void * src)
 {
     int result;
     EReaderHelper_SaveRegsState();
@@ -53,18 +45,18 @@ int EReader_Send(size_t r6, const void * r5)
         if (TEST_BUTTON(sJoyNew, B_BUTTON))
             gShouldAdvanceLinkState = 2;
 
-        sSendRecvStatus = EReaderHandleTransfer(1, r6, r5, NULL);
-        if ((sSendRecvStatus & 0x13) == 0x10)
+        sSendRecvStatus = EReaderHandleTransfer(1, size, src, NULL);
+        if ((sSendRecvStatus & 0x13) == 0x10) // checksum OK and xfer off
         {
             result = 0;
             break;
         }
-        else if (sSendRecvStatus & 8)
+        else if (sSendRecvStatus & 8) // cancelled by player
         {
             result = 1;
             break;
         }
-        else if (sSendRecvStatus & 4)
+        else if (sSendRecvStatus & 4) // timed out
         {
             result = 2;
             break;
@@ -81,7 +73,7 @@ int EReader_Send(size_t r6, const void * r5)
     return result;
 }
 
-int EReader_Recv(void * r5)
+int EReader_Recv(void * dest)
 {
     int result;
     EReaderHelper_SaveRegsState();
@@ -92,18 +84,18 @@ int EReader_Recv(void * r5)
         if (TEST_BUTTON(sJoyNew, B_BUTTON))
             gShouldAdvanceLinkState = 2;
 
-        sSendRecvStatus = EReaderHandleTransfer(0, 0, NULL, r5);
-        if ((sSendRecvStatus & 0x13) == 0x10)
+        sSendRecvStatus = EReaderHandleTransfer(0, 0, NULL, dest);
+        if ((sSendRecvStatus & 0x13) == 0x10) // checksum OK and xfer off
         {
             result = 0;
             break;
         }
-        else if (sSendRecvStatus & 8)
+        else if (sSendRecvStatus & 8) // cancelled by player
         {
             result = 1;
             break;
         }
-        else if (sSendRecvStatus & 4)
+        else if (sSendRecvStatus & 4) // timed out
         {
             result = 2;
             break;
@@ -159,92 +151,98 @@ u16 EReaderHandleTransfer(u8 mode, size_t size, const void * data, void * recvBu
 {
     switch (sSendRecvMgr.state)
     {
-    case 0:
+    case EREADER_XFR_STATE_INIT:
         OpenSerialMulti();
-        sSendRecvMgr.field_02 = 1;
-        sSendRecvMgr.state = 1;
+        sSendRecvMgr.xferState = EREADER_XFER_EXE;
+        sSendRecvMgr.state = EREADER_XFR_STATE_HANDSHAKE;
         break;
-    case 1:
+    case EREADER_XFR_STATE_HANDSHAKE:
         if (DetermineSendRecvState(mode))
             EnableSio();
         if (gShouldAdvanceLinkState == 2)
         {
-            sSendRecvMgr.field_04 = 2;
-            sSendRecvMgr.state = 6;
+            sSendRecvMgr.cancellationReason = EREADER_CANCEL_KEY;
+            sSendRecvMgr.state = EREADER_XFR_STATE_DONE;
         }
+        // Progression is handled by the serial callback
         break;
-    case 2:
+    case EREADER_XFR_STATE_START:
         OpenSerial32();
         SetUpTransferManager(size, data, recvBuffer);
-        sSendRecvMgr.state = 3;
+        sSendRecvMgr.state = EREADER_XFR_STATE_TRANSFER;
         // fallthrough
-    case 3:
+    case EREADER_XFR_STATE_TRANSFER:
         if (gShouldAdvanceLinkState == 2)
         {
-            sSendRecvMgr.field_04 = 2;
-            sSendRecvMgr.state = 6;
+            sSendRecvMgr.cancellationReason = EREADER_CANCEL_KEY;
+            sSendRecvMgr.state = EREADER_XFR_STATE_DONE;
         }
         else
         {
             sCounter1++;
             sCounter2++;
-            if (sSendRecvMgr.sendOrRecv == 0 && sCounter2 > 60)
+            if (sSendRecvMgr.master_slave == 0 && sCounter2 > 60)
             {
-                sSendRecvMgr.field_04 = 1;
-                sSendRecvMgr.state = 6;
+                sSendRecvMgr.cancellationReason = EREADER_CANCEL_TIMEOUT;
+                sSendRecvMgr.state = EREADER_XFR_STATE_DONE;
             }
-            if (sSendRecvMgr.field_02 != 2)
+            if (sSendRecvMgr.xferState != EREADER_XFER_CHK)
             {
-                if (sSendRecvMgr.sendOrRecv != 0 && sCounter1 > 2)
+                if (sSendRecvMgr.master_slave != 0 && sCounter1 > 2)
                 {
                     EnableSio();
-                    sSendRecvMgr.field_02 = 2;
+                    sSendRecvMgr.xferState = EREADER_XFER_CHK;
                 }
                 else
                 {
                     EnableSio();
-                    sSendRecvMgr.field_02 = 2;
+                    sSendRecvMgr.xferState = EREADER_XFER_CHK;
                 }
             }
         }
+        // Progression is handled by the serial callback
         break;
-    case 4:
+    case EREADER_XFR_STATE_TRANSFER_DONE:
         OpenSerialMulti();
-        sSendRecvMgr.state = 5;
+        sSendRecvMgr.state = EREADER_XFR_STATE_CHECKSUM;
         break;
-    case 5:
-        if (sSendRecvMgr.sendOrRecv == 1 && sCounter1 > 2)
+    case EREADER_XFR_STATE_CHECKSUM:
+        if (sSendRecvMgr.master_slave == 1 && sCounter1 > 2)
             EnableSio();
         if (++sCounter1 > 60)
         {
-            sSendRecvMgr.field_04 = 1;
-            sSendRecvMgr.state = 6;
+            sSendRecvMgr.cancellationReason = EREADER_CANCEL_TIMEOUT;
+            sSendRecvMgr.state = EREADER_XFR_STATE_DONE;
         }
         break;
-    case 6:
-        if (sSendRecvMgr.field_02 != 0)
+        // Progression is handled by the serial callback
+    case EREADER_XFR_STATE_DONE:
+        if (sSendRecvMgr.xferState != 0)
         {
             CloseSerial();
-            sSendRecvMgr.field_02 = 0;
+            sSendRecvMgr.xferState = 0;
         }
         break;
     }
-    return sSendRecvMgr.field_02 | (sSendRecvMgr.field_04 << 2) | (sSendRecvMgr.field_03 << 4);
+    return
+        (sSendRecvMgr.xferState << EREADER_XFER_SHIFT)
+      | (sSendRecvMgr.cancellationReason << EREADER_CANCEL_SHIFT)
+      | (sSendRecvMgr.checksumResult << EREADER_CHECKSUM_SHIFT);
 }
 
 static bool16 DetermineSendRecvState(u8 mode)
 {
     bool16 resp;
     if ((*(vu32 *)REG_ADDR_SIOCNT & (SIO_MULTI_SI | SIO_MULTI_SD)) == SIO_MULTI_SD && mode)
-        resp = sSendRecvMgr.sendOrRecv = TRUE;
+        resp = sSendRecvMgr.master_slave = TRUE;
     else
-        resp = sSendRecvMgr.sendOrRecv = FALSE;
+        resp = sSendRecvMgr.master_slave = FALSE;
     return resp;
 }
 
 static void SetUpTransferManager(size_t size, const void * data, void * recvBuffer)
 {
-    if (sSendRecvMgr.sendOrRecv)
+    if (sSendRecvMgr.master_slave)
     {
         REG_SIOCNT |= SIO_38400_BPS;
         sSendRecvMgr.dataptr = (void *)data;
@@ -284,7 +282,7 @@ void EReaderHelper_SerialCallback(void)
 
     switch (sSendRecvMgr.state)
     {
-    case 1:
+    case EREADER_XFR_STATE_HANDSHAKE:
         REG_SIOMLT_SEND = 0xCCD0;
         *(u64 *)recv = REG_SIOMLT_RECV;
         for (i = 0, cnt1 = 0, cnt2 = 0; i < 4; i++)
@@ -295,14 +293,17 @@ void EReaderHelper_SerialCallback(void)
                 cnt2++;
         }
         if (cnt1 == 2 && cnt2 == 0)
-            sSendRecvMgr.state = 2;
+            sSendRecvMgr.state = EREADER_XFR_STATE_START;
         break;
-    case 3:
+        // Progression is handled by software
+    case EREADER_XFR_STATE_TRANSFER:
         recv32 = REG_SIODATA32;
-        if (sSendRecvMgr.cursor == 0 && sSendRecvMgr.sendOrRecv == 0)
+        // The first value sent by the EReader is the payload size
+        if (sSendRecvMgr.cursor == 0 && sSendRecvMgr.master_slave == 0)
             sSendRecvMgr.size = recv32 / 4 + 1;
-        if (sSendRecvMgr.sendOrRecv == 1)
+        if (sSendRecvMgr.master_slave == 1)
         {
+            // Send mode
             if (sSendRecvMgr.cursor < sSendRecvMgr.size)
             {
                 REG_SIODATA32 = sSendRecvMgr.dataptr[sSendRecvMgr.cursor];
@@ -313,43 +314,51 @@ void EReaderHelper_SerialCallback(void)
         }
         else
         {
+            // Receive mode
             if (sSendRecvMgr.cursor > 0 && sSendRecvMgr.cursor < sSendRecvMgr.size + 1)
             {
+                // Receive next word
                 sSendRecvMgr.dataptr[sSendRecvMgr.cursor - 1] = recv32;
                 sSendRecvMgr.checksum += recv32;
             }
             else if (sSendRecvMgr.cursor != 0)
             {
+                // Reached the end, test the received checksum
                 if (sSendRecvMgr.checksum == recv32)
-                    sSendRecvMgr.field_03 = 1;
+                    sSendRecvMgr.checksumResult = EREADER_CHECKSUM_OK;
                 else
-                    sSendRecvMgr.field_03 = 2;
+                    sSendRecvMgr.checksumResult = EREADER_CHECKSUM_ERR;
             }
             sCounter2 = 0;
         }
         sSendRecvMgr.cursor++;
         if (sSendRecvMgr.cursor < sSendRecvMgr.size + 2)
         {
-            if (sSendRecvMgr.sendOrRecv != 0)
+            if (sSendRecvMgr.master_slave != 0)
+                // Clock master; start timer
                 REG_TM3CNT_H |= TIMER_ENABLE;
             else
+                // Clock slave; reset
                 EnableSio();
         }
         else
         {
-            sSendRecvMgr.state = 4;
+            sSendRecvMgr.state = EREADER_XFR_STATE_TRANSFER_DONE;
             sCounter1 = 0;
         }
         break;
-    case 5:
-        if (sSendRecvMgr.sendOrRecv == 0)
-            REG_SIODATA8 = sSendRecvMgr.field_03;
+        // Progression is handled by the software
+    case EREADER_XFR_STATE_CHECKSUM:
+        if (sSendRecvMgr.master_slave == 0)
+            // Clock slave
+            REG_SIODATA8 = sSendRecvMgr.checksumResult;
         *(vu64 *)recv = REG_SIOMLT_RECV;
-        if (recv[1] == 1 || recv[1] == 2)
+        if (recv[1] == EREADER_CHECKSUM_OK || recv[1] == EREADER_CHECKSUM_ERR)
         {
-            if (sSendRecvMgr.sendOrRecv == 1)
-                sSendRecvMgr.field_03 = recv[1];
-            sSendRecvMgr.state = 6;
+            if (sSendRecvMgr.master_slave == 1)
+                // EReader has (in)validated the payload
+                sSendRecvMgr.checksumResult = recv[1];
+            sSendRecvMgr.state = EREADER_XFR_STATE_DONE;
         }
         break;
     }
diff --git a/src/event_data.c b/src/event_data.c
index 010a4414c..74d1cf608 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -118,7 +118,7 @@ bool32 IsMysteryGiftEnabled(void)
     return FlagGet(FLAG_SYS_MYSTERY_GIFT_ENABLED);
 }
 
-void sub_806E2D0(void)
+void ResetMysteryEventFlags(void)
 {
     FlagClear(FLAG_MYSTERY_EVENT_DONE);
     FlagClear(FLAG_0x3D9);
@@ -138,7 +138,7 @@ void sub_806E2D0(void)
     FlagClear(FLAG_0x3E7);
 }
 
-void sub_806E370(void)
+void ResetMysteryEventVars(void)
 {
     VarSet(VAR_EVENT_PICHU_SLOT, 0);
     VarSet(VAR_0x40B6, 0);
diff --git a/src/event_object_80688E4.c b/src/event_object_80688E4.c
new file mode 100644
index 000000000..2d79c4f7b
--- /dev/null
+++ b/src/event_object_80688E4.c
@@ -0,0 +1,653 @@
+#include "global.h"
+#include "event_object_80688E4.h"
+#include "event_object_movement.h"
+#include "field_effect.h"
+#include "field_ground_effect.h"
+
+// This is part of evobjmv.c (see assert statement in DoObjectUnionRoomWarpYDisplacement).
+
+static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite);
+
+bool8 FreezeObjectEvent(struct ObjectEvent * objectEvent)
+{
+    if (objectEvent->heldMovementActive || objectEvent->frozen)
+        return TRUE;
+    objectEvent->frozen = TRUE;
+    objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused;
+    objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused;
+    gSprites[objectEvent->spriteId].animPaused = TRUE;
+    gSprites[objectEvent->spriteId].affineAnimPaused = TRUE;
+    return FALSE;
+}
+
+void FreezeObjectEvents(void)
+{
+    u8 i;
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+    {
+        if (gObjectEvents[i].active && i != gPlayerAvatar.objectEventId)
+            FreezeObjectEvent(&gObjectEvents[i]);
+    }
+}
+
+void FreezeObjectEventsExceptOne(u8 noFreeze)
+{
+    u8 i;
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+    {
+        if (i != noFreeze && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId)
+            FreezeObjectEvent(&gObjectEvents[i]);
+    }
+}
+
+void UnfreezeObjectEvent(struct ObjectEvent * objectEvent)
+{
+    if (objectEvent->active && objectEvent->frozen)
+    {
+        objectEvent->frozen = FALSE;
+        gSprites[objectEvent->spriteId].animPaused = objectEvent->spriteAnimPausedBackup;
+        gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->spriteAffineAnimPausedBackup;
+    }
+}
+
+void UnfreezeObjectEvents(void)
+{
+    u8 i;
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+    {
+        if (gObjectEvents[i].active)
+            UnfreezeObjectEvent(&gObjectEvents[i]);
+    }
+}
+
+#define tObjectEventId data[0]
+#define tZCoord        data[1]
+#define tInvisible     data[2]
+
+#define tDirection data[3]
+#define tSpeed     data[4]
+#define tStepNo    data[5]
+
+static void little_step(struct Sprite * sprite, u8 direction)
+{
+    sprite->pos1.x += gUnknown_83A64C8[direction].x;
+    sprite->pos1.y += gUnknown_83A64C8[direction].y;
+}
+
+static void double_little_steps(struct Sprite * sprite, u8 direction)
+{
+    sprite->pos1.x += 2 * gUnknown_83A64C8[direction].x;
+    sprite->pos1.y += 2 * gUnknown_83A64C8[direction].y;
+}
+
+static void triple_little_steps(struct Sprite * sprite, u8 direction)
+{
+    sprite->pos1.x += 2 * gUnknown_83A64C8[direction].x + gUnknown_83A64C8[direction].x;
+    sprite->pos1.y += 2 * gUnknown_83A64C8[direction].y + gUnknown_83A64C8[direction].y;
+}
+
+static void quad_little_steps(struct Sprite * sprite, u8 direction)
+{
+    sprite->pos1.x += 4 * gUnknown_83A64C8[direction].x;
+    sprite->pos1.y += 4 * gUnknown_83A64C8[direction].y;
+}
+
+static void oct_little_steps(struct Sprite * sprite, u8 direction)
+{
+    sprite->pos1.x += 8 * gUnknown_83A64C8[direction].x;
+    sprite->pos1.y += 8 * gUnknown_83A64C8[direction].y;
+}
+
+void oamt_npc_ministep_reset(struct Sprite * sprite, u8 direction, u8 speed)
+{
+    sprite->tDirection = direction;
+    sprite->tSpeed = speed;
+    sprite->tStepNo = 0;
+}
+
+typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 direction);
+
+static const SpriteStepFunc sSpeed0[] = {
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step,
+    little_step
+};
+
+static const SpriteStepFunc sSpeed1[] = {
+    double_little_steps,
+    double_little_steps,
+    double_little_steps,
+    double_little_steps,
+    double_little_steps,
+    double_little_steps,
+    double_little_steps,
+    double_little_steps
+};
+
+static const SpriteStepFunc sSpeed2[] = {
+    double_little_steps,
+    triple_little_steps,
+    triple_little_steps,
+    double_little_steps,
+    triple_little_steps,
+    triple_little_steps
+};
+
+static const SpriteStepFunc sSpeed3[] = {
+    quad_little_steps,
+    quad_little_steps,
+    quad_little_steps,
+    quad_little_steps
+};
+
+static const SpriteStepFunc sSpeed4[] = {
+    oct_little_steps,
+    oct_little_steps
+};
+
+static const SpriteStepFunc *const sSpriteStepFuncsBySpeed[] = {
+    sSpeed0,
+    sSpeed1,
+    sSpeed2,
+    sSpeed3,
+    sSpeed4
+};
+
+static const s16 sSpriteStepCountsBySpeed[] = {
+    NELEMS(sSpeed0),
+    NELEMS(sSpeed1),
+    NELEMS(sSpeed2),
+    NELEMS(sSpeed3),
+    NELEMS(sSpeed4)
+};
+
+bool8 obj_npc_ministep(struct Sprite *sprite)
+{
+    if (sprite->tStepNo >= sSpriteStepCountsBySpeed[sprite->tSpeed])
+        return FALSE;
+
+    sSpriteStepFuncsBySpeed[sprite->tSpeed][sprite->tStepNo](sprite, sprite->tDirection);
+
+    sprite->tStepNo++;
+
+    if (sprite->tStepNo < sSpriteStepCountsBySpeed[sprite->tSpeed])
+        return FALSE;
+
+    return TRUE;
+}
+
+#undef tStepNo
+#undef tSpeed
+#undef tDirection
+
+#define tDirection data[3]
+#define tDelay     data[4]
+#define tStepNo    data[5]
+
+void sub_8068BBC(struct Sprite *sprite, u8 direction)
+{
+    sprite->tDirection = direction;
+    sprite->tDelay = 0;
+    sprite->tStepNo = 0;
+}
+
+bool8 sub_8068BCC(struct Sprite *sprite)
+{
+    if (!(sprite->tDelay & 1))
+    {
+        little_step(sprite, sprite->tDirection);
+        sprite->tStepNo++;
+    }
+
+    sprite->tDelay++;
+
+    if (sprite->tStepNo > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8068C08(struct Sprite *sprite, u8 direction)
+{
+    sprite->tDirection = direction;
+    sprite->tDelay = 0;
+    sprite->tStepNo = 0;
+}
+
+bool8 sub_8068C18(struct Sprite *sprite)
+{
+    if (++sprite->tDelay < 3)
+    {
+        little_step(sprite, sprite->tDirection);
+        sprite->tStepNo++;
+    }
+    else
+        sprite->tDelay = 0;
+
+    if (sprite->tStepNo > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8068C58(struct Sprite *sprite, u8 direction)
+{
+    sprite->tDirection = direction;
+    sprite->tDelay = 0;
+    sprite->tStepNo = 0;
+}
+
+bool8 sub_8068C68(struct Sprite *sprite)
+{
+    if (++sprite->tDelay > 9)
+    {
+        sprite->tDelay = 0;
+        little_step(sprite, sprite->tDirection);
+        sprite->tStepNo++;
+    }
+
+    if (sprite->tStepNo > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8068CA4(struct Sprite *sprite, u8 direction)
+{
+    sprite->tDirection = direction;
+    sprite->tDelay = 0;
+    sprite->tStepNo = 0;
+}
+
+bool8 sub_8068CB4(struct Sprite *sprite)
+{
+    if ((++sprite->tDelay) & 1)
+    {
+        little_step(sprite, sprite->tDirection);
+        sprite->tStepNo++;
+    }
+    else
+    {
+        double_little_steps(sprite, sprite->tDirection);
+        sprite->tStepNo += 2;
+    }
+
+    if (sprite->tStepNo > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+#undef tStepNo
+#undef tDelay
+#undef tDirection
+
+#define tDirection  data[3]
+#define tJumpSpeed  data[4]
+#define tJumpHeight data[5]
+#define tStepNo     data[6]
+
+static const s8 sJumpHeight12[] = {
+    -4,  -6,  -8, -10, -11, -12, -12, -12, -11, -10,  -9,  -8,  -6,  -4,   0,   0
+};
+
+static const s8 sJumpHeight6[] = {
+    0,  -2,  -3,  -4,  -5,  -6,  -6,  -6,  -5,  -5,  -4,  -3,  -2,   0,   0,   0
+};
+
+static const s8 sJumpHeight10[] = {
+    -2,  -4,  -6,  -8,  -9, -10, -10, -10,  -9,  -8,  -6,  -5,  -3,  -2,   0,   0
+};
+
+static const s8 *const sYDisplacementPtrs[] = {
+    sJumpHeight12,
+    sJumpHeight6,
+    sJumpHeight10
+};
+
+static s16 GetJumpYDisplacement(s16 stepno, u8 jumpno)
+{
+    return sYDisplacementPtrs[jumpno][stepno];
+}
+
+void sub_8068D1C(struct Sprite *sprite, u8 direction, u8 speed, u8 height)
+{
+    sprite->tDirection = direction;
+    sprite->tJumpSpeed = speed;
+    sprite->tJumpHeight = height;
+    sprite->tStepNo = 0;
+}
+
+u8 sub_8068D3C(struct Sprite *sprite)
+{
+    s16 duration[3] = {0x10, 0x10, 0x20};
+    u8 shifts[3] = {0, 0, 1};
+    u8 jumpPhase = 0;
+
+    if (sprite->tJumpSpeed != 0)
+        little_step(sprite, sprite->tDirection);
+
+    sprite->pos2.y = GetJumpYDisplacement(sprite->tStepNo >> shifts[sprite->tJumpSpeed], sprite->tJumpHeight);
+
+    sprite->tStepNo++;
+
+    if (sprite->tStepNo == (duration[sprite->tJumpSpeed] >> 1))
+        jumpPhase = 1;
+
+    if (sprite->tStepNo >= duration[sprite->tJumpSpeed])
+    {
+        sprite->pos2.y = 0;
+        jumpPhase = -1;
+    }
+
+    return jumpPhase;
+}
+
+u8 sub_8068DC4(struct Sprite *sprite)
+{
+    s16 duration[3] = {0x20, 0x20, 0x40};
+    u8 shifts[3] = {1, 1, 2};
+    u8 jumpPhase = 0;
+
+    if (sprite->tJumpSpeed != 0 && !(sprite->tStepNo & 1))
+        little_step(sprite, sprite->tDirection);
+
+    sprite->pos2.y = GetJumpYDisplacement(sprite->tStepNo >> shifts[sprite->tJumpSpeed], sprite->tJumpHeight);
+
+    sprite->tStepNo++;
+
+    if (sprite->tStepNo == (duration[sprite->tJumpSpeed] >> 1))
+        jumpPhase = 1;
+
+    if (sprite->tStepNo >= duration[sprite->tJumpSpeed])
+    {
+        sprite->pos2.y = 0;
+        jumpPhase = -1;
+    }
+
+    return jumpPhase;
+}
+
+#undef tStepNo
+#undef tJumpHeight
+#undef tJumpSpeed
+#undef tDirection
+
+#define tDelay data[3]
+
+void SetObjectEventStepTimer(struct Sprite *sprite, s16 delay)
+{
+    sprite->tDelay = delay;
+}
+
+bool8 RunObjectEventStepTimer(struct Sprite *sprite)
+{
+    sprite->tDelay--;
+
+    if (sprite->tDelay == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+#undef tDelay
+
+void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 animNum, u8 animCmdIndex)
+{
+    sprite->animNum = animNum;
+    sprite->animPaused = FALSE;
+    SeekSpriteAnim(sprite, animCmdIndex);
+}
+
+bool8 SpriteAnimEnded(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible)
+{
+    u16 x, y;
+    s16 x2, y2;
+
+    sprite->invisible = invisible;
+
+    if (sprite->coordOffsetEnabled)
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+    }
+    else
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    }
+
+    x2 = x - (sprite->centerToCornerVecX >> 1);
+    y2 = y - (sprite->centerToCornerVecY >> 1);
+
+    if ((s16)x > 255 || x2 < -16)
+        sprite->invisible = TRUE;
+    if ((s16)y > 175 || y2 < -16)
+        sprite->invisible = TRUE;
+}
+
+void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite)
+{
+    DoObjectUnionRoomWarpYDisplacement(sprite);
+    SetObjectSubpriorityByZCoord(sprite->tZCoord, sprite, 1);
+    UpdateObjectEventSpriteVisibility(sprite, sprite->tInvisible);
+}
+
+void sub_8068FD0(void)
+{
+    s32 i;
+    for (i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if (sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility)
+        {
+            DestroySprite(sprite);
+        }
+    }
+}
+
+#define tUnionRoomWarpAnimNo    data[3]
+#define tUnionRoomWarpAnimState data[4]
+
+static int GetObjectEventSpriteId(u8 objectEventId)
+{
+    int i;
+    for (i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if (sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->tObjectEventId == objectEventId)
+        {
+            return i;
+        }
+    }
+    return MAX_SPRITES;
+}
+
+void TurnObjectEvent(u8 objectEventId, u8 direction)
+{
+    u8 animNum;
+    u8 spriteId = GetObjectEventSpriteId(objectEventId);
+    if (spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+        StartSpriteAnim(sprite, ObjectEventDirectionToImageAnimId(direction));
+    }
+}
+
+void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction)
+{
+    u8 animNum;
+    int spriteId = GetObjectEventSpriteId(objectEventId);
+    u16 baseBlock;
+    if (spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+        const struct ObjectEventGraphicsInfo * info = GetObjectEventGraphicsInfo(direction);
+        baseBlock = sprite->oam.tileNum;
+        sprite->oam = *info->oam;
+        sprite->oam.tileNum = baseBlock;
+        sprite->oam.paletteNum = info->paletteSlot;
+        sprite->images = info->images;
+        if (info->subspriteTables == NULL)
+        {
+            sprite->subspriteTables = NULL;
+            sprite->subspriteTableNum = 0;
+            sprite->subspriteMode = SUBSPRITES_OFF;
+        }
+        else
+        {
+            SetSubspriteTables(sprite, info->subspriteTables);
+            sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
+        }
+        StartSpriteAnim(sprite, 0);
+    }
+}
+
+void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible)
+{
+    u8 spriteId = GetObjectEventSpriteId(objectEventId);
+    if (spriteId != MAX_SPRITES)
+    {
+        if (invisible)
+            gSprites[spriteId].tInvisible = TRUE;
+        else
+            gSprites[spriteId].tInvisible = FALSE;
+    }
+}
+
+bool32 RfuUnionObjectIsInvisible(u8 objectEventId)
+{
+    u8 spriteId = GetObjectEventSpriteId(objectEventId);
+    if (spriteId == MAX_SPRITES)
+        return FALSE;
+    return gSprites[spriteId].tInvisible == TRUE;
+}
+
+void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo)
+{
+    u8 spriteId = GetObjectEventSpriteId(objectEventId);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].tUnionRoomWarpAnimNo = animNo;
+        gSprites[spriteId].tUnionRoomWarpAnimState = 0;
+    }
+}
+
+static void DoObjectUnionRoomWarpYDisplacementUpwards(struct Sprite * sprite)
+{
+    switch (sprite->tUnionRoomWarpAnimState)
+    {
+    case 0:
+        sprite->pos2.y = 0;
+        sprite->tUnionRoomWarpAnimState++;
+        // fallthrough
+    case 1:
+        if ((sprite->pos2.y -= 8) == -160)
+        {
+            sprite->pos2.y = 0;
+            sprite->tInvisible = 1;
+            sprite->tUnionRoomWarpAnimNo = 0;
+            sprite->tUnionRoomWarpAnimState = 0;
+        }
+        break;
+    }
+}
+
+static void DoObjectUnionRoomWarpYDisplacementDownwards(struct Sprite * sprite)
+{
+    switch (sprite->tUnionRoomWarpAnimState)
+    {
+    case 0:
+        sprite->pos2.y = -160;
+        sprite->tUnionRoomWarpAnimState++;
+        // fallthrough
+    case 1:
+        if ((sprite->pos2.y += 8) == 0)
+        {
+            sprite->tUnionRoomWarpAnimNo = 0;
+            sprite->tUnionRoomWarpAnimState = 0;
+        }
+        break;
+    }
+}
+
+static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite)
+{
+    switch (sprite->tUnionRoomWarpAnimNo)
+    {
+    case 0:
+        break;
+    case 1:
+        DoObjectUnionRoomWarpYDisplacementDownwards(sprite);
+        break;
+    case 2:
+        DoObjectUnionRoomWarpYDisplacementUpwards(sprite);
+        break;
+    default:
+        sprite->tUnionRoomWarpAnimNo = 0;
+        AGB_ASSERT_EX(0, ABSPATH("evobjmv.c"), 13331);
+    }
+}
+
+bool32 RfuUnionObjectIsWarping(u8 objectEventId)
+{
+    u8 spriteId = GetObjectEventSpriteId(objectEventId);
+    if (spriteId == MAX_SPRITES)
+        return FALSE;
+    if (gSprites[spriteId].tUnionRoomWarpAnimNo)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+#undef tUnionRoomWarpAnimState
+#undef tUnionRoomWarpAnimNo
+#undef tInvisible
+#undef tZCoord
+#undef tObjectEventId
+
+u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct ObjectEvent * objectEvent)
+{
+    ObjectEventGetLocalIdAndMap(objectEvent, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    return FieldEffectStart(fieldEffectId);
+}
+
+void DoShadowFieldEffect(struct ObjectEvent *objectEvent)
+{
+    if (!objectEvent->hasShadow)
+    {
+        objectEvent->hasShadow = TRUE;
+        oe_exec_and_other_stuff(FLDEFF_SHADOW, objectEvent);
+    }
+}
+
+void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+{
+    const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
+    gFieldEffectArguments[0] = sprite->pos1.x;
+    gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2;
+    gFieldEffectArguments[2] = 151;
+    gFieldEffectArguments[3] = 3;
+    FieldEffectStart(FLDEFF_RIPPLE);
+}
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index e91642aa2..304b71c28 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -51,7 +51,7 @@ void sub_80695CC(u8 taskId)
         task->data[0] = 1;
     }
 
-    if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
+    if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].singleMovementActive)
     {
         FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         task->data[1] = 1;
@@ -78,7 +78,7 @@ void LockSelectedObjectEvent(void)
 
     FreezeObjectEventsExceptOne(gSelectedObjectEvent);
     taskId = CreateTask(sub_80695CC, 80);
-    if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
+    if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive)
     {
         FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         gTasks[taskId].data[1] = 1;
@@ -93,7 +93,7 @@ void sub_80696C0(void)
     UnfreezeObjectEvents();
 }
 
-void sub_80696F0(void)
+void UnionRoom_UnlockPlayerAndChatPartner(void)
 {
     u8 objectEventId;
     if (gObjectEvents[gSelectedObjectEvent].active)
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 0af5f462c..2e1dcd919 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -206,7 +206,7 @@ static void sub_807DDF0(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         task->data[0]++;
         break;
     case 1:
@@ -227,7 +227,7 @@ static void sub_807DDF0(u8 taskId)
     }
 }
 
-void sub_807DE58(void)
+void FieldCB_ReturnToFieldWirelessLink(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
@@ -632,7 +632,7 @@ static void sub_807E5EC(u8 taskId)
         break;
     case 2:
         WarpIntoMap();
-        SetMainCallback2(sub_8056788);
+        SetMainCallback2(CB2_ReturnToFieldCableClub);
         DestroyTask(taskId);
         break;
     }
@@ -662,7 +662,7 @@ static void sub_807E678(u8 taskId)
     case 1:
         if (!sub_807E40C() && BGMusicStopped())
         {
-            sub_800AAC0();
+            Link_TryStartSend5FFF();
             data[0]++;
         }
         break;
@@ -850,7 +850,7 @@ static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4)
     (*a4)++;
     playerSpr->pos2.x = *a2 >> 5;
     playerSpr->pos2.y = *a3 >> 5;
-    if (playerObj->mapobj_bit_7)
+    if (playerObj->heldMovementFinished)
     {
         ObjectEventForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
     }
diff --git a/src/field_specials.c b/src/field_specials.c
index 57bf53830..a1de82c0f 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -316,7 +316,7 @@ void Special_AnimatePcTurnOff()
 void SpawnCameraObject(void)
 {
     u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
-    gObjectEvents[objectEventId].mapobj_bit_13 = TRUE;
+    gObjectEvents[objectEventId].invisible = TRUE;
     CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
 }
 
@@ -876,22 +876,22 @@ void Special_GetElevatorFloor(void)
             break;
         }
     }
-    if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F))
+    if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(TRAINER_TOWER_1F))
     {
         switch (gSaveBlock1Ptr->warp2.mapNum)
         {
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF):
+        case MAP_NUM(TRAINER_TOWER_1F):
+        case MAP_NUM(TRAINER_TOWER_2F):
+        case MAP_NUM(TRAINER_TOWER_3F):
+        case MAP_NUM(TRAINER_TOWER_4F):
+        case MAP_NUM(TRAINER_TOWER_5F):
+        case MAP_NUM(TRAINER_TOWER_6F):
+        case MAP_NUM(TRAINER_TOWER_7F):
+        case MAP_NUM(TRAINER_TOWER_8F):
+        case MAP_NUM(TRAINER_TOWER_ROOF):
             floor = 15;
             break;
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY):
+        case MAP_NUM(TRAINER_TOWER_LOBBY):
             floor = 3;
             break;
         }
@@ -992,23 +992,23 @@ u16 Special_InitElevatorFloorSelectMenuPos(void)
             break;
         }
     }
-    if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F))
+    if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(TRAINER_TOWER_1F))
     {
         switch (gSaveBlock1Ptr->warp2.mapNum)
         {
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F):
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF):
+        case MAP_NUM(TRAINER_TOWER_1F):
+        case MAP_NUM(TRAINER_TOWER_2F):
+        case MAP_NUM(TRAINER_TOWER_3F):
+        case MAP_NUM(TRAINER_TOWER_4F):
+        case MAP_NUM(TRAINER_TOWER_5F):
+        case MAP_NUM(TRAINER_TOWER_6F):
+        case MAP_NUM(TRAINER_TOWER_7F):
+        case MAP_NUM(TRAINER_TOWER_8F):
+        case MAP_NUM(TRAINER_TOWER_ROOF):
             sElevatorScroll = 0;
             sElevatorCursorPos = 0;
             break;
-        case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY):
+        case MAP_NUM(TRAINER_TOWER_LOBBY):
             sElevatorScroll = 0;
             sElevatorCursorPos = 1;
             break;
@@ -1920,15 +1920,15 @@ u16 Special_BattleCardAction(void)
     switch (gSpecialVar_Result)
     {
     case 0:
-        return sub_81445C0(3);
+        return MEvent_GetBattleCardCount(3);
     case 1:
-        return sub_81445C0(4);
+        return MEvent_GetBattleCardCount(4);
     case 2:
-        return sub_81445C0(0);
+        return MEvent_GetBattleCardCount(0);
     case 3:
-        return sub_81445C0(1);
+        return MEvent_GetBattleCardCount(1);
     case 4:
-        return sub_81445C0(2);
+        return MEvent_GetBattleCardCount(2);
     default:
         AGB_ASSERT_EX(0, ABSPATH("scr_tool.c"), 3873);
         return 0;
@@ -2436,7 +2436,7 @@ bool8 Special_BadEggInParty(void)
 
 bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY))
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY))
         return FALSE;
     else
         return TRUE;
diff --git a/src/field_tasks.c b/src/field_tasks.c
index c64fb1924..cd72e111a 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -11,10 +11,13 @@
 #include "script.h"
 #include "sound.h"
 #include "task.h"
+#include "constants/field_tasks.h"
 #include "constants/flags.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
 
+// TODO: Metatile IDs in this file
+
 static void DummyPerStepCallback(u8 taskId);
 static void AshGrassPerStepCallback(u8 taskId);
 static void IcefallCaveIcePerStepCallback(u8 taskId);
@@ -22,14 +25,14 @@ static void CrackedFloorPerStepCallback(u8 taskId);
 
 static const TaskFunc sPerStepCallbacks[] =
 {
-    DummyPerStepCallback,
-    AshGrassPerStepCallback,
-    DummyPerStepCallback,
-    DummyPerStepCallback,
-    IcefallCaveIcePerStepCallback,
-    DummyPerStepCallback,
-    DummyPerStepCallback,
-    CrackedFloorPerStepCallback
+    [STEP_CB_DUMMY]             = DummyPerStepCallback,
+    [STEP_CB_ASH]               = AshGrassPerStepCallback,
+    [STEP_CB_FORTREE_BRIDGE]    = DummyPerStepCallback,
+    [STEP_CB_PACIFIDLOG_BRIDGE] = DummyPerStepCallback,
+    [STEP_CB_ICE]               = IcefallCaveIcePerStepCallback,
+    [STEP_CB_TRUCK]             = DummyPerStepCallback,
+    [STEP_CB_SECRET_BASE]       = DummyPerStepCallback,
+    [STEP_CB_CRACKED_FLOOR]     = CrackedFloorPerStepCallback
 };
 
 static const u8 sIcefallCaveIceTileCoords[][2] =
diff --git a/src/fieldmap.c b/src/fieldmap.c
index adb26f230..90682da10 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -16,7 +16,7 @@ struct ConnectionFlags
     u8 east:1;
 };
 
-void sub_8058A00(struct MapHeader *mapHeader);
+static void InitMapLayoutData(struct MapHeader *mapHeader);
 void map_copy_with_padding(u16 *map, u16 width, u16 height);
 void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader);
 void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset);
@@ -63,20 +63,20 @@ const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * conn
     return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
-void not_trainer_hill_battle_pyramid(void)
+void InitMap(void)
 {
-    sub_8058A00(&gMapHeader);
-    mapheader_run_script_with_tag_x1();
+    InitMapLayoutData(&gMapHeader);
+    RunOnLoadMapScript();
 }
 
-void sub_80589E8(void)
+void InitMapFromSavedGame(void)
 {
-    sub_8058A00(&gMapHeader);
+    InitMapLayoutData(&gMapHeader);
     LoadSavedMapView();
-    mapheader_run_script_with_tag_x1();
+    RunOnLoadMapScript();
 }
 
-void sub_8058A00(struct MapHeader * mapHeader)
+static void InitMapLayoutData(struct MapHeader * mapHeader)
 {
     const struct MapLayout * mapLayout = mapHeader->mapLayout;
     CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout));
@@ -490,7 +490,7 @@ void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatile)
     }
 }
 
-void sub_8059024(s32 x, s32 y, bool32 arg2)
+void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2)
 {
     if (x >= 0 && x < VMap.Xsize
         && y >= 0 && y < VMap.Ysize)
diff --git a/src/heal_location.c b/src/heal_location.c
index 89d9478c0..5c31e2df3 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -124,13 +124,13 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp)
 
     if (VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 1)
     {
-        if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
+        if (!gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId].spokeToOwner)
             VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0);
         gSpecialVar_LastTalked = 1;
         warp->x = 4;
         warp->y = 11;
-        warp->mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY);
-        warp->mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY);
+        warp->mapGroup = MAP_GROUP(TRAINER_TOWER_LOBBY);
+        warp->mapNum = MAP_NUM(TRAINER_TOWER_LOBBY);
         warp->warpId = 0xFF;
     }
     else
@@ -155,7 +155,7 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp)
             warp->x = 5;
             warp->y = 4;
         }
-        else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY))
+        else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(TRAINER_TOWER_LOBBY))
         {
             warp->x = 4;
             warp->y = 11;
diff --git a/src/help_system.c b/src/help_system.c
index 4a4d927c5..bb3135260 100644
--- a/src/help_system.c
+++ b/src/help_system.c
@@ -33,7 +33,7 @@ struct HelpSystemVideoState
 
 static EWRAM_DATA u8 sMapTilesBackup[BG_CHAR_SIZE] = {0};
 EWRAM_DATA u8 gUnknown_203F174 = 0;
-EWRAM_DATA u8 gUnknown_203F175 = 0;
+EWRAM_DATA bool8 gHelpSystemToggleWithRButtonDisabled = FALSE;
 static EWRAM_DATA u8 sDelayTimer = 0;
 static EWRAM_DATA u8 sInHelpSystem = 0;
 static EWRAM_DATA struct HelpSystemVideoState sVideoState = {0};
@@ -53,7 +53,7 @@ u8 RunHelpSystemCallback(void)
         sInHelpSystem = 0;
         if (gSaveBlock2Ptr->optionsButtonMode != OPTIONS_BUTTON_MODE_HELP)
             return 0;
-        if (JOY_NEW(R_BUTTON) && gUnknown_203F175 == 1)
+        if (JOY_NEW(R_BUTTON) && gHelpSystemToggleWithRButtonDisabled == TRUE)
             return 0;
         if (JOY_NEW(L_BUTTON | R_BUTTON))
         {
@@ -93,9 +93,9 @@ u8 RunHelpSystemCallback(void)
         HelpSystem_PrintText_Row61(gString_Help);
         sub_813BD14(1);
         if (sub_812B40C() == TRUE)
-            sub_812BC54(&gHelpSystemListMenu, gHelpSystemListMenuItems);
+            HelpSystemSubroutine_PrintWelcomeMessage(&gHelpSystemListMenu, gHelpSystemListMenuItems);
         else
-            sub_812BCA8(&gHelpSystemListMenu, gHelpSystemListMenuItems);
+            HelpSystemSubroutine_WelcomeEndGotoMenu(&gHelpSystemListMenu, gHelpSystemListMenuItems);
         sub_813BE78(1);
         sub_813BF50(1);
         CommitTilemap();
@@ -110,7 +110,7 @@ u8 RunHelpSystemCallback(void)
         sVideoState.state = 5;
         break;
     case 5:
-        if (!sub_812BB9C(&gHelpSystemListMenu, gHelpSystemListMenuItems))
+        if (!RunHelpMenuSubroutine(&gHelpSystemListMenu, gHelpSystemListMenuItems))
         {
             PlaySE(SE_HELP_CL);
             sVideoState.state = 6;
@@ -981,9 +981,9 @@ void HelpSystem_FillPanel1(void)
 void HelpSystem_InitListMenuController(struct HelpSystemListMenu * a0, u8 a1, u8 a2)
 {
     gHelpSystemListMenu.sub = a0->sub;
-    gHelpSystemListMenu.field_0C = a1;
-    gHelpSystemListMenu.field_0D = a2;
-    gHelpSystemListMenu.field_0E = 0;
+    gHelpSystemListMenu.itemsAbove = a1;
+    gHelpSystemListMenu.cursorPos = a2;
+    gHelpSystemListMenu.state = 0;
     if (gHelpSystemListMenu.sub.totalItems < gHelpSystemListMenu.sub.maxShowed)
         gHelpSystemListMenu.sub.maxShowed = gHelpSystemListMenu.sub.totalItems;
     sub_813BDA4(0);
@@ -1007,7 +1007,7 @@ s32 HelpSystem_GetMenuInput(void)
     else if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        return gHelpSystemListMenu.sub.items[gHelpSystemListMenu.field_0C + gHelpSystemListMenu.field_0D].index;
+        return gHelpSystemListMenu.sub.items[gHelpSystemListMenu.itemsAbove + gHelpSystemListMenu.cursorPos].index;
     }
     else if (JOY_NEW(B_BUTTON))
     {
@@ -1051,15 +1051,15 @@ void sub_813C75C(void)
     u8 r6 = gHelpSystemListMenu.sub.totalItems - 7;
     if (gHelpSystemListMenu.sub.totalItems > 7)
     {
-        s32 r4 = gHelpSystemListMenu.field_0C + gHelpSystemListMenu.field_0D;
+        s32 r4 = gHelpSystemListMenu.itemsAbove + gHelpSystemListMenu.cursorPos;
         sub_813C004(0, 0);
         if (r4 == 0)
             sub_813C004(1, 1);
-        else if (gHelpSystemListMenu.field_0C == 0 && gHelpSystemListMenu.field_0D != 0)
+        else if (gHelpSystemListMenu.itemsAbove == 0 && gHelpSystemListMenu.cursorPos != 0)
             sub_813C004(1, 1);
-        else if (gHelpSystemListMenu.field_0C == r6)
+        else if (gHelpSystemListMenu.itemsAbove == r6)
             sub_813C004(0, 1);
-        else if (gHelpSystemListMenu.field_0C != 0)
+        else if (gHelpSystemListMenu.itemsAbove != 0)
         {
             sub_813C004(0, 1);
             sub_813C004(1, 1);
@@ -1071,7 +1071,7 @@ void PrintListMenuItems(void)
 {
     u8 glyphHeight = GetFontAttribute(2, 1) + 1;
     s32 i;
-    s32 r5 = gHelpSystemListMenu.field_0C;
+    s32 r5 = gHelpSystemListMenu.itemsAbove;
 
     for (i = 0; i < gHelpSystemListMenu.sub.maxShowed; i++)
     {
@@ -1086,7 +1086,7 @@ void PlaceListMenuCursor(void)
 {
     u8 glyphHeight = GetFontAttribute(2, 1) + 1;
     u8 x = gHelpSystemListMenu.sub.left;
-    u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.field_0D;
+    u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos;
     HelpSystem_PrintTextAt(gFameCheckerText_ListMenuCursor, x, y);
 }
 
@@ -1107,24 +1107,24 @@ u8 TryMoveCursor1(u8 dirn)
             r4 = 0;
         else
             r4 = gHelpSystemListMenu.sub.maxShowed - (gHelpSystemListMenu.sub.maxShowed / 2 + (gHelpSystemListMenu.sub.maxShowed & 1)) - 1;
-        if (gHelpSystemListMenu.field_0C == 0)
+        if (gHelpSystemListMenu.itemsAbove == 0)
         {
-            if (gHelpSystemListMenu.field_0D != 0)
+            if (gHelpSystemListMenu.cursorPos != 0)
             {
-                gHelpSystemListMenu.field_0D--;
+                gHelpSystemListMenu.cursorPos--;
                 return 1;
             }
             else
                 return 0;
         }
-        if (gHelpSystemListMenu.field_0D > r4)
+        if (gHelpSystemListMenu.cursorPos > r4)
         {
-            gHelpSystemListMenu.field_0D--;
+            gHelpSystemListMenu.cursorPos--;
             return 1;
         }
         else
         {
-            gHelpSystemListMenu.field_0C--;
+            gHelpSystemListMenu.itemsAbove--;
             return 2;
         }
     }
@@ -1134,24 +1134,24 @@ u8 TryMoveCursor1(u8 dirn)
             r4 = 0;
         else
             r4 = gHelpSystemListMenu.sub.maxShowed / 2 + (gHelpSystemListMenu.sub.maxShowed & 1);
-        if (gHelpSystemListMenu.field_0C == gHelpSystemListMenu.sub.totalItems - gHelpSystemListMenu.sub.maxShowed)
+        if (gHelpSystemListMenu.itemsAbove == gHelpSystemListMenu.sub.totalItems - gHelpSystemListMenu.sub.maxShowed)
         {
-            if (gHelpSystemListMenu.field_0D < gHelpSystemListMenu.sub.maxShowed - 1)
+            if (gHelpSystemListMenu.cursorPos < gHelpSystemListMenu.sub.maxShowed - 1)
             {
-                gHelpSystemListMenu.field_0D++;
+                gHelpSystemListMenu.cursorPos++;
                 return 1;
             }
             else
                 return 0;
         }
-        else if (gHelpSystemListMenu.field_0D < r4)
+        else if (gHelpSystemListMenu.cursorPos < r4)
         {
-            gHelpSystemListMenu.field_0D++;
+            gHelpSystemListMenu.cursorPos++;
             return 1;
         }
         else
         {
-            gHelpSystemListMenu.field_0C++;
+            gHelpSystemListMenu.itemsAbove++;
             return 2;
         }
     }
@@ -1159,7 +1159,7 @@ u8 TryMoveCursor1(u8 dirn)
 
 bool8 MoveCursor(u8 by, u8 dirn)
 {
-    u8 r7 = gHelpSystemListMenu.field_0D;
+    u8 r7 = gHelpSystemListMenu.cursorPos;
     u8 flags = 0;
     s32 i;
     for (i = 0; i < by; i++)
@@ -1172,14 +1172,14 @@ bool8 MoveCursor(u8 by, u8 dirn)
         // neither changed
         return TRUE;
     case 1:
-        // changed field_0D only
+        // changed cursorPos only
         sub_813C860(r7);
         PlaceListMenuCursor();
         CommitTilemap();
         break;
     case 2:
     case 3:
-        // changed field_0C
+        // changed itemsAbove
         if (sub_812BF88() == TRUE)
         {
             HelpSystem_SetInputDelay(2);
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index df892152a..5b634a273 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -19,22 +19,22 @@
 static EWRAM_DATA u16 sSomeVariable = 0;
 static EWRAM_DATA u8 gUnknown_203B0EE = 0;
 
-u8 gUnknown_3005E9C[4];
+u8 sHelpSystemState[4];
 u16 gSomeVariableBackup;
 
 static bool32 IsCurrentMapInArray(const u16 * mapIdxs);
-static void sub_812B520(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-static void sub_812B614(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-static bool8 sub_812B754(void);
-static bool8 sub_812B780(u8);
-static bool8 sub_812BB10(void);
-
-static void sub_812BF5C(void);
-static void sub_812BF74(const u8 *);
-static void sub_812BF94(struct HelpSystemListMenu * a0);
-static void sub_812BF9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
-
-static const u8 *const gUnknown_845B080[] = {
+static void BuildMainTopicsListAndMoveToH00(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
+static void SetHelpSystemSubmenuItems(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
+static bool8 HelpSystem_HasDefeatedBrock(void);
+static bool8 HelpSystemSubmenuIndexIsActive(u8);
+static bool8 HasGottenAtLeastOneHM(void);
+
+static void PrintWelcomeMessageOnPanel1(void);
+static void PrintTextOnPanel2Row52RightAlign(const u8 *);
+static void ResetHelpSystemCursor(struct HelpSystemListMenu * a0);
+static void PrintHelpSystemTopicMouseoverDescription(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
+
+static const u8 *const sHelpSystemTopicPtrs[] = {
     gUnknown_81B2DF8,
     gUnknown_81B2E1C,
     gUnknown_81B2E2E,
@@ -43,7 +43,7 @@ static const u8 *const gUnknown_845B080[] = {
     gUnknown_81B2E6A
 };
 
-static const u8 *const gUnknown_845B098[] = {
+static const u8 *const sHelpSystemTopicMouseoverDescriptionPtrs[] = {
     gUnknown_81B2E88,
     gUnknown_81B2EC8,
     gUnknown_81B2F00,
@@ -52,7 +52,7 @@ static const u8 *const gUnknown_845B098[] = {
     gUnknown_81B2FA9
 };
 
-static const u8 *const gUnknown_845B0B0[] = {
+static const u8 *const sHelpSystemSpecializedQuestionTextPtrs[] = {
     NULL,
     gUnknown_81B3083,
     gUnknown_81B30A9,
@@ -100,7 +100,7 @@ static const u8 *const gUnknown_845B0B0[] = {
     gUnknown_81B3516
 };
 
-static const u8 *const gUnknown_845B164[] = {
+static const u8 *const sHelpSystemSpecializedAnswerTextPtrs[] = {
     NULL,
     gUnknown_81B3525,
     gUnknown_81B35E6,
@@ -148,7 +148,7 @@ static const u8 *const gUnknown_845B164[] = {
     gUnknown_81B55F4
 };
 
-static const u8 *const gUnknown_845B218[] = {
+static const u8 *const sHelpSystemMenuTopicTextPtrs[] = {
     NULL,
     gUnknown_81B56E3,
     gUnknown_81B56F4,
@@ -200,7 +200,7 @@ static const u8 *const gUnknown_845B218[] = {
     gUnknown_81B5A37
 };
 
-static const u8 *const gUnknown_845B2DC[] = {
+static const u8 *const sHelpSystemSpecializedControlsTextPtrs[] = {
     NULL,
     gUnknown_81B5A4D,
     gUnknown_81B5B0C,
@@ -252,7 +252,7 @@ static const u8 *const gUnknown_845B2DC[] = {
     gUnknown_81B7C57
 };
 
-static const u8 *const gUnknown_845B3A0[] = {
+static const u8 *const sHelpSystemSpecializedStringsTextPtrs[] = {
     NULL,
     gUnknown_81B7CC1,
     gUnknown_81B7CC4,
@@ -299,7 +299,7 @@ static const u8 *const gUnknown_845B3A0[] = {
     gUnknown_81B7E0F
 };
 
-static const u8 *const gUnknown_845B450[] = {
+static const u8 *const sHelpSystemSpecializedStringDefinitionsTextPtrs[] = {
     NULL,
     gUnknown_81B7E16,
     gUnknown_81B7F0A,
@@ -346,7 +346,7 @@ static const u8 *const gUnknown_845B450[] = {
     gUnknown_81B9B2F
 };
 
-static const u8 *const gUnknown_845B500[] = {
+static const u8 *const sHelpSystemGeneralTopicTextPtrs[] = {
     NULL,
     gUnknown_81B9BB7,
     gUnknown_81B9BC7,
@@ -357,7 +357,7 @@ static const u8 *const gUnknown_845B500[] = {
     gUnknown_81B9C1D
 };
 
-static const u8 *const gUnknown_845B520[] = {
+static const u8 *const sHelpSystemGeneralTopicDescriptionTextPtrs[] = {
     NULL,
     gUnknown_81B9C2F,
     gUnknown_81B9D04,
@@ -368,7 +368,7 @@ static const u8 *const gUnknown_845B520[] = {
     gUnknown_81BA027
 };
 
-static const u8 *const gUnknown_845B540[] = {
+static const u8 *const sHelpSystemTypeMatchupTextPtrs[] = {
     NULL,
     gUnknown_81BA0F1,
     gUnknown_81BA10D,
@@ -407,7 +407,7 @@ static const u8 *const gUnknown_845B540[] = {
     gUnknown_81BA400
 };
 
-static const u8 *const gUnknown_845B5D0[] = {
+static const u8 *const sHelpSystemTypeMatchupDescriptionTextPtrs[] = {
     NULL,
     gUnknown_81BA416,
     gUnknown_81BA4E6,
@@ -446,7 +446,6 @@ static const u8 *const gUnknown_845B5D0[] = {
     gUnknown_81BB156
 };
 
-
 static const u8 gUnknown_845B660[] = {
     0x01, 0x02, 0x03, 0xff
 };
@@ -739,7 +738,7 @@ static const u8 gUnknown_845B9BE[] = {
     0x09, 0x01, 0x02, 0x03, 0x23, 0x25, 0x24, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x27, 0x15, 0x26, 0x16, 0x17, 0x18, 0x1a, 0x0e, 0x1b, 0xff
 };
 
-static const u8 *const gUnknown_845B9E0[] = {
+static const u8 *const sHelpSystemSubmenuIndexPointers[] = {
     NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, gUnknown_845B660, NULL,
     NULL, NULL, NULL, gUnknown_845B664, NULL,
@@ -780,48 +779,48 @@ static const u8 *const gUnknown_845B9E0[] = {
 
 static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unk_845BCB0.bin");
 
-static const u8 gUnknown_845C4B0[] = {
+static const u8 sHelpSystemContextTopicOrder[] = {
     3, 0, 1, 2, 4, 5
 };
 
-static const u8 gUnknown_845C4B6[][6] = {
-    {0, 0, 0, 0, 0, 1},
-    {0, 0, 0, 1, 0, 1},
-    {0, 0, 0, 1, 0, 1},
-    {0, 1, 0, 1, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {0, 0, 1, 0, 0, 1},
-    {0, 0, 1, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {0, 1, 1, 0, 0, 1},
-    {1, 0, 0, 1, 0, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 1, 0, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 0, 1, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 0, 0, 1},
-    {1, 1, 1, 0, 1, 1},
-    {1, 1, 1, 0, 1, 1},
-    {1, 1, 1, 0, 1, 1},
-    {1, 1, 1, 0, 1, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 1, 0, 0, 0, 1},
-    {0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0}
+static const bool8 sHelpSystemContextTopicFlags[][6] = {
+    {FALSE, FALSE, FALSE, FALSE, FALSE, TRUE },
+    {FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE },
+    {FALSE, FALSE, FALSE, TRUE,  FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, TRUE,  FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, FALSE, TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, FALSE, TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  FALSE, FALSE, TRUE,  FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  TRUE,  FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, TRUE,  TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, FALSE, TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, TRUE,  TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, TRUE,  TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, TRUE,  TRUE },
+    {TRUE,  TRUE,  TRUE,  FALSE, TRUE,  TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, TRUE,  FALSE, FALSE, FALSE, TRUE },
+    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE},
+    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}
 };
 
 static const u16 sMartMaps[] = {
@@ -961,12 +960,12 @@ static bool8 IsInDungeonMap(void)
 
 void sub_812B35C(void)
 {
-    sub_812B4B8();
+    HelpSystem_EnableToggleWithRButton();
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         HelpSystem_SetSomeVariable2(0x16);
     else if (IsInDungeonMap())
         HelpSystem_SetSomeVariable2(0x15);
-    else if (is_light_level_8_or_9(gMapHeader.mapType))
+    else if (IsMapTypeIndoors(gMapHeader.mapType))
     {
         if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F)))
             HelpSystem_SetSomeVariable2(0x0E);
@@ -1015,126 +1014,126 @@ void HelpSystem_Enable(void)
     if (gQuestLogState != 2 && gQuestLogState != 3)
     {
         gHelpSystemEnabled = TRUE;
-        sub_812B4B8();
+        HelpSystem_EnableToggleWithRButton();
     }
 }
 
-void sub_812B4AC(void)
+void HelpSystem_DisableToggleWithRButton(void)
 {
-    gUnknown_203F175 = 1;
+    gHelpSystemToggleWithRButtonDisabled = TRUE;
 }
 
-void sub_812B4B8(void)
+void HelpSystem_EnableToggleWithRButton(void)
 {
-    gUnknown_203F175 = 0;
+    gHelpSystemToggleWithRButtonDisabled = FALSE;
 }
 
-static void sub_812B4C4(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void ResetHelpSystemListMenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    a0->sub.items = a1;
-    a0->sub.totalItems = 1;
-    a0->sub.maxShowed = 1;
-    a0->sub.left = 1;
-    a0->sub.top = 4;
+    helpListMenu->sub.items = listMenuItemsBuffer;
+    helpListMenu->sub.totalItems = 1;
+    helpListMenu->sub.maxShowed = 1;
+    helpListMenu->sub.left = 1;
+    helpListMenu->sub.top = 4;
 }
 
-static void sub_812B4D8(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void BuildAndPrintMainTopicsListMenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    sub_812B4C4(a0, a1);
-    sub_812B520(a0, a1);
-    sub_812BF74(gUnknown_841DFAC);
-    HelpSystem_InitListMenuController(a0, 0, gUnknown_3005E9C[2]);
-    sub_812BF9C(a0, a1);
+    ResetHelpSystemListMenu(helpListMenu, listMenuItemsBuffer);
+    BuildMainTopicsListAndMoveToH00(helpListMenu, listMenuItemsBuffer);
+    PrintTextOnPanel2Row52RightAlign(gUnknown_841DFAC);
+    HelpSystem_InitListMenuController(helpListMenu, 0, sHelpSystemState[2]);
+    PrintHelpSystemTopicMouseoverDescription(helpListMenu, listMenuItemsBuffer);
     sub_813BDA4(1);
     sub_813BD5C(1);
 }
 
-static void sub_812B520(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void BuildMainTopicsListAndMoveToH00(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     u8 i;
-    u8 r4 = 0;
+    u8 totalItems = 0;
     for (i = 0; i < 6; i++)
     {
-        if (gUnknown_845C4B6[sSomeVariable][gUnknown_845C4B0[i]] == 1)
+        if (sHelpSystemContextTopicFlags[sSomeVariable][sHelpSystemContextTopicOrder[i]] == TRUE)
         {
-            a1[r4].label = gUnknown_845B080[gUnknown_845C4B0[i]];
-            a1[r4].index = gUnknown_845C4B0[i];
-            r4++;
+            listMenuItemsBuffer[totalItems].label = sHelpSystemTopicPtrs[sHelpSystemContextTopicOrder[i]];
+            listMenuItemsBuffer[totalItems].index = sHelpSystemContextTopicOrder[i];
+            totalItems++;
         }
     }
-    a1[r4 - 1].index = -2;
-    a0->sub.totalItems = r4;
-    a0->sub.maxShowed = r4;
-    a0->sub.left = 0;
+    listMenuItemsBuffer[totalItems - 1].index = -2;
+    helpListMenu->sub.totalItems = totalItems;
+    helpListMenu->sub.maxShowed = totalItems;
+    helpListMenu->sub.left = 0;
 }
 
-static void sub_812B5A8(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void BuildAndPrintSubmenuList(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     sub_813BDE8(0);
     sub_813BFC0(0);
     sub_813BE78(1);
-    sub_812B4C4(a0, a1);
-    sub_812B614(a0, a1);
-    sub_812BF74(gUnknown_841DFC9);
-    HelpSystem_InitListMenuController(a0, a0->field_0C, a0->field_0D);
-    HelpSystem_PrintTextAt(gUnknown_845B080[gUnknown_3005E9C[1]], 0, 0);
+    ResetHelpSystemListMenu(helpListMenu, listMenuItemsBuffer);
+    SetHelpSystemSubmenuItems(helpListMenu, listMenuItemsBuffer);
+    PrintTextOnPanel2Row52RightAlign(gUnknown_841DFC9);
+    HelpSystem_InitListMenuController(helpListMenu, helpListMenu->itemsAbove, helpListMenu->cursorPos);
+    HelpSystem_PrintTextAt(sHelpSystemTopicPtrs[sHelpSystemState[1]], 0, 0);
     sub_813BDA4(1);
     sub_813BD5C(1);
 }
 
-static void sub_812B614(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void SetHelpSystemSubmenuItems(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    u8 r6 = 0;
-    const u8 * r3 = gUnknown_845B9E0[sSomeVariable * 5 + gUnknown_3005E9C[1]];
+    u8 totalItems = 0;
+    const u8 * indexPtr = sHelpSystemSubmenuIndexPointers[sSomeVariable * 5 + sHelpSystemState[1]];
     u8 i;
-    for (i = 0; r3[i] != 0xFF; i++)
+    for (i = 0; indexPtr[i] != 0xFF; i++)
     {
-        if (sub_812B780(r3[i]) == TRUE)
+        if (HelpSystemSubmenuIndexIsActive(indexPtr[i]) == TRUE)
         {
-            if (gUnknown_3005E9C[1] == 0)
-                a1[r6].label = gUnknown_845B0B0[r3[i]];
-            else if (gUnknown_3005E9C[1] == 1)
-                a1[r6].label = gUnknown_845B218[r3[i]];
-            else if (gUnknown_3005E9C[1] == 2)
-                a1[r6].label = gUnknown_845B3A0[r3[i]];
-            else if (gUnknown_3005E9C[1] == 3)
-                a1[r6].label = gUnknown_845B500[r3[i]];
+            if (sHelpSystemState[1] == 0)
+                listMenuItemsBuffer[totalItems].label = sHelpSystemSpecializedQuestionTextPtrs[indexPtr[i]];
+            else if (sHelpSystemState[1] == 1)
+                listMenuItemsBuffer[totalItems].label = sHelpSystemMenuTopicTextPtrs[indexPtr[i]];
+            else if (sHelpSystemState[1] == 2)
+                listMenuItemsBuffer[totalItems].label = sHelpSystemSpecializedStringsTextPtrs[indexPtr[i]];
+            else if (sHelpSystemState[1] == 3)
+                listMenuItemsBuffer[totalItems].label = sHelpSystemGeneralTopicTextPtrs[indexPtr[i]];
             else
-                a1[r6].label = gUnknown_845B540[r3[i]];
-            a1[r6].index = r3[i];
-            r6++;
+                listMenuItemsBuffer[totalItems].label = sHelpSystemTypeMatchupTextPtrs[indexPtr[i]];
+            listMenuItemsBuffer[totalItems].index = indexPtr[i];
+            totalItems++;
         }
     }
-    if (sub_812B754() == TRUE)
+    if (HelpSystem_HasDefeatedBrock() == TRUE)
     {
-        for (i = 0, r3 = gUnknown_845B9BE; r3[i] != 0xFF; i++)
+        for (i = 0, indexPtr = gUnknown_845B9BE; indexPtr[i] != 0xFF; i++)
         {
-            a1[r6].label = gUnknown_845B3A0[r3[i]];
-            a1[r6].index = r3[i];
-            r6++;
+            listMenuItemsBuffer[totalItems].label = sHelpSystemSpecializedStringsTextPtrs[indexPtr[i]];
+            listMenuItemsBuffer[totalItems].index = indexPtr[i];
+            totalItems++;
         }
     }
-    a1[r6].label = gUnknown_81B2E6F;
-    a1[r6].index = -2;
-    r6++;
-    a0->sub.totalItems = r6;
-    a0->sub.maxShowed = 7;
-    a0->sub.left = 0;
-    a0->sub.top = 21;
+    listMenuItemsBuffer[totalItems].label = gUnknown_81B2E6F;
+    listMenuItemsBuffer[totalItems].index = -2;
+    totalItems++;
+    helpListMenu->sub.totalItems = totalItems;
+    helpListMenu->sub.maxShowed = 7;
+    helpListMenu->sub.left = 0;
+    helpListMenu->sub.top = 21;
 }
 
-static bool8 sub_812B754(void)
+static bool8 HelpSystem_HasDefeatedBrock(void)
 {
-    if (FlagGet(FLAG_DEFEATED_BROCK) == TRUE && gUnknown_3005E9C[1] == 2)
+    if (FlagGet(FLAG_DEFEATED_BROCK) == TRUE && sHelpSystemState[1] == 2)
         return TRUE;
     return FALSE;
 }
 
-static bool8 sub_812B780(u8 id)
+static bool8 HelpSystemSubmenuIndexIsActive(u8 id)
 {
     u8 i = 0;
 
-    if (gUnknown_3005E9C[1] == 0)
+    if (sHelpSystemState[1] == 0)
     {
         switch (id)
         {
@@ -1188,7 +1187,7 @@ static bool8 sub_812B780(u8 id)
             return FlagGet(FLAG_BADGE01_GET);
         case 28:
         case 40:
-            return sub_812BB10();
+            return HasGottenAtLeastOneHM();
         case 39:
             return FlagGet(FLAG_GOT_FAME_CHECKER);
         case 44:
@@ -1196,7 +1195,7 @@ static bool8 sub_812B780(u8 id)
         }
         return FALSE;
     }
-    if (gUnknown_3005E9C[1] == 1)
+    if (sHelpSystemState[1] == 1)
     {
         switch (id)
         {
@@ -1254,7 +1253,7 @@ static bool8 sub_812B780(u8 id)
             return FlagGet(FLAG_BADGE01_GET);
         case 16:
         case 17:
-            return sub_812BB10();
+            return HasGottenAtLeastOneHM();
         case 18:
             return FlagGet(FLAG_GOT_BICYCLE);
         case 48:
@@ -1262,9 +1261,9 @@ static bool8 sub_812B780(u8 id)
         }
         return FALSE;
     }
-    if (gUnknown_3005E9C[1] == 2)
+    if (sHelpSystemState[1] == 2)
     {
-        if (sub_812B754() == TRUE)
+        if (HelpSystem_HasDefeatedBrock() == TRUE)
         {
             for (i = 0; gUnknown_845B9BE[i] != 0xFF; i++)
             {
@@ -1311,7 +1310,7 @@ static bool8 sub_812B780(u8 id)
             return FlagGet(FLAG_SYS_POKEMON_GET);
         case 36:
         case 37:
-            return sub_812BB10();
+            return HasGottenAtLeastOneHM();
         case 3:
         case 15:
         case 18:
@@ -1320,7 +1319,7 @@ static bool8 sub_812B780(u8 id)
         }
         return TRUE;
     }
-    if (gUnknown_3005E9C[1] == 3)
+    if (sHelpSystemState[1] == 3)
     {
         switch (id)
         {
@@ -1331,7 +1330,7 @@ static bool8 sub_812B780(u8 id)
         }
         return TRUE;
     }
-    if (gUnknown_3005E9C[1] == 4)
+    if (sHelpSystemState[1] == 4)
     {
         return TRUE;
     }
@@ -1339,7 +1338,7 @@ static bool8 sub_812B780(u8 id)
     return FALSE;
 }
 
-static bool8 sub_812BB10(void)
+static bool8 HasGottenAtLeastOneHM(void)
 {
     if (FlagGet(FLAG_GOT_HM01) == TRUE)
         return TRUE;
@@ -1358,64 +1357,64 @@ static bool8 sub_812BB10(void)
     return FALSE;
 }
 
-bool8 sub_812BB9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 RunHelpMenuSubroutine(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    switch (a0->field_0E)
+    switch (helpListMenu->state)
     {
     case  8:
-        return sub_812BC54(a0, a1);
+        return HelpSystemSubroutine_PrintWelcomeMessage(helpListMenu, listMenuItemsBuffer);
     case  9:
-        return sub_812BC80(a0, a1);
+        return HelpSystemSubroutine_WelcomeWaitButton(helpListMenu, listMenuItemsBuffer);
     case 10:
-        return sub_812BCA8(a0, a1);
+        return HelpSystemSubroutine_WelcomeEndGotoMenu(helpListMenu, listMenuItemsBuffer);
     case  0:
-        return sub_812BCD0(a0, a1);
+        return HelpSystemSubroutine_MenuInputHandlerMain(helpListMenu, listMenuItemsBuffer);
     case  1:
-        return sub_812BD2C(a0, a1);
+        return HelpMenuSubroutine_InitSubmenu(helpListMenu, listMenuItemsBuffer);
     case  2:
-        return sub_812BD64(a0, a1);
+        return HelpMenuSubroutine_ReturnFromSubmenu(helpListMenu, listMenuItemsBuffer);
     case  3:
-        return sub_812BD98(a0, a1);
+        return HelpMenuSubroutine_SubmenuInputHandler(helpListMenu, listMenuItemsBuffer);
     case  4:
-        return sub_812BE10(a0, a1);
+        return HelpMenuSubroutine_HelpItemPrint(helpListMenu, listMenuItemsBuffer);
     case  5:
-        return sub_812BEEC(a0, a1);
+        return HelpMenuSubroutine_ReturnFromHelpItem(helpListMenu, listMenuItemsBuffer);
     case  6:
-        return sub_812BF18(a0, a1);
+        return HelpMenuSubroutine_HelpItemWaitButton(helpListMenu, listMenuItemsBuffer);
     }
     return FALSE;
 }
 
-bool8 sub_812BC54(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpSystemSubroutine_PrintWelcomeMessage(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    sub_812BF74(gUnknown_841DFA5);
-    sub_812BF5C();
+    PrintTextOnPanel2Row52RightAlign(gUnknown_841DFA5);
+    PrintWelcomeMessageOnPanel1();
     sub_813BDA4(1);
     sub_813BD5C(1);
-    a0->field_0E = 9;
+    helpListMenu->state = 9;
     return TRUE;
 }
 
-bool8 sub_812BC80(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpSystemSubroutine_WelcomeWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        a0->field_0E = 10;
+        helpListMenu->state = 10;
     }
     return TRUE;
 }
 
-bool8 sub_812BCA8(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpSystemSubroutine_WelcomeEndGotoMenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    gUnknown_3005E9C[2] = 0;
-    sub_812BF94(a0);
-    sub_812B4D8(a0, a1);
-    a0->field_0E = 0;
+    sHelpSystemState[2] = 0;
+    ResetHelpSystemCursor(helpListMenu);
+    BuildAndPrintMainTopicsListMenu(helpListMenu, listMenuItemsBuffer);
+    helpListMenu->state = 0;
     return TRUE;
 }
 
-bool8 sub_812BCD0(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpSystemSubroutine_MenuInputHandlerMain(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     s32 v0 = HelpSystem_GetMenuInput();
     switch (v0)
@@ -1425,42 +1424,42 @@ bool8 sub_812BCD0(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
         return FALSE;
     case -5:
     case -4:
-        sub_812BF9C(a0, a1);
+        PrintHelpSystemTopicMouseoverDescription(helpListMenu, listMenuItemsBuffer);
         break;
     case -3:
     case -1:
         break;
     default:
-        gUnknown_3005E9C[1] = v0;
-        a0->field_0E = 1;
+        sHelpSystemState[1] = v0;
+        helpListMenu->state = 1;
         break;
     }
     return TRUE;
 }
 
-bool8 sub_812BD2C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_InitSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    gUnknown_3005E9C[0] = 1;
-    gUnknown_3005E9C[2] = a0->field_0D;
-    sub_812BF94(a0);
-    sub_812B5A8(a0, a1);
+    sHelpSystemState[0] = 1;
+    sHelpSystemState[2] = helpListMenu->cursorPos;
+    ResetHelpSystemCursor(helpListMenu);
+    BuildAndPrintSubmenuList(helpListMenu, listMenuItemsBuffer);
     sub_813C75C();
     HelpSystem_SetInputDelay(2);
-    a0->field_0E = 3;
+    helpListMenu->state = 3;
     return TRUE;
 }
 
-bool8 sub_812BD64(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_ReturnFromSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     sub_813C004(0, 0);
     sub_813C004(1, 0);
-    gUnknown_3005E9C[0] = 0;
-    sub_812B4D8(a0, a1);
-    a0->field_0E = 0;
+    sHelpSystemState[0] = 0;
+    BuildAndPrintMainTopicsListMenu(helpListMenu, listMenuItemsBuffer);
+    helpListMenu->state = 0;
     return TRUE;
 }
 
-bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_SubmenuInputHandler(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     s32 v0 = HelpSystem_GetMenuInput();
     switch (v0)
@@ -1468,7 +1467,7 @@ bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
     case -6:
         return FALSE;
     case -2:
-        a0->field_0E = 2;
+        helpListMenu->state = 2;
         break;
     case -5:
     case -4:
@@ -1476,8 +1475,8 @@ bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
     case -1:
         break;
     default:
-        gUnknown_3005E9C[3] = v0;
-        a0->field_0E = 4;
+        sHelpSystemState[3] = v0;
+        helpListMenu->state = 4;
         break;
     }
     return TRUE;
@@ -1485,60 +1484,60 @@ bool8 sub_812BD98(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
 
 void sub_812BDEC(void)
 {
-    HelpSystem_PrintTextAt(gUnknown_845B080[gUnknown_3005E9C[1]], 0, 0);
+    HelpSystem_PrintTextAt(sHelpSystemTopicPtrs[sHelpSystemState[1]], 0, 0);
 }
 
-bool8 sub_812BE10(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_HelpItemPrint(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    gUnknown_3005E9C[0] = 2;
+    sHelpSystemState[0] = 2;
     sub_813BDA4(0);
     HelpSystem_FillPanel1();
-    sub_812BF74(gUnknown_841DFBE);
+    PrintTextOnPanel2Row52RightAlign(gUnknown_841DFBE);
     sub_813BDE8(1);
     sub_813BEE4(1);
 
-    if (gUnknown_3005E9C[1] == 0)
+    if (sHelpSystemState[1] == 0)
     {
-        HelpSystem_PrintTwoStrings(gUnknown_845B0B0[gUnknown_3005E9C[3]], gUnknown_845B164[gUnknown_3005E9C[3]]);
+        HelpSystem_PrintTwoStrings(sHelpSystemSpecializedQuestionTextPtrs[sHelpSystemState[3]], sHelpSystemSpecializedAnswerTextPtrs[sHelpSystemState[3]]);
     }
-    else if (gUnknown_3005E9C[1] == 1)
+    else if (sHelpSystemState[1] == 1)
     {
-        HelpSystem_PrintTwoStrings(gUnknown_845B218[gUnknown_3005E9C[3]], gUnknown_845B2DC[gUnknown_3005E9C[3]]);
+        HelpSystem_PrintTwoStrings(sHelpSystemMenuTopicTextPtrs[sHelpSystemState[3]], sHelpSystemSpecializedControlsTextPtrs[sHelpSystemState[3]]);
     }
-    else if (gUnknown_3005E9C[1] == 2)
+    else if (sHelpSystemState[1] == 2)
     {
-        HelpSystem_PrintTwoStrings(gUnknown_845B3A0[gUnknown_3005E9C[3]], gUnknown_845B450[gUnknown_3005E9C[3]]);
+        HelpSystem_PrintTwoStrings(sHelpSystemSpecializedStringsTextPtrs[sHelpSystemState[3]], sHelpSystemSpecializedStringDefinitionsTextPtrs[sHelpSystemState[3]]);
     }
-    else if (gUnknown_3005E9C[1] == 3)
+    else if (sHelpSystemState[1] == 3)
     {
-        HelpSystem_PrintTwoStrings(gUnknown_845B500[gUnknown_3005E9C[3]], gUnknown_845B520[gUnknown_3005E9C[3]]);
+        HelpSystem_PrintTwoStrings(sHelpSystemGeneralTopicTextPtrs[sHelpSystemState[3]], sHelpSystemGeneralTopicDescriptionTextPtrs[sHelpSystemState[3]]);
     }
     else
     {
-        HelpSystem_PrintTwoStrings(gUnknown_845B540[gUnknown_3005E9C[3]], gUnknown_845B5D0[gUnknown_3005E9C[3]]);
+        HelpSystem_PrintTwoStrings(sHelpSystemTypeMatchupTextPtrs[sHelpSystemState[3]], sHelpSystemTypeMatchupDescriptionTextPtrs[sHelpSystemState[3]]);
     }
     sub_813BDA4(1);
     sub_813BD5C(1);
-    a0->field_0E = 6;
+    helpListMenu->state = 6;
     return TRUE;
 }
 
-bool8 sub_812BEEC(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_ReturnFromHelpItem(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    gUnknown_3005E9C[0] = 1;
-    sub_812B5A8(a0, a1);
+    sHelpSystemState[0] = 1;
+    BuildAndPrintSubmenuList(helpListMenu, listMenuItemsBuffer);
     sub_813C75C();
     HelpSystem_SetInputDelay(2);
-    a0->field_0E = 3;
+    helpListMenu->state = 3;
     return TRUE;
 }
 
-bool8 sub_812BF18(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+bool8 HelpMenuSubroutine_HelpItemWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
     if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        a0->field_0E = 5;
+        helpListMenu->state = 5;
         return TRUE;
     }
     if (JOY_NEW(L_BUTTON | R_BUTTON))
@@ -1546,13 +1545,13 @@ bool8 sub_812BF18(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
     return TRUE;
 }
 
-static void sub_812BF5C(void)
+static void PrintWelcomeMessageOnPanel1(void)
 {
     HelpSystem_FillPanel1();
     HelpSystem_PrintTextAt(gUnknown_81B2FC9, 0, 0);
 }
 
-static void sub_812BF74(const u8 * str)
+static void PrintTextOnPanel2Row52RightAlign(const u8 * str)
 {
     HelpSystem_FillPanel2();
     HelpSystem_PrintTextRightAlign_Row52(str);
@@ -1560,21 +1559,21 @@ static void sub_812BF74(const u8 * str)
 
 u8 sub_812BF88(void)
 {
-    return gUnknown_3005E9C[0];
+    return sHelpSystemState[0];
 }
 
-static void sub_812BF94(struct HelpSystemListMenu * a0)
+static void ResetHelpSystemCursor(struct HelpSystemListMenu * helpListMenu)
 {
-    a0->field_0C = 0;
-    a0->field_0D = 0;
+    helpListMenu->itemsAbove = 0;
+    helpListMenu->cursorPos = 0;
 }
 
-static void sub_812BF9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1)
+static void PrintHelpSystemTopicMouseoverDescription(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer)
 {
-    s32 index = a1[a0->field_0C + a0->field_0D].index;
+    s32 index = listMenuItemsBuffer[helpListMenu->itemsAbove + helpListMenu->cursorPos].index;
     if (index == -2)
-        HelpSystem_PrintText_813C584(gUnknown_845B098[5]);
+        HelpSystem_PrintText_813C584(sHelpSystemTopicMouseoverDescriptionPtrs[5]);
     else
-        HelpSystem_PrintText_813C584(gUnknown_845B098[index]);
+        HelpSystem_PrintText_813C584(sHelpSystemTopicMouseoverDescriptionPtrs[index]);
     sub_813BE30(1);
 }
diff --git a/src/intro.c b/src/intro.c
index cee1c8fec..837d4f905 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1431,7 +1431,7 @@ static void sub_80EDB70(struct IntroSequenceData * this)
 {
     this->field_0018->pos1.x += this->field_0018->pos2.x;
     this->field_0018->pos1.y += this->field_0018->pos2.y;
-    sub_8007FFC(this->field_0018, 0, 0x2A);
+    obj_pos2_update_enable(this->field_0018, 0, 0x2A);
     this->field_0018->callback = SpriteCallbackDummy;
     StartSpriteAffineAnim(this->field_0018, 1);
 }
@@ -1448,7 +1448,7 @@ static void sub_80EDBAC(struct IntroSequenceData * this)
     {
         StartSpriteAffineAnim(this->field_0028[i], 1);
         this->field_0028[i]->callback = nullsub_83;
-        sub_8007FFC(this->field_0028[i], gUnknown_840BBB8[i][0], gUnknown_840BBB8[i][1]);
+        obj_pos2_update_enable(this->field_0028[i], gUnknown_840BBB8[i][0], gUnknown_840BBB8[i][1]);
     }
 }
 
diff --git a/src/learn_move.c b/src/learn_move.c
index e22922528..8a2f5781b 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -309,7 +309,7 @@ static void MoveRelearnerLoadBgGfx(void)
         FillBgTilemapBufferRect(0, 0x000, 0, 0, 30, 20, 0xF);
         SetBgTilemapBuffer(1, sMoveRelearner->bg1TilemapBuffer);
         TextWindow_SetUserSelectedFrame(0, 1, 0xE0);
-        sub_8107D38(0xD0, 1);
+        ListMenuLoadStdPalAt(0xD0, 1);
         LoadPalette(gUnknown_8E97DDC, 0x00, 0x20);
         DecompressAndLoadBgGfxUsingHeap(1, gUnknown_8E97DFC, 0, 0, 0);
         CopyToBgTilemapBuffer(1, gUnknown_8E97EC4, 0, 0);
diff --git a/src/librfu_intr.c b/src/librfu_intr.c
new file mode 100644
index 000000000..23962a937
--- /dev/null
+++ b/src/librfu_intr.c
@@ -0,0 +1,402 @@
+#include "global.h"
+#include "librfu.h"
+
+static void sio32intr_clock_master(void);
+static void sio32intr_clock_slave(void);
+static u16 handshake_wait(u16 slot);
+static void STWI_set_timer_in_RAM(u8 count);
+static void STWI_stop_timer_in_RAM(void);
+static void STWI_init_slave(void);
+static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)());
+static void Callback_Dummy_S(u16 reqCommandId, void (*callbackS)(u16));
+static void Callback_Dummy_ID(void (*callbackId)(void));
+
+void IntrSIO32(void)
+{
+    if (gSTWIStatus->state == 10)
+    {
+        if (gSTWIStatus->callbackID != NULL)
+            Callback_Dummy_ID(gSTWIStatus->callbackID);
+    }
+    else
+    {
+        if (gSTWIStatus->msMode == AGB_CLK_MASTER)
+            sio32intr_clock_master();
+        else
+            sio32intr_clock_slave();
+    }
+}
+
+static void sio32intr_clock_master(void)
+{
+    u32 regSIODATA32;
+    u32 ackLen;
+
+    STWI_set_timer_in_RAM(80);
+    regSIODATA32 = REG_SIODATA32;
+
+    if (gSTWIStatus->state == 0) // master send req
+    {
+        if (regSIODATA32 == 0x80000000)
+        {
+            if (gSTWIStatus->reqNext <= gSTWIStatus->reqLength)
+            {
+                REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket->rfuPacket8.data)[gSTWIStatus->reqNext];
+                gSTWIStatus->reqNext++;
+            }
+            else
+            {
+                gSTWIStatus->state = 1; // master wait ack
+                REG_SIODATA32 = 0x80000000;
+            }
+        }
+        else
+        {
+            STWI_stop_timer_in_RAM();
+            STWI_set_timer_in_RAM(130);
+            return;
+        }
+    }
+    else if (gSTWIStatus->state == 1) // master wait ack
+    {
+        if ((regSIODATA32 & 0xFFFF0000) == 0x99660000)
+        {
+            gSTWIStatus->ackNext = 0;
+            ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
+            gSTWIStatus->ackNext++;
+            gSTWIStatus->ackActiveCommand = regSIODATA32;
+            gSTWIStatus->ackLength = ackLen = regSIODATA32 >> 8;
+            if ((ackLen = gSTWIStatus->ackLength) >= gSTWIStatus->ackNext)
+            {
+                gSTWIStatus->state = 2; // master receive ack
+                REG_SIODATA32 = 0x80000000;
+            }
+            else
+            {
+                gSTWIStatus->state = 3; // master done ack
+            }
+        }
+        else
+        {
+            STWI_stop_timer_in_RAM();
+            STWI_set_timer_in_RAM(130);
+            return;
+        }
+    }
+    else if (gSTWIStatus->state == 2) // master receive ack
+    {
+        ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32;
+        gSTWIStatus->ackNext++;
+        if (gSTWIStatus->ackLength < gSTWIStatus->ackNext)
+            gSTWIStatus->state = 3; // master done ack
+        else
+            REG_SIODATA32 = 0x80000000;
+    }
+
+    if (handshake_wait(1) == 1)
+        return;
+
+    REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS | SIO_MULTI_SD;
+
+    if (handshake_wait(0) == 1)
+        return;
+
+    STWI_stop_timer_in_RAM();
+
+    if (gSTWIStatus->state == 3) // master done ack
+    {
+        if (
+            gSTWIStatus->ackActiveCommand == (0x80 | ID_MS_CHANGE_REQ)
+         || gSTWIStatus->ackActiveCommand == (0x80 | ID_DATA_TX_AND_CHANGE_REQ)
+         || gSTWIStatus->ackActiveCommand == (0x80 | ID_UNK35_REQ)
+         || gSTWIStatus->ackActiveCommand == (0x80 | ID_RESUME_RETRANSMIT_AND_CHANGE_REQ)
+        )
+        {
+
+            gSTWIStatus->msMode = AGB_CLK_SLAVE;
+            REG_SIODATA32 = 0x80000000;
+            REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS;
+            REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS | SIO_ENABLE;
+            gSTWIStatus->state = 5; // slave receive req init
+        }
+        else
+        {
+            if (gSTWIStatus->ackActiveCommand == 0xEE)
+            {
+                REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
+                gSTWIStatus->state = 4; // error
+                gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION;
+            }
+            else
+            {
+                REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
+                gSTWIStatus->state = 4; // error
+            }
+        }
+        gSTWIStatus->sending = 0;
+        if (gSTWIStatus->callbackM != NULL)
+            Callback_Dummy_M(gSTWIStatus->reqActiveCommand, gSTWIStatus->error, gSTWIStatus->callbackM);
+    }
+    else
+    {
+        REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
+        REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS | SIO_ENABLE;
+    }
+}
+
+static void sio32intr_clock_slave(void)
+{
+    u32 regSIODATA32;
+    u32 r0;
+    register u32 reqLen asm("r2");
+
+    gSTWIStatus->timerActive = 0;
+    STWI_set_timer_in_RAM(100);
+    if (handshake_wait(0) == 1)
+        return;
+    REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS | SIO_MULTI_SD;
+    regSIODATA32 = REG_SIODATA32;
+    if (gSTWIStatus->state == 5) // slave receive req init
+    {
+        ((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32;
+        gSTWIStatus->reqNext = 1;
+        r0 = 0x99660000;
+        if ((regSIODATA32 >> 16) == (r0 >> 16))
+        {
+            gSTWIStatus->reqLength = reqLen = regSIODATA32 >> 8;
+            gSTWIStatus->reqActiveCommand = regSIODATA32;
+            if (gSTWIStatus->reqLength == 0)
+            {
+                if (
+                    gSTWIStatus->reqActiveCommand == ID_MS_CHANGE_REQ
+                 || gSTWIStatus->reqActiveCommand == ID_DATA_READY_AND_CHANGE_REQ
+                 || gSTWIStatus->reqActiveCommand == ID_DISCONNECTED_AND_CHANGE_REQ
+                 || gSTWIStatus->reqActiveCommand == ID_UNK36_REQ
+                )
+                {
+                    gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80;
+                    ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 + gSTWIStatus->ackActiveCommand;
+                    gSTWIStatus->ackLength = 0;
+                }
+                else
+                {
+                    ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE;
+                    if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D)
+                    {
+                        ((u32*)gSTWIStatus->txPacket)[1] = 1;
+                    }
+                    else
+                    {
+                        ((u32*)gSTWIStatus->txPacket)[1] = 2;
+                    }
+                    gSTWIStatus->ackLength = 1;
+                    gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION;
+                }
+                REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0];
+                gSTWIStatus->ackNext = 1;
+                gSTWIStatus->state = 7; // slave send ack
+            }
+            else
+            {
+                REG_SIODATA32 = 0x80000000;
+                gSTWIStatus->reqNext = 1;
+                gSTWIStatus->state = 6; // slave receive req
+            }
+        }
+        else
+        {
+            STWI_stop_timer_in_RAM();
+            STWI_set_timer_in_RAM(100);
+            return;
+        }
+    }
+    else if (gSTWIStatus->state == 6) // slave receive req
+    {
+        ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->reqNext] = regSIODATA32;
+        gSTWIStatus->reqNext++;
+        if (gSTWIStatus->reqLength < gSTWIStatus->reqNext)
+        {
+            if (
+                gSTWIStatus->reqActiveCommand == ID_DATA_READY_AND_CHANGE_REQ
+             || gSTWIStatus->reqActiveCommand == ID_DISCONNECTED_AND_CHANGE_REQ
+             || gSTWIStatus->reqActiveCommand == ID_UNK36_REQ
+            )
+            {
+                gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80;
+                ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 | gSTWIStatus->ackActiveCommand;
+                gSTWIStatus->ackLength = 0;
+            }
+            else
+            {
+                ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE;
+                if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D)
+                {
+                    ((u32*)gSTWIStatus->txPacket)[1] = 1;
+                }
+                else
+                {
+                    ((u32*)gSTWIStatus->txPacket)[1] = 2;
+                }
+                gSTWIStatus->ackLength = 1;
+                gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION;
+            }
+            REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0];
+            gSTWIStatus->ackNext = 1;
+            gSTWIStatus->state = 7; // slave send ack
+        }
+        else
+        {
+            REG_SIODATA32 = 0x80000000;
+        }
+    }
+    else if (gSTWIStatus->state == 7) // slave send ack
+    {
+        if (regSIODATA32 == 0x80000000)
+        {
+            if (gSTWIStatus->ackLength < gSTWIStatus->ackNext)
+            {
+                gSTWIStatus->state = 8; // slave done ack
+            }
+            else
+            {
+                REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[gSTWIStatus->ackNext];
+                gSTWIStatus->ackNext++;
+            }
+        }
+        else
+        {
+            STWI_stop_timer_in_RAM();
+            STWI_set_timer_in_RAM(100);
+            return;
+        }
+    }
+    if (handshake_wait(1) == 1)
+        return;
+    if (gSTWIStatus->state == 8) // slave done ack
+    {
+        REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS;
+        STWI_stop_timer_in_RAM();
+        if (gSTWIStatus->error == ERR_REQ_CMD_ACK_REJECTION)
+        {
+            STWI_init_slave();
+            if (gSTWIStatus->callbackS != NULL)
+            {
+                Callback_Dummy_S(0x1EE, gSTWIStatus->callbackS);
+            }
+        }
+        else
+        {
+            REG_SIODATA32 = 0;
+            REG_SIOCNT = 0;
+            REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
+            gSTWIStatus->msMode = AGB_CLK_MASTER;
+            gSTWIStatus->state = 0; // master send req
+            if (gSTWIStatus->callbackS != NULL)
+            {
+                Callback_Dummy_S((gSTWIStatus->reqLength << 8) | (gSTWIStatus->reqActiveCommand), gSTWIStatus->callbackS);
+            }
+        }
+    }
+    else
+    {
+        REG_IME = 0;
+        if (REG_TM0CNT_H & TIMER_ENABLE)
+        {
+            if ((REG_TM0CNT_H & 0x03) == TIMER_1CLK)
+            {
+                while (REG_TM0CNT_L > 0xFF9B);
+            }
+            else
+            {
+                while (REG_TM0CNT_L > 0xFFFE);
+            }
+        }
+        REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS;
+        REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS | SIO_ENABLE;
+        REG_IME = 1;
+    }
+}
+
+static u16 handshake_wait(u16 slot)
+{
+    do
+    {
+        if ((gSTWIStatus->timerActive & 0xFF) == 1)
+        {
+            gSTWIStatus->timerActive = 0;
+            return 1;
+        }
+    } while ((REG_SIOCNT & SIO_MULTI_SI) != (slot << SIO_MULTI_SI_SHIFT));
+    return 0;
+}
+
+static void STWI_set_timer_in_RAM(u8 count)
+{
+    vu16* regTMCNTL = (vu16*)(REG_ADDR_TMCNT_L + gSTWIStatus->timerSelect * 4);
+    vu16* regTMCNTH = (vu16*)(REG_ADDR_TMCNT_H + gSTWIStatus->timerSelect * 4);
+    REG_IME = 0;
+    switch (count)
+    {
+    case 50:
+        *regTMCNTL = 0xFCCB;
+        gSTWIStatus->timerState = 1;
+        break;
+    case 80:
+        *regTMCNTL = 0xFAE0;
+        gSTWIStatus->timerState = 2;
+        break;
+    case 100:
+        *regTMCNTL = 0xF996;
+        gSTWIStatus->timerState = 3;
+        break;
+    case 130:
+        *regTMCNTL = 0xF7AD;
+        gSTWIStatus->timerState = 4;
+        break;
+    }
+    *regTMCNTH = TIMER_ENABLE | TIMER_64CLK | TIMER_256CLK | TIMER_INTR_ENABLE;
+    REG_IF = INTR_FLAG_TIMER0 << gSTWIStatus->timerSelect;
+    REG_IME = 1;
+}
+
+static void STWI_stop_timer_in_RAM(void)
+{
+    gSTWIStatus->timerState = 0;
+    REG_TMCNT_L(gSTWIStatus->timerSelect) = 0;
+    REG_TMCNT_H(gSTWIStatus->timerSelect) = 0;
+}
+
+static void STWI_init_slave(void)
+{
+    gSTWIStatus->state = 5; // slave receive req init
+    gSTWIStatus->msMode = AGB_CLK_SLAVE;
+    gSTWIStatus->reqLength = 0;
+    gSTWIStatus->reqNext = 0;
+    gSTWIStatus->reqActiveCommand = 0;
+    gSTWIStatus->ackLength = 0;
+    gSTWIStatus->ackNext = 0;
+    gSTWIStatus->ackActiveCommand = 0;
+    gSTWIStatus->timerState = 0;
+    gSTWIStatus->timerActive = 0;
+    gSTWIStatus->error = 0;
+    gSTWIStatus->recoveryCount = 0;
+    REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_57600_BPS | SIO_ENABLE;
+}
+
+NAKED
+static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)())
+{
+    asm("bx r2");
+}
+
+NAKED
+static void Callback_Dummy_S(u16 reqCommandId, void (*callbackS)(u16))
+{
+    asm("bx r1");
+}
+
+NAKED
+static void Callback_Dummy_ID(void (*callbackId)(void))
+{
+    asm("bx r0");
+}
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index dccd342f2..582060f78 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -2,54 +2,54 @@
 
 struct LLSFStruct
 {
-    u8 unk00;
-    u8 unk01;
-    u8 unk02;
-    u8 unk03;
-    u8 unk04;
-    u8 unk05;
-    u8 unk06;
-    u8 unk07;
-    u8 unk08;
-    u8 unk09;
-    u8 unk0A;
-    u8 unk0B;
-    u8 unk0C;
-    u16 unk0E;
+    u8 frameSize;
+    u8 recvFirstShift;
+    u8 connSlotFlagShift;
+    u8 slotStateShift;
+    u8 ackShift;
+    u8 phaseShit;
+    u8 nShift;
+    u8 recvFirstMask;
+    u8 connSlotFlagMask;
+    u8 slotStateMask;
+    u8 ackMask;
+    u8 phaseMask;
+    u8 nMask;
+    u16 framesMask;
 };
 
 struct RfuLocalStruct
 {
-    u8 unk00;
-    u8 unk01;
-    u8 unk02;
-    u8 unk03;
-    u8 unk04;
-    u8 unk05;
-    u16 unk06;
+    u8 recvFirst;
+    u8 connSlotFlag;
+    u8 slotState;
+    u8 ack;
+    u8 phase;
+    u8 n;
+    u16 frame;
 };
 
-static void rfu_CB_defaultCallback(u8, u16);
-static void rfu_CB_reset(u8, u16);
-static void rfu_CB_configGameData(u8, u16);
-static void rfu_CB_stopMode(u8, u16);
-static void rfu_CB_startSearchChild(u8, u16);
-static void rfu_CB_pollAndEndSearchChild(u8, u16);
-static void rfu_CB_startSearchParent(u8, u16);
-static void rfu_CB_pollSearchParent(u8, u16);
-static void rfu_CB_pollConnectParent(u8, u16);
-static void rfu_CB_pollConnectParent(u8, u16);
-static void rfu_CB_disconnect(u8, u16);
-static void rfu_CB_CHILD_pollConnectRecovery(u8, u16);
-static void rfu_CB_sendData(UNUSED u8, u16);
-static void rfu_CB_sendData2(UNUSED u8, u16);
-static void rfu_CB_sendData3(u8, u16);
-static void rfu_CB_recvData(u8, u16);
-static void rfu_enableREQCallback(bool8);
+static void rfu_CB_defaultCallback(u8 reqCommand, u16 reqResult);
+static void rfu_CB_reset(u8 reqCommand, u16 reqResult);
+static void rfu_CB_configGameData(u8 reqCommand, u16 reqResult);
+static void rfu_CB_stopMode(u8 reqCommand, u16 reqResult);
+static void rfu_CB_startSearchChild(u8 reqCommand, u16 reqResult);
+static void rfu_CB_pollAndEndSearchChild(u8 reqCommand, u16 reqResult);
+static void rfu_CB_startSearchParent(u8 reqCommand, u16 reqResult);
+static void rfu_CB_pollSearchParent(u8 reqCommand, u16 reqResult);
+static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult);
+static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult);
+static void rfu_CB_disconnect(u8 reqCommand, u16 reqResult);
+static void rfu_CB_CHILD_pollConnectRecovery(u8 reqCommand, u16 reqResult);
+static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult);
+static void rfu_CB_sendData2(UNUSED u8 reqCommand, u16 reqResult);
+static void rfu_CB_sendData3(u8 reqCommand, u16 reqResult);
+static void rfu_CB_recvData(u8 reqCommand, u16 reqResult);
+static void rfu_enableREQCallback(bool8 enable);
 static void rfu_STC_clearAPIVariables(void);
 static void rfu_STC_readChildList(void);
 static void rfu_STC_readParentCandidateList(void);
-static void rfu_STC_REQ_callback(u8, u16);
+static void rfu_STC_REQ_callback(u8 reqCommand, u16 reqResult);
 static void rfu_STC_removeLinkData(u8, u8);
 static void rfu_STC_fastCopy(const u8 **, u8 **, s32);
 static void rfu_STC_clearLinkStatus(u8);
@@ -74,63 +74,94 @@ struct RfuStatic *gRfuStatic;
 struct RfuFixed *gRfuFixed;
 
 static const struct LLSFStruct llsf_struct[2] = {
-  {
-    2, 14, 0, 10, 9, 5, 7, 2,
-    0, 15, 1, 3, 3, 0x1f
-  }, {
-    3, 22, 18, 14, 13, 9, 11, 3,
-    15, 15, 1, 3, 3, 0x7f
-  }
+    [MODE_CHILD] = {
+        .frameSize = 2,
+        .recvFirstShift = 14,
+        .connSlotFlagShift = 0,
+        .slotStateShift = 10,
+        .ackShift = 9,
+        .phaseShit = 5,
+        .nShift = 7,
+        .recvFirstMask = 2,
+        .connSlotFlagMask = 0,
+        .slotStateMask = 15,
+        .ackMask = 1,
+        .phaseMask = 3,
+        .nMask = 3,
+        .framesMask = 0x1f
+    },
+    [MODE_PARENT] = {
+        .frameSize = 3,
+        .recvFirstShift = 22,
+        .connSlotFlagShift = 18,
+        .slotStateShift = 14,
+        .ackShift = 13,
+        .phaseShit = 9,
+        .nShift = 11,
+        .recvFirstMask = 3,
+        .connSlotFlagMask = 15,
+        .slotStateMask = 15,
+        .ackMask = 1,
+        .phaseMask = 3,
+        .nMask = 3,
+        .framesMask = 0x7f
+    }
 };
 
-#ifdef EMERALD
-static const char lib_ver[] = "RFU_V1026";
-#else
-static const char lib_ver[] = "RFU_V1024";
-#endif
+#define xstr(s) str(s)
+#define str(s) #s
+const char version_string[] = "RFU_V" xstr(LIBRFU_VERSION);
 
 static const char str_checkMbootLL[] = "RFU-MBOOT";
 
-u16 rfu_initializeAPI(struct RfuAPIBuffer *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p, bool8 copyInterruptToRam)
+#define COPY(src, dst, iterator, size) do {         \
+    const u16 *_src = (const u16 *)(src);           \
+    u16 *_dst = (u16 *)(dst);                       \
+    (iterator) = (size);                            \
+    while ((iterator)-- != 0)                       \
+        *_dst++ = *_src++;                          \
+} while (0)
+
+u16 rfu_initializeAPI(u32 *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p, bool8 copyInterruptToRam)
 {
     u16 i;
     u16 *dst;
     const u16 *src;
-    u16 r3;
+    u16 buffByteSizeMax;
 
-    // is in EWRAM? 
-    if (((u32)APIBuffer & 0xF000000) == 0x2000000 && copyInterruptToRam)
+    // is in EWRAM?
+    if (((uintptr_t)APIBuffer & 0xF000000) == 0x2000000 && copyInterruptToRam)
         return ERR_RFU_API_BUFF_ADR;
-    // is not 4-byte aligned? 
+    // is not 4-byte aligned?
     if ((u32)APIBuffer & 3)
         return ERR_RFU_API_BUFF_ADR;
     if (copyInterruptToRam)
     {
         // An assert/debug print may have existed before, ie
         // printf("%s %u < %u", "somefile.c:12345", buffByteSize, num)
-        // to push this into r3?
-        r3 = sizeof(struct RfuAPIBuffer);
-        if (buffByteSize < r3)
+        // to push this into buffByteSizeMax?
+        buffByteSizeMax = RFU_API_BUFF_SIZE_RAM;
+        if (buffByteSize < buffByteSizeMax)
             return ERR_RFU_API_BUFF_SIZE;
     }
     if (!copyInterruptToRam)
     {
-        r3 = 0x504; // same issue as above
-        if (buffByteSize < r3)
+        buffByteSizeMax = RFU_API_BUFF_SIZE_ROM; // same issue as above
+        if (buffByteSize < buffByteSizeMax)
             return ERR_RFU_API_BUFF_SIZE;
     }
-    gRfuLinkStatus = &APIBuffer->linkStatus;
-    gRfuStatic = &APIBuffer->static_;
-    gRfuFixed = &APIBuffer->fixed;
-    gRfuSlotStatusNI[0] = &APIBuffer->NI[0];
-    gRfuSlotStatusUNI[0] = &APIBuffer->UNI[0];
+    gRfuLinkStatus = (void *)APIBuffer + 0;
+    gRfuStatic = (void *)APIBuffer + 0xb4; // + sizeof(*gRfuLinkStatus)
+    gRfuFixed = (void *)APIBuffer + 0xdc; // + sizeof(*gRfuStatic)
+    gRfuSlotStatusNI[0] = (void *)APIBuffer + 0x1bc; // + sizeof(*gRfuFixed)
+    gRfuSlotStatusUNI[0] = (void *)APIBuffer + 0x37c; // + sizeof(*gRfuSlotStatusNI[0])
     for (i = 1; i < RFU_CHILD_MAX; ++i)
     {
         gRfuSlotStatusNI[i] = &gRfuSlotStatusNI[i - 1][1];
         gRfuSlotStatusUNI[i] = &gRfuSlotStatusUNI[i - 1][1];
     }
-    // TODO: Is it possible to fix the following 2 statements? 
-    // It's equivalent to: 
+    // TODO: Is it possible to fix the following 2 statements?
+    // It's equivalent to:
     // gRfuFixed->STWIBuffer = &APIBuffer->intr;
     // STWI_init_all(&APIBuffer->intr, sioIntrTable_p, copyInterruptToRam);
     gRfuFixed->STWIBuffer = (struct RfuIntrStruct *)&gRfuSlotStatusUNI[3][1];
@@ -143,11 +174,21 @@ u16 rfu_initializeAPI(struct RfuAPIBuffer *APIBuffer, u16 buffByteSize, IntrFunc
         gRfuSlotStatusUNI[i]->recvBuffer = NULL;
         gRfuSlotStatusUNI[i]->recvBufferSize = 0;
     }
-    src = (const u16 *)((u32)&rfu_STC_fastCopy & ~1);
-    dst = gRfuFixed->fastCopyBuffer;
     // rfu_REQ_changeMasterSlave is the function next to rfu_STC_fastCopy
-    for (r3 = ((void *)rfu_REQ_changeMasterSlave - (void *)rfu_STC_fastCopy) / sizeof(u16), --r3; r3 != 0xFFFF; --r3)
+#if LIBRFU_VERSION < 1026
+    src = (const u16 *)((uintptr_t)&rfu_STC_fastCopy & ~1);
+    dst = gRfuFixed->fastCopyBuffer;
+    buffByteSizeMax = ((void *)rfu_REQ_changeMasterSlave - (void *)rfu_STC_fastCopy) / sizeof(u16);
+    while (buffByteSizeMax-- != 0)
         *dst++ = *src++;
+#else
+    COPY(
+        (uintptr_t)&rfu_STC_fastCopy & ~1,
+        gRfuFixed->fastCopyBuffer,
+        buffByteSizeMax,
+        0x60 / sizeof(u16)
+        );
+#endif
     gRfuFixed->fastCopyPtr = (void *)gRfuFixed->fastCopyBuffer + 1;
     return 0;
 }
@@ -155,19 +196,19 @@ u16 rfu_initializeAPI(struct RfuAPIBuffer *APIBuffer, u16 buffByteSize, IntrFunc
 static void rfu_STC_clearAPIVariables(void)
 {
     u16 IMEBackup = REG_IME;
-    u8 i, r4;
+    u8 i, flags;
 
     REG_IME = 0;
-    r4 = gRfuStatic->flags;
+    flags = gRfuStatic->flags;
     CpuFill16(0, gRfuStatic, sizeof(struct RfuStatic));
-    gRfuStatic->flags = r4 & 8;
+    gRfuStatic->flags = flags & 8;
     CpuFill16(0, gRfuLinkStatus, sizeof(struct RfuLinkStatus));
     gRfuLinkStatus->watchInterval = 4;
     gRfuStatic->nowWatchInterval = 0;
     gRfuLinkStatus->parentChild = MODE_NEUTRAL;
     rfu_clearAllSlot();
     gRfuStatic->SCStartFlag = 0;
-    for (i = 0; i < NELEMS(gRfuStatic->cidBak); ++i)
+    for (i = 0; i < RFU_CHILD_MAX; ++i)
         gRfuStatic->cidBak[i] = 0;
     REG_IME = IMEBackup;
 }
@@ -180,20 +221,20 @@ void rfu_REQ_PARENT_resumeRetransmitAndChange(void)
 
 u16 rfu_UNI_PARENT_getDRAC_ACK(u8 *ackFlag)
 {
-    struct RfuIntrStruct *buf;
+    u8 *buf;
 
     *ackFlag = 0;
     if (gRfuLinkStatus->parentChild != MODE_PARENT)
         return ERR_MODE_NOT_PARENT;
     buf = rfu_getSTWIRecvBuffer();
-    switch (buf->rxPacketAlloc.rfuPacket8.data[0])
+    switch (*buf)
     {
     case 40:
     case 54:
-        if (buf->rxPacketAlloc.rfuPacket8.data[1] == 0)
+        if (buf[1] == 0)
             *ackFlag = gRfuLinkStatus->connSlotFlag;
         else
-            *ackFlag = buf->rxPacketAlloc.rfuPacket8.data[4];
+            *ackFlag = buf[4];
         return 0;
     default:
         return ERR_REQ_CMD_ID;
@@ -205,9 +246,9 @@ void rfu_setTimerInterrupt(u8 timerNo, IntrFunc *timerIntrTable_p)
     STWI_init_timer(timerIntrTable_p, timerNo);
 }
 
-struct RfuIntrStruct *rfu_getSTWIRecvBuffer(void)
+u8 *rfu_getSTWIRecvBuffer(void)
 {
-    return gRfuFixed->STWIBuffer;
+    return (u8 *)gRfuFixed->STWIBuffer;
 }
 
 void rfu_setMSCCallback(void (*callback)(u16 reqCommandId))
@@ -229,26 +270,26 @@ static void rfu_enableREQCallback(bool8 enable)
         gRfuStatic->flags &= 0xF7;
 }
 
-static void rfu_STC_REQ_callback(u8 r5, u16 reqResult)
+static void rfu_STC_REQ_callback(u8 reqCommand, u16 reqResult)
 {
     STWI_set_Callback_M(rfu_CB_defaultCallback);
     gRfuStatic->reqResult = reqResult;
     if (gRfuStatic->flags & 8)
-        gRfuFixed->reqCallback(r5, reqResult);
+        gRfuFixed->reqCallback(reqCommand, reqResult);
 }
 
-static void rfu_CB_defaultCallback(u8 r0, u16 reqResult)
+static void rfu_CB_defaultCallback(u8 reqCommand, u16 reqResult)
 {
-    s32 r5;
+    s32 bmSlotFlags;
     u8 i;
 
-    if (r0 == 0xFF)
+    if (reqCommand == ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ)
     {
         if (gRfuStatic->flags & 8)
-            gRfuFixed->reqCallback(r0, reqResult);
-        r5 = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
+            gRfuFixed->reqCallback(reqCommand, reqResult);
+        bmSlotFlags = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
         for (i = 0; i < RFU_CHILD_MAX; ++i)
-            if ((r5 >> i) & 1)
+            if ((bmSlotFlags >> i) & 1)
                 rfu_STC_removeLinkData(i, 1);
         gRfuLinkStatus->parentChild = MODE_NEUTRAL;
     }
@@ -277,25 +318,39 @@ u16 rfu_getRFUStatus(u8 *rfuState)
     return 0;
 }
 
+/*
+ * RFU Multiboot images are loaded into IWRAM
+ * struct RfuMbootLL
+ * {
+ *   struct RfuLinkStatus status;
+ *   u8 filler_B4[0x3C];
+ *   char name[10];
+ *   u16 checksum;
+ * }
+ * Returns 1 if the packet to inherit is malformed.
+ */
 u16 rfu_MBOOT_CHILD_inheritanceLinkStatus(void)
 {
     const char *s1 = str_checkMbootLL;
     char *s2 = (char *)0x30000F0;
     u16 checksum;
-    u16 *r2;
+    u16 *mb_buff_iwram_p;
     u8 i;
 
+    // if (strcmp(s1, s2) != 0) return 1;
     while (*s1 != '\0')
         if (*s1++ != *s2++)
             return 1;
-    r2 = (u16 *)0x3000000;
+    mb_buff_iwram_p = (u16 *)0x3000000;
+
+    // The size of struct RfuLinkStatus is 180
     checksum = 0;
-    for (i = 0; i < 90; ++i)
-        checksum += *r2++;
+    for (i = 0; i < 180/2; ++i)
+        checksum += *mb_buff_iwram_p++;
     if (checksum != *(u16 *)0x30000FA)
         return 1;
     CpuCopy16((u16 *)0x3000000, gRfuLinkStatus, sizeof(struct RfuLinkStatus));
-    gRfuStatic->flags |= 0x80;
+    gRfuStatic->flags |= 0x80; // mboot
     return 0;
 }
 
@@ -305,14 +360,14 @@ void rfu_REQ_stopMode(void)
 
     if (REG_IME == 0)
     {
-        rfu_STC_REQ_callback(61, 6);
+        rfu_STC_REQ_callback(ID_STOP_MODE_REQ, 6);
         gSTWIStatus->error = ERR_REQ_CMD_IME_DISABLE;
     }
     else
     {
         AgbRFU_SoftReset();
         rfu_STC_clearAPIVariables();
-        if (AgbRFU_checkID(8) == 0x8001)
+        if (AgbRFU_checkID(8) == RFU_ID)
         {
             timerReg = &REG_TMCNT(gSTWIStatus->timerSelect);
             *timerReg = 0;
@@ -326,29 +381,29 @@ void rfu_REQ_stopMode(void)
         else
         {
             REG_SIOCNT = SIO_MULTI_MODE;
-            rfu_STC_REQ_callback(61, 0);
+            rfu_STC_REQ_callback(ID_STOP_MODE_REQ, 0);
         }
     }
 }
 
-static void rfu_CB_stopMode(u8 a1, u16 reqResult)
+static void rfu_CB_stopMode(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
         REG_SIOCNT = SIO_MULTI_MODE;
-    rfu_STC_REQ_callback(a1, reqResult);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 u32 rfu_REQBN_softReset_and_checkID(void)
 {
-    u32 r2;
+    u32 id;
 
     if (REG_IME == 0)
         return ERR_ID_CHECK_IME_DISABLE;
     AgbRFU_SoftReset();
     rfu_STC_clearAPIVariables();
-    if ((r2 = AgbRFU_checkID(30)) == 0)
+    if ((id = AgbRFU_checkID(30)) == 0)
         REG_SIOCNT = SIO_MULTI_MODE;
-    return r2;
+    return id;
 }
 
 void rfu_REQ_reset(void)
@@ -357,11 +412,11 @@ void rfu_REQ_reset(void)
     STWI_send_ResetREQ();
 }
 
-static void rfu_CB_reset(u8 a1, u16 reqResult)
+static void rfu_CB_reset(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
         rfu_STC_clearAPIVariables();
-    rfu_STC_REQ_callback(a1, reqResult);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 void rfu_REQ_configSystem(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer)
@@ -370,59 +425,59 @@ void rfu_REQ_configSystem(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer)
     STWI_send_SystemConfigREQ((availSlotFlag & AVAIL_SLOT1) | 0x3C, maxMFrame, mcTimer);
     if (mcTimer == 0)
     {
-        gRfuStatic->unk_1a = 1;
+        gRfuStatic->linkEmergencyLimit = 1;
     }
     else
     {
         u16 IMEBackup = REG_IME;
 
         REG_IME = 0;
-        gRfuStatic->unk_1a = Div(600, mcTimer);
+        gRfuStatic->linkEmergencyLimit = Div(600, mcTimer);
         REG_IME = IMEBackup;
     }
 }
 
 void rfu_REQ_configGameData(u8 mbootFlag, u16 serialNo, const u8 *gname, const u8 *uname)
 {
-    u8 sp[16];
+    u8 packet[16];
     u8 i;
-    u8 r3;
+    u8 check_sum;
     const u8 *gnameBackup = gname;
     const u8 *unameBackup;
 
-    sp[0] = serialNo;
-    sp[1] = serialNo >> 8;
+    packet[0] = serialNo;
+    packet[1] = serialNo >> 8;
     if (mbootFlag != 0)
-        sp[1] = (serialNo >> 8) | 0x80;
+        packet[1] = (serialNo >> 8) | 0x80;
     for (i = 2; i < 15; ++i)
-        sp[i] = *gname++;
-    r3 = 0;
+        packet[i] = *gname++;
+    check_sum = 0;
     unameBackup = uname;
     for (i = 0; i < 8; ++i)
     {
-        r3 += *unameBackup++;
-        r3 += *gnameBackup++;
+        check_sum += *unameBackup++;
+        check_sum += *gnameBackup++;
     }
-    sp[15] = ~r3;
+    packet[15] = ~check_sum;
     if (mbootFlag != 0)
-        sp[14] = 0;
+        packet[14] = 0;
     STWI_set_Callback_M(rfu_CB_configGameData);
-    STWI_send_GameConfigREQ(sp, uname);
+    STWI_send_GameConfigREQ(packet, uname);
 }
 
-static void rfu_CB_configGameData(u8 ip, u16 r7)
+static void rfu_CB_configGameData(u8 reqCommand, u16 reqResult)
 {
-    s32 r2, r3;
-    u8 *r4;
+    s32 serialNo;
+    u8 *gname_uname_p;
     u8 i;
-    u8 *r1;
+    u8 *packet_p;
 
-    if (r7 == 0)
+    if (reqResult == 0)
     {
-        r1 = gSTWIStatus->txPacket->rfuPacket8.data;
-        r2 = gRfuLinkStatus->my.serialNo = r1[4];
-        gRfuLinkStatus->my.serialNo = (r1[5] << 8) | r2;
-        r4 = &r1[6];
+        packet_p = gSTWIStatus->txPacket->rfuPacket8.data;
+        serialNo = gRfuLinkStatus->my.serialNo = packet_p[4];
+        gRfuLinkStatus->my.serialNo = (packet_p[5] << 8) | serialNo;
+        gname_uname_p = &packet_p[6];
         if (gRfuLinkStatus->my.serialNo & 0x8000)
         {
             gRfuLinkStatus->my.serialNo = gRfuLinkStatus->my.serialNo ^ 0x8000;
@@ -433,47 +488,54 @@ static void rfu_CB_configGameData(u8 ip, u16 r7)
             gRfuLinkStatus->my.mbootFlag = 0;
         }
         for (i = 0; i < RFU_GAME_NAME_LENGTH; ++i)
-            gRfuLinkStatus->my.gname[i] = *r4++;
-        ++r4;
+            gRfuLinkStatus->my.gname[i] = *gname_uname_p++;
+        ++gname_uname_p;
         for (i = 0; i < RFU_USER_NAME_LENGTH; ++i)
-            gRfuLinkStatus->my.uname[i] = *r4++;
+            gRfuLinkStatus->my.uname[i] = *gname_uname_p++;
     }
-    rfu_STC_REQ_callback(ip, r7);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 void rfu_REQ_startSearchChild(void)
 {
-    u16 r1;
-    
+    u16 result;
+#if LIBRFU_VERSION >= 1026
+    u16 i;
+    for (i = 0; i < RFU_CHILD_MAX; i++)
+    {
+        gRfuStatic->lsFixedCount[i] = 0;
+    }
+#endif
+
     STWI_set_Callback_M(rfu_CB_defaultCallback);
     STWI_send_SystemStatusREQ();
-    r1 = STWI_poll_CommandEnd();
-    if (r1 == 0)
+    result = STWI_poll_CommandEnd();
+    if (result == 0)
     {
         if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0)
-            rfu_STC_clearLinkStatus(1);
+            rfu_STC_clearLinkStatus(MODE_PARENT);
     }
     else
     {
-        rfu_STC_REQ_callback(25, r1);
+        rfu_STC_REQ_callback(ID_SC_START_REQ, result);
     }
     STWI_set_Callback_M(rfu_CB_startSearchChild);
     STWI_send_SC_StartREQ();
 }
 
-static void rfu_CB_startSearchChild(u8 r3, u16 reqResult)
+static void rfu_CB_startSearchChild(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
         gRfuStatic->SCStartFlag = 1;
-    rfu_STC_REQ_callback(r3, reqResult);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
-static void rfu_STC_clearLinkStatus(u8 r4)
+static void rfu_STC_clearLinkStatus(u8 parentChild)
 {
     u8 i;
-    
+
     rfu_clearAllSlot();
-    if (r4 != 0)
+    if (parentChild != MODE_CHILD)
     {
         CpuFill16(0, gRfuLinkStatus->partner, sizeof(gRfuLinkStatus->partner));
         gRfuLinkStatus->findParentCount = 0;
@@ -498,11 +560,11 @@ void rfu_REQ_endSearchChild(void)
     STWI_send_SC_EndREQ();
 }
 
-static void rfu_CB_pollAndEndSearchChild(u8 r4, u16 reqResult)
+static void rfu_CB_pollAndEndSearchChild(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
         rfu_STC_readChildList();
-    if (r4 == 26)
+    if (reqCommand == ID_SC_POLL_REQ)
     {
         if (gRfuLinkStatus->my.id == 0)
         {
@@ -512,60 +574,76 @@ static void rfu_CB_pollAndEndSearchChild(u8 r4, u16 reqResult)
                 gRfuLinkStatus->my.id = *(u16 *)&gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
         }
     }
-    else if (r4 == 27)
+    else if (reqCommand == ID_SC_END_REQ)
     {
         if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
             gRfuLinkStatus->my.id = 0;
         gRfuStatic->SCStartFlag = 0;
     }
-    rfu_STC_REQ_callback(r4, reqResult);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 static void rfu_STC_readChildList(void)
 {
-    u32 r5;
-    u8 r8 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[1];
-    u8 *r4;
+    u32 stwiParam;
+    u8 numSlots = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[1];
+    u8 *data_p;
     u8 i;
-    u8 sp[4];
-    u8 r2;
+    u8 bm_slot_id;
+#if LIBRFU_VERSION < 1026
+    u8 true_slots[RFU_CHILD_MAX];
+#endif
 
-    if (r8 != 0)
+#if LIBRFU_VERSION < 1026
+    if (numSlots != 0)
     {
-        r5 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
+        stwiParam = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
         STWI_set_Callback_M(rfu_CB_defaultCallback);
         STWI_send_LinkStatusREQ();
         if (STWI_poll_CommandEnd() == 0)
         {
-            r4 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
-            for (i = 0; i < NELEMS(sp); ++i)
-                sp[i] = *r4++;
+            data_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
+            for (i = 0; i < RFU_CHILD_MAX; ++i)
+                true_slots[i] = *data_p++;
         }
-        gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] = r5;
+        gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] = stwiParam;
     }
-    for (r4 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
-         r8 != 0;
-         r4 += 4)
+#endif
+    for (data_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
+         numSlots != 0;
+         data_p += 4)
     {
-        r2 = r4[2];
-        if (r2 < RFU_CHILD_MAX && !((gRfuLinkStatus->connSlotFlag >> r2) & 1) && !((gRfuLinkStatus->linkLossSlotFlag >> r2) & 1))
+        bm_slot_id = data_p[2];
+        if (bm_slot_id < RFU_CHILD_MAX && !((gRfuLinkStatus->connSlotFlag >> bm_slot_id) & 1) && !((gRfuLinkStatus->linkLossSlotFlag >> bm_slot_id) & 1))
         {
-            if (sp[r2] != 0)
-                ++gRfuStatic->lsFixedCount[r2];
-            if (gRfuStatic->lsFixedCount[r2] >= 4)
+        #if LIBRFU_VERSION < 1026
+            if (true_slots[bm_slot_id] != 0)
+                ++gRfuStatic->lsFixedCount[bm_slot_id];
+            if (gRfuStatic->lsFixedCount[bm_slot_id] >= 4)
             {
-                gRfuStatic->lsFixedCount[r2] = 0;
-                gRfuLinkStatus->strength[r2] = 0xFF;
-                gRfuLinkStatus->connSlotFlag |= 1 << r2;
+                gRfuStatic->lsFixedCount[bm_slot_id] = 0;
+                gRfuLinkStatus->strength[bm_slot_id] = 255;
+                gRfuLinkStatus->connSlotFlag |= 1 << bm_slot_id;
                 ++gRfuLinkStatus->connCount;
-                gRfuLinkStatus->partner[r2].id = *(u16 *)r4;
-                gRfuLinkStatus->partner[r2].slot = r2;
+                gRfuLinkStatus->partner[bm_slot_id].id = *(u16 *)data_p;
+                gRfuLinkStatus->partner[bm_slot_id].slot = bm_slot_id;
                 gRfuLinkStatus->parentChild = MODE_PARENT;
                 gRfuStatic->flags &= 0x7F;
-                gRfuStatic->cidBak[r2] = gRfuLinkStatus->partner[r2].id;
+                gRfuStatic->cidBak[bm_slot_id] = gRfuLinkStatus->partner[bm_slot_id].id;
             }
+        #else
+            gRfuStatic->lsFixedCount[bm_slot_id] = 0xF0;
+            gRfuLinkStatus->strength[bm_slot_id] = 16;
+            gRfuLinkStatus->connSlotFlag |= 1 << bm_slot_id;
+            ++gRfuLinkStatus->connCount;
+            gRfuLinkStatus->partner[bm_slot_id].id = *(u16 *)data_p;
+            gRfuLinkStatus->partner[bm_slot_id].slot = bm_slot_id;
+            gRfuLinkStatus->parentChild = MODE_PARENT;
+            gRfuStatic->flags &= 0x7F;
+            gRfuStatic->cidBak[bm_slot_id] = gRfuLinkStatus->partner[bm_slot_id].id;
+        #endif
         }
-        --r8;
+        --numSlots;
     }
 }
 
@@ -575,11 +653,11 @@ void rfu_REQ_startSearchParent(void)
     STWI_send_SP_StartREQ();
 }
 
-static void rfu_CB_startSearchParent(u8 r5, u16 reqResult)
+static void rfu_CB_startSearchParent(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
-        rfu_STC_clearLinkStatus(0);
-    rfu_STC_REQ_callback(r5, reqResult);
+        rfu_STC_clearLinkStatus(MODE_CHILD);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 void rfu_REQ_pollSearchParent(void)
@@ -588,11 +666,11 @@ void rfu_REQ_pollSearchParent(void)
     STWI_send_SP_PollingREQ();
 }
 
-static void rfu_CB_pollSearchParent(u8 r5, u16 reqResult)
+static void rfu_CB_pollSearchParent(u8 reqCommand, u16 reqResult)
 {
     if (reqResult == 0)
         rfu_STC_readParentCandidateList();
-    rfu_STC_REQ_callback(r5, reqResult);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 void rfu_REQ_endSearchParent(void)
@@ -603,47 +681,47 @@ void rfu_REQ_endSearchParent(void)
 
 static void rfu_STC_readParentCandidateList(void)
 {
-    u8 r7, r6, r5, r4, r3;
-    u8 *r1, *r2;
-    struct RfuTgtData *r4_;
+    u8 numSlots, i, check_sum, my_check_sum, j;
+    u8 *uname_p, *packet_p;
+    struct RfuTgtData *target;
 
     CpuFill16(0, gRfuLinkStatus->partner, sizeof(gRfuLinkStatus->partner));
-    r2 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[0];
-    r7 = r2[1];
-    r2 += 4;
+    packet_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[0];
+    numSlots = packet_p[1];
+    packet_p += 4;
     gRfuLinkStatus->findParentCount = 0;
-    for (r6 = 0; r6 < 4 && r7 != 0; ++r6)
-    {
-        r7 -= 7;
-        r1 = r2 + 6;
-        r2 += 19;
-        r5 = ~*r2;
-        ++r2;
-        r4 = 0;
-        for (r3 = 0; r3 < 8; ++r3)
+    for (i = 0; i < RFU_CHILD_MAX && numSlots != 0; ++i)
+    {
+        numSlots -= 7;
+        uname_p = packet_p + 6;
+        packet_p += 19;
+        check_sum = ~*packet_p;
+        ++packet_p;
+        my_check_sum = 0;
+        for (j = 0; j < 8; ++j)
         {
-            r4 += *r2++;
-            r4 += *r1++;
+            my_check_sum += *packet_p++;
+            my_check_sum += *uname_p++;
         }
-        if (r4 == r5)
+        if (my_check_sum == check_sum)
         {
-            r2 -= 28;
-            r4_ = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount];
-            r4_->id = *(u16 *)r2;
-            r2 += 2;
-            r4_->slot = *r2;
-            r2 += 2;
-            r4_->serialNo = *(u16 *)r2 & 0x7FFF;
-            if (*(u16 *)r2 & 0x8000)
-                r4_->mbootFlag = 1;
+            packet_p -= 28;
+            target = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount];
+            target->id = *(u16 *)packet_p;
+            packet_p += 2;
+            target->slot = *packet_p;
+            packet_p += 2;
+            target->serialNo = *(u16 *)packet_p & 0x7FFF;
+            if (*(u16 *)packet_p & 0x8000)
+                target->mbootFlag = 1;
             else
-                r4_->mbootFlag = 0;
-            r2 += 2;
-            for (r3 = 0; r3 < RFU_GAME_NAME_LENGTH; ++r3)
-                r4_->gname[r3] = *r2++;
-            ++r2;
-            for (r3 = 0; r3 < RFU_USER_NAME_LENGTH; ++r3)
-                r4_->uname[r3] = *r2++;
+                target->mbootFlag = 0;
+            packet_p += 2;
+            for (j = 0; j < RFU_GAME_NAME_LENGTH; ++j)
+                target->gname[j] = *packet_p++;
+            ++packet_p;
+            for (j = 0; j < RFU_USER_NAME_LENGTH; ++j)
+                target->uname[j] = *packet_p++;
             ++gRfuLinkStatus->findParentCount;
         }
     }
@@ -651,13 +729,13 @@ static void rfu_STC_readParentCandidateList(void)
 
 void rfu_REQ_startConnectParent(u16 pid)
 {
-    u16 r3 = 0;
+    u16 result = 0;
     u8 i;
     for (i = 0; i < RFU_CHILD_MAX && gRfuLinkStatus->partner[i].id != pid; ++i)
         ;
-    if (i == 4)
-        r3 = 256;
-    if (r3 == 0)
+    if (i == RFU_CHILD_MAX)
+        result = ERR_PID_NOT_FOUND;
+    if (result == 0)
     {
         gRfuStatic->tryPid = pid;
         STWI_set_Callback_M(rfu_STC_REQ_callback);
@@ -665,7 +743,7 @@ void rfu_REQ_startConnectParent(u16 pid)
     }
     else
     {
-        rfu_STC_REQ_callback(31, r3);
+        rfu_STC_REQ_callback(ID_CP_START_REQ, result);
     }
 }
 
@@ -675,70 +753,69 @@ void rfu_REQ_pollConnectParent(void)
     STWI_send_CP_PollingREQ();
 }
 
-static void rfu_CB_pollConnectParent(u8 sp24, u16 sp28)
+static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult)
 {
     u16 id;
     u8 slot;
-    u8 r2, r5;
-    struct RfuTgtData *r9;
-    struct RfuTgtData sp;
+    u8 bm_slot_flag, i;
+    struct RfuTgtData *target_p;
+    struct RfuTgtData target_local;
 
-    if (sp28 == 0)
+    if (reqResult == 0)
     {
         id = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
         slot = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[6];
         if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0)
         {
-            r2 = 1 << slot;
-            if (!(r2 & gRfuLinkStatus->connSlotFlag))
+            bm_slot_flag = 1 << slot;
+            if (!(bm_slot_flag & gRfuLinkStatus->connSlotFlag))
             {
-                gRfuLinkStatus->connSlotFlag |= r2;
-                gRfuLinkStatus->linkLossSlotFlag &= ~r2;
+                gRfuLinkStatus->connSlotFlag |= bm_slot_flag;
+                gRfuLinkStatus->linkLossSlotFlag &= ~bm_slot_flag;
                 gRfuLinkStatus->my.id = id;
                 ++gRfuLinkStatus->connCount;
                 gRfuLinkStatus->parentChild = MODE_CHILD;
                 gRfuStatic->flags |= 0x80;
-                for (r5 = 0; r5 < RFU_CHILD_MAX; ++r5)
+                for (i = 0; i < RFU_CHILD_MAX; ++i)
                 {
-                    if (gRfuLinkStatus->partner[r5].id == gRfuStatic->tryPid)
+                    if (gRfuLinkStatus->partner[i].id == gRfuStatic->tryPid)
                     {
                         if (gRfuLinkStatus->findParentCount != 0)
                         {
-                            r9 = &sp;
-                            CpuCopy16(&gRfuLinkStatus->partner[r5], &sp, sizeof(struct RfuTgtData));
+                            target_p = &target_local;
+                            CpuCopy16(&gRfuLinkStatus->partner[i], &target_local, sizeof(struct RfuTgtData));
                             CpuFill16(0, gRfuLinkStatus->partner, sizeof(gRfuLinkStatus->partner));
                             gRfuLinkStatus->findParentCount = 0;
                         }
                         else
                         {
-                            r9 = &gRfuLinkStatus->partner[r5];
+                            target_p = &gRfuLinkStatus->partner[i];
                         }
                         break;
                     }
                 }
-                if (r5 < RFU_CHILD_MAX)
+                if (i < RFU_CHILD_MAX)
                 {
-                    CpuCopy16(r9, &gRfuLinkStatus->partner[slot], sizeof(struct RfuTgtData));
+                    CpuCopy16(target_p, &gRfuLinkStatus->partner[slot], sizeof(struct RfuTgtData));
                     gRfuLinkStatus->partner[slot].slot = slot;
                 }
             }
         }
     }
-    rfu_STC_REQ_callback(sp24, sp28);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 u16 rfu_getConnectParentStatus(u8 *status, u8 *connectSlotNo)
 {
-    u8 r0, *r2;
+    u8 *packet_p;
 
     *status = 0xFF;
-    r2 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
-    r0 = r2[0] + 96;
-    if (r0 <= 1)
+    packet_p = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
+    if (packet_p[0] == 0xa0 || packet_p[0] == 0xa1)
     {
-        r2 += 6;
-        *connectSlotNo = r2[0];
-        *status = r2[1];
+        packet_p += 6;
+        *connectSlotNo = packet_p[0];
+        *status = packet_p[1];
         return 0;
     }
     return ERR_REQ_CMD_ID;
@@ -754,28 +831,28 @@ void rfu_REQ_endConnectParent(void)
 
 u16 rfu_syncVBlank(void)
 {
-    u8 r3, r4;
-    s32 r5;
+    u8 masterSlave, i;
+    s32 bmSlotFlag;
 
     rfu_NI_checkCommFailCounter();
     if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
         return 0;
     if (gRfuStatic->nowWatchInterval != 0)
         --gRfuStatic->nowWatchInterval;
-    r3 = rfu_getMasterSlave();
+    masterSlave = rfu_getMasterSlave();
     if (!(gRfuStatic->flags & 2))
     {
-        if (r3 == 0)
+        if (masterSlave == AGB_CLK_SLAVE)
         {
             gRfuStatic->flags |= 4;
             gRfuStatic->watchdogTimer = 360;
         }
     }
-    else if (r3 != 0)
+    else if (masterSlave != AGB_CLK_SLAVE)
     {
         gRfuStatic->flags &= 0xFB;
     }
-    if (r3 != 0)
+    if (masterSlave != AGB_CLK_SLAVE)
         gRfuStatic->flags &= 0xFD;
     else
         gRfuStatic->flags |= 2;
@@ -784,10 +861,10 @@ u16 rfu_syncVBlank(void)
     if (gRfuStatic->watchdogTimer == 0)
     {
         gRfuStatic->flags &= 0xFB;
-        r5 = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
-        for (r4 = 0; r4 < RFU_CHILD_MAX; ++r4)
-            if ((r5 >> r4) & 1)
-                rfu_STC_removeLinkData(r4, 1);
+        bmSlotFlag = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
+            if ((bmSlotFlag >> i) & 1)
+                rfu_STC_removeLinkData(i, 1);
         gRfuLinkStatus->parentChild = MODE_NEUTRAL;
         return 1;
     }
@@ -797,13 +874,13 @@ u16 rfu_syncVBlank(void)
 
 u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason, u8 *parentBmLinkRecoverySlot)
 {
-    u8 sp08 = 0;
-    u8 sp0C = 0;
+    u8 reasonMaybe = 0;
+    u8 reqResult = 0;
     u8 i;
-    s32 sp10, sp14;
-    u8 *r2;
-    u8 r9, r6, r3, connSlotFlag, r0;
-    
+    s32 stwiCommand, stwiParam;
+    u8 *packet_p;
+    u8 to_req_disconnect, newLinkLossFlag, num_packets, connSlotFlag, to_disconnect;
+
     *bmLinkLossSlot = 0;
     *linkLossReason = REASON_DISCONNECTED;
     *parentBmLinkRecoverySlot = 0;
@@ -813,26 +890,30 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
         gRfuStatic->watchdogTimer = 360;
     if (gRfuStatic->nowWatchInterval == 0)
     {
+    #if LIBRFU_VERSION < 1026
         gRfuStatic->nowWatchInterval = gRfuLinkStatus->watchInterval;
-        sp08 = 1;
+    #else
+        gRfuStatic->nowWatchInterval = 4;
+    #endif
+        reasonMaybe = 1;
     }
-    if ((u8)reqCommandId == 41)
+    if ((u8)reqCommandId == ID_DISCONNECTED_AND_CHANGE_REQ)
     {
-        u8 *r1 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
-        
-        *bmLinkLossSlot = r1[4];
-        *linkLossReason = r1[5];
+        u8 *packet_p_2 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
+
+        *bmLinkLossSlot = packet_p_2[4];
+        *linkLossReason = packet_p_2[5];
         if (*linkLossReason == REASON_LINK_LOSS)
             *bmLinkLossSlot = gRfuLinkStatus->connSlotFlag;
-        sp08 = 2;
+        reasonMaybe = 2;
     }
     else
     {
-        if (reqCommandId == 310)
+        if (reqCommandId == 0x0136)
         {
-            r6 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[5];
-            r6 ^= gRfuLinkStatus->connSlotFlag;
-            *bmLinkLossSlot = r6 & gRfuLinkStatus->connSlotFlag;
+            newLinkLossFlag = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[5];
+            newLinkLossFlag ^= gRfuLinkStatus->connSlotFlag;
+            *bmLinkLossSlot = newLinkLossFlag & gRfuLinkStatus->connSlotFlag;
             *linkLossReason = REASON_LINK_LOSS;
             for (i = 0; i < RFU_CHILD_MAX; ++i)
             {
@@ -843,33 +924,41 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
                 }
             }
         }
-        if (sp08 == 0)
+        if (reasonMaybe == 0)
             return 0;
     }
-    sp10 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.command;
-    sp14 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
+    stwiCommand = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.command;
+    stwiParam = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0];
     STWI_set_Callback_M(rfu_CB_defaultCallback);
     STWI_send_LinkStatusREQ();
-    sp0C = STWI_poll_CommandEnd();
-    if (sp0C == 0)
+    reqResult = STWI_poll_CommandEnd();
+    if (reqResult == 0)
     {
-        r2 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
+        packet_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
         for (i = 0; i < RFU_CHILD_MAX; ++i)
-            gRfuLinkStatus->strength[i] = *r2++;
-        r9 = 0;
+            gRfuLinkStatus->strength[i] = *packet_p++;
+        to_req_disconnect = 0;
         i = 0;
     }
     else
     {
-        rfu_STC_REQ_callback(17, sp0C);
-        return sp0C;
+        rfu_STC_REQ_callback(ID_LINK_STATUS_REQ, reqResult);
+        return reqResult;
     }
     for (; i < RFU_CHILD_MAX; ++i)
     {
-        r6 = 1 << i;
-        if (sp0C == 0)
+    #if LIBRFU_VERSION >= 1026
+        if (gRfuStatic->lsFixedCount[i] != 0)
+        {
+            gRfuStatic->lsFixedCount[i] -= 4;
+            if (gRfuLinkStatus->strength[i] <= 15)
+                gRfuLinkStatus->strength[i] = 16;
+        }
+    #endif
+        newLinkLossFlag = 1 << i;
+        if (reqResult == 0)
         {
-            if (sp08 == 1 && (gRfuLinkStatus->connSlotFlag & r6))
+            if (reasonMaybe == 1 && (gRfuLinkStatus->connSlotFlag & newLinkLossFlag))
             {
                 if (gRfuLinkStatus->strength[i] == 0)
                 {
@@ -878,8 +967,8 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
                         ++gRfuStatic->linkEmergencyFlag[i];
                         if (gRfuStatic->linkEmergencyFlag[i] > 3)
                         {
-                            *bmLinkLossSlot |= r6;
-                            *linkLossReason = sp08; // why not directly use REASON_LINK_LOSS?
+                            *bmLinkLossSlot |= newLinkLossFlag;
+                            *linkLossReason = REASON_LINK_LOSS;
                         }
                     }
                     else
@@ -889,18 +978,18 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
                         {
                             if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0)
                             {
-                                *bmLinkLossSlot |= r6;
-                                *linkLossReason = sp08; // why not directly use REASON_LINK_LOSS?
+                                *bmLinkLossSlot |= newLinkLossFlag;
+                                *linkLossReason = REASON_LINK_LOSS;
                             }
                             else
                             {
-                                if (++gRfuStatic->linkEmergencyFlag[i] > gRfuStatic->unk_1a)
+                                if (++gRfuStatic->linkEmergencyFlag[i] > gRfuStatic->linkEmergencyLimit)
                                 {
                                     gRfuStatic->linkEmergencyFlag[i] = 0;
                                     STWI_send_DisconnectREQ(gRfuLinkStatus->connSlotFlag);
                                     STWI_poll_CommandEnd();
-                                    *bmLinkLossSlot |= r6;
-                                    *linkLossReason = sp08; // why not directly use REASON_LINK_LOSS?
+                                    *bmLinkLossSlot |= newLinkLossFlag;
+                                    *linkLossReason = REASON_LINK_LOSS;
                                 }
                             }
                         }
@@ -908,18 +997,18 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
                 }
                 else
                 {
-                    gRfuStatic->linkEmergencyFlag[i] = sp0C; // why not directly use 0? 
+                    gRfuStatic->linkEmergencyFlag[i] = 0;
                 }
             }
             if (gRfuLinkStatus->parentChild == MODE_PARENT && gRfuLinkStatus->strength[i] != 0)
             {
-                if (r6 & gRfuLinkStatus->linkLossSlotFlag)
+                if (newLinkLossFlag & gRfuLinkStatus->linkLossSlotFlag)
                 {
                     if (gRfuLinkStatus->strength[i] > 10)
                     {
-                        *parentBmLinkRecoverySlot |= r6;
-                        gRfuLinkStatus->connSlotFlag |= r6;
-                        gRfuLinkStatus->linkLossSlotFlag &= ~r6;
+                        *parentBmLinkRecoverySlot |= newLinkLossFlag;
+                        gRfuLinkStatus->connSlotFlag |= newLinkLossFlag;
+                        gRfuLinkStatus->linkLossSlotFlag &= ~newLinkLossFlag;
                         ++gRfuLinkStatus->connCount;
                         gRfuStatic->linkEmergencyFlag[i] = 0;
                     }
@@ -930,19 +1019,19 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
                 }
                 else
                 {
-                    if (!((gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag) & r6))
+                    if (!((gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag) & newLinkLossFlag))
                     {
                         STWI_send_SlotStatusREQ();
                         STWI_poll_CommandEnd();
-                        r2 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
-                        r3 = r2[1] - 1;
-                        for (r2 += 8; r3 != 0; r2 += 4, --r3)
+                        packet_p = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data;
+                        num_packets = packet_p[1] - 1;
+                        for (packet_p += 8; num_packets != 0; packet_p += 4, --num_packets)
                         {
-                            u16 r4 = *(u16 *)r2;
+                            u16 cid = *(u16 *)packet_p;
 
-                            if (r2[2] == i && r4 == gRfuStatic->cidBak[i])
+                            if (packet_p[2] == i && cid == gRfuStatic->cidBak[i])
                             {
-                                r9 |= 1 << i;
+                                to_req_disconnect |= 1 << i;
                                 break;
                             }
                         }
@@ -951,46 +1040,49 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
             }
         }
         connSlotFlag = gRfuLinkStatus->connSlotFlag;
-        r0 = *bmLinkLossSlot;
-        r0 &= connSlotFlag;
-        if (r6 & r0)
+        to_disconnect = *bmLinkLossSlot;
+        to_disconnect &= connSlotFlag;
+        if (newLinkLossFlag & to_disconnect)
             rfu_STC_removeLinkData(i, 0);
     }
-    if (r9 != 0)
+    if (to_req_disconnect != 0)
     {
-        STWI_send_DisconnectREQ(r9);
+        STWI_send_DisconnectREQ(to_req_disconnect);
         STWI_poll_CommandEnd();
     }
     // equivalent to:
-    // gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.command = sp10;
-    *(u32 *)gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data = sp10;
-    gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] = sp14;
+    // gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.command = stwiCommand;
+    *(u32 *)gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data = stwiCommand;
+    gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] = stwiParam;
     return 0;
 }
 
-static void rfu_STC_removeLinkData(u8 r7, u8 r12)
+static void rfu_STC_removeLinkData(u8 bmConnectedPartnerId, u8 bmDisconnect)
 {
-    u8 r5 = 1 << r7;
-    s32 r6;
+    u8 bmLinkLossFlag = 1 << bmConnectedPartnerId;
+    s32 bmLinkRetainedFlag;
 
-    if ((gRfuLinkStatus->connSlotFlag & r5) && gRfuLinkStatus->connCount != 0)
+#if LIBRFU_VERSION >= 1026
+    gRfuStatic->lsFixedCount[bmConnectedPartnerId] = 0;
+#endif
+    if ((gRfuLinkStatus->connSlotFlag & bmLinkLossFlag) && gRfuLinkStatus->connCount != 0)
         --gRfuLinkStatus->connCount;
-    gRfuLinkStatus->connSlotFlag &= r6 = ~r5;
-    gRfuLinkStatus->linkLossSlotFlag |= r5;
-    if ((*(u32 *)gRfuLinkStatus & 0xFF00FF) == 0)
+    gRfuLinkStatus->connSlotFlag &= bmLinkRetainedFlag = ~bmLinkLossFlag;
+    gRfuLinkStatus->linkLossSlotFlag |= bmLinkLossFlag;
+    if (gRfuLinkStatus->parentChild == MODE_CHILD && gRfuLinkStatus->connSlotFlag == 0)
         gRfuLinkStatus->parentChild = MODE_NEUTRAL;
-    if (r12 != 0)
+    if (bmDisconnect)
     {
-        CpuFill16(0, &gRfuLinkStatus->partner[r7], sizeof(struct RfuTgtData));
-        gRfuLinkStatus->linkLossSlotFlag &= r6;
-        gRfuLinkStatus->getNameFlag &= r6;
-        gRfuLinkStatus->strength[r7] = 0;
+        CpuFill16(0, &gRfuLinkStatus->partner[bmConnectedPartnerId], sizeof(struct RfuTgtData));
+        gRfuLinkStatus->linkLossSlotFlag &= bmLinkRetainedFlag;
+        gRfuLinkStatus->getNameFlag &= bmLinkRetainedFlag;
+        gRfuLinkStatus->strength[bmConnectedPartnerId] = 0;
     }
 }
 
 void rfu_REQ_disconnect(u8 bmDisconnectSlot)
 {
-    u16 r1;
+    u16 result;
 
     if ((gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag) & bmDisconnectSlot)
     {
@@ -1003,9 +1095,9 @@ void rfu_REQ_disconnect(u8 bmDisconnectSlot)
         else if (gRfuStatic->SCStartFlag
               && (STWI_set_Callback_M(rfu_CB_defaultCallback),
                   STWI_send_SC_EndREQ(),
-                  (r1 = STWI_poll_CommandEnd()) != 0))
+                  (result = STWI_poll_CommandEnd()) != 0))
         {
-            rfu_STC_REQ_callback(27, r1);
+            rfu_STC_REQ_callback(ID_SC_END_REQ, result);
         }
         else
         {
@@ -1015,38 +1107,38 @@ void rfu_REQ_disconnect(u8 bmDisconnectSlot)
     }
 }
 
-static void rfu_CB_disconnect(u8 r6, u16 r5)
+static void rfu_CB_disconnect(u8 reqCommand, u16 reqResult)
 {
-    u8 r4, r0;
+    u8 i, bm_slot_flag;
 
-    if (r5 == 3 && gRfuLinkStatus->parentChild == MODE_CHILD)
+    if (reqResult == 3 && gRfuLinkStatus->parentChild == MODE_CHILD)
     {
         STWI_set_Callback_M(rfu_CB_defaultCallback);
         STWI_send_SystemStatusREQ();
         if (STWI_poll_CommandEnd() == 0 && gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0)
-            r5 = 0;
+            reqResult = 0;
     }
     gRfuStatic->recoveryBmSlot &= gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
     gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[8] = gRfuStatic->recoveryBmSlot;
-    if (r5 == 0)
+    if (reqResult == 0)
     {
-        for (r4 = 0; r4 < RFU_CHILD_MAX; ++r4)
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
         {
-            r0 = 1 << r4;
-            if (r0 & gRfuStatic->recoveryBmSlot)
-                rfu_STC_removeLinkData(r4, 1);
+            bm_slot_flag = 1 << i;
+            if (bm_slot_flag & gRfuStatic->recoveryBmSlot)
+                rfu_STC_removeLinkData(i, 1);
         }
     }
     if ((gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag) == 0)
         gRfuLinkStatus->parentChild = MODE_NEUTRAL;
-    rfu_STC_REQ_callback(r6, r5);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
     if (gRfuStatic->SCStartFlag)
     {
         STWI_set_Callback_M(rfu_CB_defaultCallback);
         STWI_send_SC_StartREQ();
-        r5 = STWI_poll_CommandEnd();
-        if (r5 != 0)
-            rfu_STC_REQ_callback(25, r5);
+        reqResult = STWI_poll_CommandEnd();
+        if (reqResult != 0)
+            rfu_STC_REQ_callback(ID_SC_START_REQ, reqResult);
     }
 }
 
@@ -1068,38 +1160,35 @@ void rfu_REQ_CHILD_pollConnectRecovery(void)
     STWI_send_CPR_PollingREQ();
 }
 
-static void rfu_CB_CHILD_pollConnectRecovery(u8 r8, u16 r7)
+static void rfu_CB_CHILD_pollConnectRecovery(u8 reqCommand, u16 reqResult)
 {
-    u8 r3, r4;
-    struct RfuLinkStatus *r2;
+    u8 bm_slot_flag, i;
+    struct RfuLinkStatus *rfuLinkStatus;
 
-    if (r7 == 0 && gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4] == 0 && gRfuStatic->recoveryBmSlot)
+    if (reqResult == 0 && gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4] == 0 && gRfuStatic->recoveryBmSlot)
     {
         gRfuLinkStatus->parentChild = MODE_CHILD;
-        for (r4 = 0; r4 < NELEMS(gRfuStatic->linkEmergencyFlag); ++r4)
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
         {
-            r3 = 1 << r4;
-            r2 = gRfuLinkStatus; // ???
-            if (gRfuStatic->recoveryBmSlot & r3 & r2->linkLossSlotFlag)
+            bm_slot_flag = 1 << i;
+            rfuLinkStatus = gRfuLinkStatus; // ???
+            if (gRfuStatic->recoveryBmSlot & bm_slot_flag & rfuLinkStatus->linkLossSlotFlag)
             {
-                gRfuLinkStatus->connSlotFlag |= r3;
-                gRfuLinkStatus->linkLossSlotFlag &= ~r3;
+                gRfuLinkStatus->connSlotFlag |= bm_slot_flag;
+                gRfuLinkStatus->linkLossSlotFlag &= ~bm_slot_flag;
                 ++gRfuLinkStatus->connCount;
-                gRfuStatic->linkEmergencyFlag[r4] = 0;
+                gRfuStatic->linkEmergencyFlag[i] = 0;
             }
         }
         gRfuStatic->recoveryBmSlot = 0;
     }
-    rfu_STC_REQ_callback(r8, r7);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 u16 rfu_CHILD_getConnectRecoveryStatus(u8 *status)
 {
-    u8 r0;
-
     *status = 0xFF;
-    r0 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[0] + 77;
-    if (r0 <= 1)
+    if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[0] == 0xB3 || gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[0] == 0xB4)
     {
         *status = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4];
         return 0;
@@ -1127,14 +1216,14 @@ static void rfu_STC_fastCopy(const u8 **src_p, u8 **dst_p, s32 size)
 
 void rfu_REQ_changeMasterSlave(void)
 {
-    if (STWI_read_status(1) == 1)
+    if (STWI_read_status(1) == AGB_CLK_MASTER)
     {
         STWI_set_Callback_M(rfu_STC_REQ_callback);
         STWI_send_MS_ChangeREQ();
     }
     else
     {
-        rfu_STC_REQ_callback(39, 0);
+        rfu_STC_REQ_callback(ID_MS_CHANGE_REQ, 0);
     }
 }
 
@@ -1144,11 +1233,11 @@ bool8 rfu_getMasterSlave(void)
 
     if (masterSlave == AGB_CLK_MASTER)
     {
-        if (gSTWIStatus->unk_2c)
+        if (gSTWIStatus->sending)
         {
-            if (gSTWIStatus->reqActiveCommand == 39
-             || gSTWIStatus->reqActiveCommand == 37
-             || gSTWIStatus->reqActiveCommand == 55)
+            if (gSTWIStatus->reqActiveCommand == ID_MS_CHANGE_REQ
+             || gSTWIStatus->reqActiveCommand == ID_DATA_TX_AND_CHANGE_REQ
+             || gSTWIStatus->reqActiveCommand == ID_RESUME_RETRANSMIT_AND_CHANGE_REQ)
                 masterSlave = AGB_CLK_SLAVE;
         }
     }
@@ -1159,7 +1248,7 @@ void rfu_clearAllSlot(void)
 {
     u16 i;
     u16 IMEBackup = REG_IME;
-    
+
     REG_IME = 0;
     for (i = 0; i < RFU_CHILD_MAX; ++i)
     {
@@ -1175,87 +1264,87 @@ void rfu_clearAllSlot(void)
     REG_IME = IMEBackup;
 }
 
-static void rfu_STC_releaseFrame(u8 r5, u8 r3, struct NIComm *r4)
+static void rfu_STC_releaseFrame(u8 bm_slot_id, u8 send_recv, struct NIComm *NI_comm)
 {
 
     if (!(gRfuStatic->flags & 0x80))
     {
-        if (r3 == 0)
-            gRfuLinkStatus->remainLLFrameSizeParent += r4->payloadSize;
+        if (send_recv == 0)
+            gRfuLinkStatus->remainLLFrameSizeParent += NI_comm->payloadSize;
         gRfuLinkStatus->remainLLFrameSizeParent += 3;
     }
     else
     {
-        if (r3 == 0)
-            gRfuLinkStatus->remainLLFrameSizeChild[r5] += r4->payloadSize;
-        gRfuLinkStatus->remainLLFrameSizeChild[r5] += 2;
+        if (send_recv == 0)
+            gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id] += NI_comm->payloadSize;
+        gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id] += 2;
     }
 }
 
 u16 rfu_clearSlot(u8 connTypeFlag, u8 slotStatusIndex)
 {
-    u16 r10, r3, r1;
-    struct NIComm *r4;
+    u16 imeBak, send_recv, i;
+    struct NIComm *NI_comm;
 
     if (slotStatusIndex >= RFU_CHILD_MAX)
         return ERR_SLOT_NO;
     if (!(connTypeFlag & (TYPE_UNI_SEND | TYPE_UNI_RECV | TYPE_NI_SEND | TYPE_NI_RECV)))
         return ERR_COMM_TYPE;
-    r10 = REG_IME;
+    imeBak = REG_IME;
     REG_IME = 0;
     if (connTypeFlag & (TYPE_NI_SEND | TYPE_NI_RECV))
     {
-        for (r3 = 0; r3 < 2; ++r3)
+        for (send_recv = 0; send_recv < 2; ++send_recv)
         {
-            r4 = NULL;
-            if (r3 == 0)
+            NI_comm = NULL;
+            if (send_recv == 0)
             {
                 if (connTypeFlag & TYPE_NI_SEND)
                 {
-                    r4 = &gRfuSlotStatusNI[slotStatusIndex]->send;
-                    gRfuLinkStatus->sendSlotNIFlag &= ~r4->bmSlotOrg;
+                    NI_comm = &gRfuSlotStatusNI[slotStatusIndex]->send;
+                    gRfuLinkStatus->sendSlotNIFlag &= ~NI_comm->bmSlotOrg;
                 }
             }
             else
             {
                 if (connTypeFlag & TYPE_NI_RECV)
                 {
-                    r4 = &gRfuSlotStatusNI[slotStatusIndex]->recv;
+                    NI_comm = &gRfuSlotStatusNI[slotStatusIndex]->recv;
                     gRfuLinkStatus->recvSlotNIFlag &= ~(1 << slotStatusIndex);
                 }
             }
-            if (r4 != NULL)
+            if (NI_comm != NULL)
             {
-                if (r4->state & SLOT_BUSY_FLAG)
+                if (NI_comm->state & SLOT_BUSY_FLAG)
                 {
-                    rfu_STC_releaseFrame(slotStatusIndex, r3, r4);
-                    for (r1 = 0; r1 < RFU_CHILD_MAX; ++r1)
-                        if ((r4->bmSlotOrg >> r1) & 1)
-                            r4->failCounter = 0;
+                    rfu_STC_releaseFrame(slotStatusIndex, send_recv, NI_comm);
+                    for (i = 0; i < RFU_CHILD_MAX; ++i)
+                        if ((NI_comm->bmSlotOrg >> i) & 1)
+                            NI_comm->failCounter = 0;
                 }
-                CpuFill16(0, r4, sizeof(struct NIComm));
+                CpuFill16(0, NI_comm, sizeof(struct NIComm));
             }
         }
     }
     if (connTypeFlag & TYPE_UNI_SEND)
     {
-        struct RfuSlotStatusUNI *r3 = gRfuSlotStatusUNI[slotStatusIndex];
+        struct RfuSlotStatusUNI *slotStatusUNI = gRfuSlotStatusUNI[slotStatusIndex];
 
-        if (r3->send.state & SLOT_BUSY_FLAG)
+        if (slotStatusUNI->send.state & SLOT_BUSY_FLAG)
         {
             if (!(gRfuStatic->flags & 0x80))
-                gRfuLinkStatus->remainLLFrameSizeParent += 3 + (u8)r3->send.payloadSize;
+                gRfuLinkStatus->remainLLFrameSizeParent += 3 + (u8)slotStatusUNI->send.payloadSize;
             else
-                gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex] += 2 + (u8)r3->send.payloadSize;
-            gRfuLinkStatus->sendSlotUNIFlag &= ~r3->send.bmSlot;
+                gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex] += 2 + (u8)slotStatusUNI->send.payloadSize;
+            gRfuLinkStatus->sendSlotUNIFlag &= ~slotStatusUNI->send.bmSlot;
         }
-        CpuFill16(0, &r3->send, sizeof(struct UNISend));
+        CpuFill16(0, &slotStatusUNI->send, sizeof(struct UNISend));
     }
     if (connTypeFlag & TYPE_UNI_RECV)
     {
         CpuFill16(0, &gRfuSlotStatusUNI[slotStatusIndex]->recv, sizeof(struct UNIRecv));
     }
-    REG_IME = r10;
+    REG_IME = imeBak;
     return 0;
 }
 
@@ -1301,16 +1390,16 @@ u16 rfu_NI_CHILD_setSendGameName(u8 slotNo, u8 subFrameSize)
     return rfu_STC_setSendData_org(64, 1 << slotNo, subFrameSize, &gRfuLinkStatus->my.serialNo, 26);
 }
 
-static u16 rfu_STC_setSendData_org(u8 r6, u8 bmSendSlot, u8 subFrameSize, const void *src, u32 sp28)
+static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize, const void *src, u32 dataSize)
 {
-    u8 r2, r0;
-    u8 r4;
-    u8 *r9;
-    u8 r5;
+    u8 bm_slot_id, sendSlotFlag;
+    u8 frameSize;
+    u8 *llFrameSize_p;
+    u8 sending;
     u8 i;
-    u16 sp04;
-    struct RfuSlotStatusUNI *r1;
-    struct RfuSlotStatusNI *r12;
+    u16 imeBak;
+    struct RfuSlotStatusUNI *slotStatus_UNI;
+    struct RfuSlotStatusNI *slotStatus_NI;
 
     if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
         return ERR_MODE_NOT_CONNECTED;
@@ -1318,108 +1407,108 @@ static u16 rfu_STC_setSendData_org(u8 r6, u8 bmSendSlot, u8 subFrameSize, const
         return ERR_SLOT_NO;
     if (((gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag) & bmSendSlot) != bmSendSlot)
         return ERR_SLOT_NOT_CONNECTED;
-    if (r6 & 0x10)
-        r0 = gRfuLinkStatus->sendSlotUNIFlag;
+    if (ni_or_uni & 0x10)
+        sendSlotFlag = gRfuLinkStatus->sendSlotUNIFlag;
     else
-        r0 = gRfuLinkStatus->sendSlotNIFlag;
-    if (r0 & bmSendSlot)
+        sendSlotFlag = gRfuLinkStatus->sendSlotNIFlag;
+    if (sendSlotFlag & bmSendSlot)
         return ERR_SLOT_BUSY;
-    for (r2 = 0; r2 < RFU_CHILD_MAX && !((bmSendSlot >> r2) & 1); ++r2)
+    for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX && !((bmSendSlot >> bm_slot_id) & 1); ++bm_slot_id)
         ;
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
-        r9 = &gRfuLinkStatus->remainLLFrameSizeParent;
+        llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeParent;
     else if (gRfuLinkStatus->parentChild == MODE_CHILD)
-        r9 = &gRfuLinkStatus->remainLLFrameSizeChild[r2];
-    r4 = llsf_struct[gRfuLinkStatus->parentChild].unk00;
-    if (subFrameSize > *r9 || subFrameSize <= r4)
+        llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id];
+    frameSize = llsf_struct[gRfuLinkStatus->parentChild].frameSize;
+    if (subFrameSize > *llFrameSize_p || subFrameSize <= frameSize)
         return ERR_SUBFRAME_SIZE;
-    sp04 = REG_IME;
+    imeBak = REG_IME;
     REG_IME = 0;
-    r5 = r6 & 0x20;
-    if (r5 || r6 == 0x40)
-    {
-        u8 *r1; // a hack to swap instructions
-
-        r12 = gRfuSlotStatusNI[r2];
-        r1 = NULL;
-        r12->send.errorCode = 0;
-        *r12->send.now_p = r1 = &r12->send.dataType;
-        r12->send.remainSize = 7;
-        r12->send.bmSlotOrg = bmSendSlot;
-        r12->send.bmSlot = bmSendSlot;
-        r12->send.payloadSize = subFrameSize - r4;
-        if (r5 != 0)
-            *r1 = 0;
+    sending = ni_or_uni & 0x20;
+    if (sending || ni_or_uni == 0x40)
+    {
+        u8 *dataType_p; // a hack to swap instructions
+
+        slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
+        slotStatus_UNI = NULL;
+        slotStatus_NI->send.errorCode = 0;
+        *slotStatus_NI->send.now_p = dataType_p = &slotStatus_NI->send.dataType;
+        slotStatus_NI->send.remainSize = 7;
+        slotStatus_NI->send.bmSlotOrg = bmSendSlot;
+        slotStatus_NI->send.bmSlot = bmSendSlot;
+        slotStatus_NI->send.payloadSize = subFrameSize - frameSize;
+        if (sending != 0)
+            *dataType_p = 0;
         else
-            *r1 = 1;
-        r12->send.dataSize = sp28;
-        r12->send.src = src;
-        r12->send.ack = 0;
-        r12->send.phase = 0;
+            *dataType_p = 1;
+        slotStatus_NI->send.dataSize = dataSize;
+        slotStatus_NI->send.src = src;
+        slotStatus_NI->send.ack = 0;
+        slotStatus_NI->send.phase = 0;
     #ifndef NONMATCHING // to fix r2, r3, r4, r5 register roulette
         asm("":::"r2");
     #endif
         for (i = 0; i < WINDOW_COUNT; ++i)
         {
-            r12->send.recvAckFlag[i] = 0;
-            r12->send.n[i] = 1;
+            slotStatus_NI->send.recvAckFlag[i] = 0;
+            slotStatus_NI->send.n[i] = 1;
         }
-        for (r2 = 0; r2 < RFU_CHILD_MAX; ++r2)
-            if ((bmSendSlot >> r2) & 1)
-                gRfuSlotStatusNI[r2]->send.failCounter = 0;
+        for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
+            if ((bmSendSlot >> bm_slot_id) & 1)
+                gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
         gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
-        *r9 -= subFrameSize;
-        r12->send.state = SLOT_STATE_SEND_START;
+        *llFrameSize_p -= subFrameSize;
+        slotStatus_NI->send.state = SLOT_STATE_SEND_START;
     }
-    else if (r6 & 0x10)
+    else if (ni_or_uni & 0x10)
     {
-        r1 = gRfuSlotStatusUNI[r2];
-        r1->send.bmSlot = bmSendSlot;
-        r1->send.src = src;
-        r1->send.payloadSize = subFrameSize - r4;
-        *r9 -= subFrameSize;
-        r1->send.state = SLOT_STATE_SEND_UNI;
+        slotStatus_UNI = gRfuSlotStatusUNI[bm_slot_id];
+        slotStatus_UNI->send.bmSlot = bmSendSlot;
+        slotStatus_UNI->send.src = src;
+        slotStatus_UNI->send.payloadSize = subFrameSize - frameSize;
+        *llFrameSize_p -= subFrameSize;
+        slotStatus_UNI->send.state = SLOT_STATE_SEND_UNI;
         gRfuLinkStatus->sendSlotUNIFlag |= bmSendSlot;
     }
-    REG_IME = sp04;
+    REG_IME = imeBak;
     return 0;
 }
 
 u16 rfu_changeSendTarget(u8 connType, u8 slotStatusIndex, u8 bmNewTgtSlot)
 {
-    struct RfuSlotStatusNI *r5;
-    u16 r8;
-    u8 r2;
+    struct RfuSlotStatusNI *slotStatusNI;
+    u16 imeBak;
+    u8 i;
 
     if (slotStatusIndex >= RFU_CHILD_MAX)
         return ERR_SLOT_NO;
     if (connType == 0x20)
     {
-        r5 = gRfuSlotStatusNI[slotStatusIndex];
-        if ((r5->send.state & SLOT_BUSY_FLAG)
-         && (r5->send.state & SLOT_SEND_FLAG))
+        slotStatusNI = gRfuSlotStatusNI[slotStatusIndex];
+        if ((slotStatusNI->send.state & SLOT_BUSY_FLAG)
+         && (slotStatusNI->send.state & SLOT_SEND_FLAG))
         {
-            connType = bmNewTgtSlot ^ r5->send.bmSlot;
-            
+            connType = bmNewTgtSlot ^ slotStatusNI->send.bmSlot;
+
             if (!(connType & bmNewTgtSlot))
             {
                 if (connType)
                 {
-                    r8 = REG_IME;
+                    imeBak = REG_IME;
                     REG_IME = 0;
-                    for (r2 = 0; r2 < RFU_CHILD_MAX; ++r2)
+                    for (i = 0; i < RFU_CHILD_MAX; ++i)
                     {
-                        if ((connType >> r2) & 1)
-                            gRfuSlotStatusNI[r2]->send.failCounter = 0;
+                        if ((connType >> i) & 1)
+                            gRfuSlotStatusNI[i]->send.failCounter = 0;
                     }
                     gRfuLinkStatus->sendSlotNIFlag &= ~connType;
-                    r5->send.bmSlot = bmNewTgtSlot;
-                    if (r5->send.bmSlot == 0)
+                    slotStatusNI->send.bmSlot = bmNewTgtSlot;
+                    if (slotStatusNI->send.bmSlot == 0)
                     {
-                        rfu_STC_releaseFrame(slotStatusIndex, 0, &r5->send);
-                        r5->send.state = SLOT_STATE_SEND_FAILED;
+                        rfu_STC_releaseFrame(slotStatusIndex, 0, &slotStatusNI->send);
+                        slotStatusNI->send.state = SLOT_STATE_SEND_FAILED;
                     }
-                    REG_IME = r8;
+                    REG_IME = imeBak;
                 }
             }
             else
@@ -1436,21 +1525,21 @@ u16 rfu_changeSendTarget(u8 connType, u8 slotStatusIndex, u8 bmNewTgtSlot)
     {
         if (connType == 16)
         {
-            s32 r3;
+            s32 bmSlot;
 
             if (gRfuSlotStatusUNI[slotStatusIndex]->send.state != SLOT_STATE_SEND_UNI)
                 return ERR_SLOT_NOT_SENDING;
-            for (r3 = 0, r2 = 0; r2 < RFU_CHILD_MAX; ++r2)
-                if (r2 != slotStatusIndex)
-                    r3 |= gRfuSlotStatusUNI[r2]->send.bmSlot;
-            if (bmNewTgtSlot & r3)
+            for (bmSlot = 0, i = 0; i < RFU_CHILD_MAX; ++i)
+                if (i != slotStatusIndex)
+                    bmSlot |= gRfuSlotStatusUNI[i]->send.bmSlot;
+            if (bmNewTgtSlot & bmSlot)
                 return ERR_SLOT_TARGET;
-            r8 = REG_IME;
+            imeBak = REG_IME;
             REG_IME = 0;
             gRfuLinkStatus->sendSlotUNIFlag &= ~gRfuSlotStatusUNI[slotStatusIndex]->send.bmSlot;
             gRfuLinkStatus->sendSlotUNIFlag |= bmNewTgtSlot;
             gRfuSlotStatusUNI[slotStatusIndex]->send.bmSlot = bmNewTgtSlot;
-            REG_IME = r8;
+            REG_IME = imeBak;
         }
         else
         {
@@ -1462,14 +1551,14 @@ u16 rfu_changeSendTarget(u8 connType, u8 slotStatusIndex, u8 bmNewTgtSlot)
 
 u16 rfu_NI_stopReceivingData(u8 slotStatusIndex)
 {
-    struct NIComm *r5;
-    u16 r4, r1;
+    struct NIComm *NI_comm;
+    u16 imeBak;
 
     if (slotStatusIndex >= RFU_CHILD_MAX)
         return ERR_SLOT_NO;
-    r5 = &gRfuSlotStatusNI[slotStatusIndex]->recv;
-    r4 = REG_IME;
-    ++r4; --r4; // fix r4, r5 register swap
+    NI_comm = &gRfuSlotStatusNI[slotStatusIndex]->recv;
+    imeBak = REG_IME;
+    ++imeBak; --imeBak; // fix imeBak, NI_comm register swap
     REG_IME = 0;
     if (gRfuSlotStatusNI[slotStatusIndex]->recv.state & SLOT_BUSY_FLAG)
     {
@@ -1478,43 +1567,43 @@ u16 rfu_NI_stopReceivingData(u8 slotStatusIndex)
         else
             gRfuSlotStatusNI[slotStatusIndex]->recv.state = SLOT_STATE_RECV_FAILED;
         gRfuLinkStatus->recvSlotNIFlag &= ~(1 << slotStatusIndex);
-        rfu_STC_releaseFrame(slotStatusIndex, 1, r5);
+        rfu_STC_releaseFrame(slotStatusIndex, 1, NI_comm);
     }
-    REG_IME = r4;
+    REG_IME = imeBak;
     return 0;
 }
 
 u16 rfu_UNI_changeAndReadySendData(u8 slotStatusIndex, const void *src, u8 size)
 {
-    struct UNISend *r4;
-    u8 *r6;
-    u16 r1;
-    u8 r3_;
+    struct UNISend *UNI_send;
+    u8 *frame_p;
+    u16 imeBak;
+    u8 frameEnd;
 
     if (slotStatusIndex >= RFU_CHILD_MAX)
         return ERR_SLOT_NO;
-    r4 = &gRfuSlotStatusUNI[slotStatusIndex]->send;
-    if (r4->state != SLOT_STATE_SEND_UNI)
+    UNI_send = &gRfuSlotStatusUNI[slotStatusIndex]->send;
+    if (UNI_send->state != SLOT_STATE_SEND_UNI)
         return ERR_SLOT_NOT_SENDING;
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
     {
-        r6 = &gRfuLinkStatus->remainLLFrameSizeParent;
-        r3_ = gRfuLinkStatus->remainLLFrameSizeParent + (u8)r4->payloadSize;
+        frame_p = &gRfuLinkStatus->remainLLFrameSizeParent;
+        frameEnd = gRfuLinkStatus->remainLLFrameSizeParent + (u8)UNI_send->payloadSize;
     }
     else
     {
-        r6 = &gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex];
-        r3_ = gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex] + (u8)r4->payloadSize;
+        frame_p = &gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex];
+        frameEnd = gRfuLinkStatus->remainLLFrameSizeChild[slotStatusIndex] + (u8)UNI_send->payloadSize;
     }
-    if (r3_ < size)
+    if (frameEnd < size)
         return ERR_SUBFRAME_SIZE;
-    r1 = REG_IME;
+    imeBak = REG_IME;
     REG_IME = 0;
-    r4->src = src;
-    *r6 = r3_ - size;
-    r4->payloadSize = size;
-    r4->dataReadyFlag = 1;
-    REG_IME = r1;
+    UNI_send->src = src;
+    *frame_p = frameEnd - size;
+    UNI_send->payloadSize = size;
+    UNI_send->dataReadyFlag = 1;
+    REG_IME = imeBak;
     return 0;
 }
 
@@ -1593,184 +1682,184 @@ void rfu_REQ_sendData(bool8 clockChangeFlag)
     }
 }
 
-static void rfu_CB_sendData(UNUSED u8 r0, u16 r7)
+static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult)
 {
-    u8 r6;
-    struct NIComm *r4;
+    u8 i;
+    struct NIComm *NI_comm;
 
-    if (r7 == 0)
+    if (reqResult == 0)
     {
-        for (r6 = 0; r6 < RFU_CHILD_MAX; ++r6)
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
         {
-            if (gRfuSlotStatusUNI[r6]->send.dataReadyFlag)
-                gRfuSlotStatusUNI[r6]->send.dataReadyFlag = 0;
-            r4 = &gRfuSlotStatusNI[r6]->send;
-            if (r4->state == SLOT_STATE_SEND_NULL)
+            if (gRfuSlotStatusUNI[i]->send.dataReadyFlag)
+                gRfuSlotStatusUNI[i]->send.dataReadyFlag = 0;
+            NI_comm = &gRfuSlotStatusNI[i]->send;
+            if (NI_comm->state == SLOT_STATE_SEND_NULL)
             {
-                rfu_STC_releaseFrame(r6, 0, r4);
-                gRfuLinkStatus->sendSlotNIFlag &= ~r4->bmSlot;
-                if (r4->dataType == 1)
-                    gRfuLinkStatus->getNameFlag |= 1 << r6;
-                r4->state = SLOT_STATE_SEND_SUCCESS;
+                rfu_STC_releaseFrame(i, 0, NI_comm);
+                gRfuLinkStatus->sendSlotNIFlag &= ~NI_comm->bmSlot;
+                if (NI_comm->dataType == 1)
+                    gRfuLinkStatus->getNameFlag |= 1 << i;
+                NI_comm->state = SLOT_STATE_SEND_SUCCESS;
             }
         }
     }
     gRfuLinkStatus->LLFReadyFlag = 0;
-    rfu_STC_REQ_callback(36, r7);
+    rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult);
 }
 
-static void rfu_CB_sendData2(UNUSED u8 r0, u16 r1)
+static void rfu_CB_sendData2(UNUSED u8 reqCommand, u16 reqResult)
 {
-    rfu_STC_REQ_callback(36, r1);
+    rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult);
 }
 
-static void rfu_CB_sendData3(u8 r0, u16 r1)
+static void rfu_CB_sendData3(u8 reqCommand, u16 reqResult)
 {
-    if (r1 != 0)
-        rfu_STC_REQ_callback(36, r1);
-    else if (r0 == 0xFF)
-        rfu_STC_REQ_callback(0xFF, 0);
+    if (reqResult != 0)
+        rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult);
+    else if (reqCommand == ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ)
+        rfu_STC_REQ_callback(ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ, 0);
 }
 
 static void rfu_constructSendLLFrame(void)
 {
-    u32 r8, r5;
-    u8 r6;
-    u8 *sp00;
-    struct RfuSlotStatusNI *r2;
+    u32 pakcketSize, currSize;
+    u8 i;
+    u8 *llf_p;
+    struct RfuSlotStatusNI *slotStatusNI;
 
     if (gRfuLinkStatus->parentChild != MODE_NEUTRAL
      && gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag | gRfuLinkStatus->sendSlotUNIFlag)
     {
         gRfuLinkStatus->LLFReadyFlag = 0;
-        r8 = 0;
-        sp00 = (u8 *)&gRfuFixed->LLFBuffer[1];
-        for (r6 = 0; r6 < RFU_CHILD_MAX; ++r6)
+        pakcketSize = 0;
+        llf_p = (u8 *)&gRfuFixed->LLFBuffer[1];
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
         {
-            r5 = 0;
-            if (gRfuSlotStatusNI[r6]->send.state & SLOT_BUSY_FLAG)
-                r5 = rfu_STC_NI_constructLLSF(r6, &sp00, &gRfuSlotStatusNI[r6]->send);
-            if (gRfuSlotStatusNI[r6]->recv.state & SLOT_BUSY_FLAG)
-                r5 += rfu_STC_NI_constructLLSF(r6, &sp00, &gRfuSlotStatusNI[r6]->recv);
-            if (gRfuSlotStatusUNI[r6]->send.state == SLOT_STATE_SEND_UNI)
-                r5 += rfu_STC_UNI_constructLLSF(r6, &sp00);
-            if (r5 != 0)
+            currSize = 0;
+            if (gRfuSlotStatusNI[i]->send.state & SLOT_BUSY_FLAG)
+                currSize = rfu_STC_NI_constructLLSF(i, &llf_p, &gRfuSlotStatusNI[i]->send);
+            if (gRfuSlotStatusNI[i]->recv.state & SLOT_BUSY_FLAG)
+                currSize += rfu_STC_NI_constructLLSF(i, &llf_p, &gRfuSlotStatusNI[i]->recv);
+            if (gRfuSlotStatusUNI[i]->send.state == SLOT_STATE_SEND_UNI)
+                currSize += rfu_STC_UNI_constructLLSF(i, &llf_p);
+            if (currSize != 0)
             {
                 if (gRfuLinkStatus->parentChild == MODE_PARENT)
-                    r8 += r5;
+                    pakcketSize += currSize;
                 else
-                    r8 |= r5 << (5 * r6 + 8);
+                    pakcketSize |= currSize << (5 * i + 8);
             }
         }
-        if (r8 != 0)
+        if (pakcketSize != 0)
         {
-            while ((u32)sp00 & 3)
-                *sp00++ = 0;
-            gRfuFixed->LLFBuffer[0] = r8;
+            while ((u32)llf_p & 3)
+                *llf_p++ = 0;
+            gRfuFixed->LLFBuffer[0] = pakcketSize;
             if (gRfuLinkStatus->parentChild == MODE_CHILD)
             {
-                u8 *r0 = sp00 - offsetof(struct RfuFixed, LLFBuffer[1]);
-                
-                // Does the volatile qualifier make sense? 
-                // It's the same as: 
+                u8 *maxSize = llf_p - offsetof(struct RfuFixed, LLFBuffer[1]);
+
+                // Does the volatile qualifier make sense?
+                // It's the same as:
                 // asm("":::"memory");
-                r8 = r0 - *(u8 *volatile *)&gRfuFixed;
+                pakcketSize = maxSize - *(u8 *volatile *)&gRfuFixed;
             }
         }
-        gRfuStatic->totalPacketSize = r8;
+        gRfuStatic->totalPacketSize = pakcketSize;
     }
 }
 
-static u16 rfu_STC_NI_constructLLSF(u8 r10, u8 **r12, struct NIComm *r4)
+static u16 rfu_STC_NI_constructLLSF(u8 bm_slot_id, u8 **dest_pp, struct NIComm *NI_comm)
 {
-    u16 r5;
-    u32 sp00;
+    u16 size;
+    u32 frame;
     u8 i;
-    u8 *r2;
-    const struct LLSFStruct *r8 = &llsf_struct[gRfuLinkStatus->parentChild];
+    u8 *frame8_p;
+    const struct LLSFStruct *llsf = &llsf_struct[gRfuLinkStatus->parentChild];
 
-    if (r4->state == SLOT_STATE_SENDING)
+    if (NI_comm->state == SLOT_STATE_SENDING)
     {
-        while (r4->now_p[r4->phase] >= (const u8 *)r4->src + r4->dataSize)
+        while (NI_comm->now_p[NI_comm->phase] >= (const u8 *)NI_comm->src + NI_comm->dataSize)
         {
-            ++r4->phase;
-            if (r4->phase == 4)
-                r4->phase = 0;
+            ++NI_comm->phase;
+            if (NI_comm->phase == 4)
+                NI_comm->phase = 0;
         }
     }
-    if (r4->state & SLOT_RECV_FLAG)
+    if (NI_comm->state & SLOT_RECV_FLAG)
     {
-        r5 = 0;
+        size = 0;
     }
-    else if (r4->state == SLOT_STATE_SENDING)
+    else if (NI_comm->state == SLOT_STATE_SENDING)
     {
-        if (r4->now_p[r4->phase] + r4->payloadSize > (const u8 *)r4->src + r4->dataSize)
-            r5 = (const u8 *)r4->src + r4->dataSize - r4->now_p[r4->phase];
+        if (NI_comm->now_p[NI_comm->phase] + NI_comm->payloadSize > (const u8 *)NI_comm->src + NI_comm->dataSize)
+            size = (const u8 *)NI_comm->src + NI_comm->dataSize - NI_comm->now_p[NI_comm->phase];
         else
-            r5 = r4->payloadSize;
+            size = NI_comm->payloadSize;
     }
     else
     {
-        if ((u32)r4->remainSize >= r4->payloadSize)
-            r5 = r4->payloadSize;
+        if ((u32)NI_comm->remainSize >= NI_comm->payloadSize)
+            size = NI_comm->payloadSize;
         else
-            r5 = r4->remainSize;
+            size = NI_comm->remainSize;
     }
-    sp00 = (r4->state & 0xF) << r8->unk03
-         | r4->ack << r8->unk04
-         | r4->phase << r8->unk05
-         | r4->n[r4->phase] << r8->unk06
-         | r5;
+    frame = (NI_comm->state & 0xF) << llsf->slotStateShift
+         | NI_comm->ack << llsf->ackShift
+         | NI_comm->phase << llsf->phaseShit
+         | NI_comm->n[NI_comm->phase] << llsf->nShift
+         | size;
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
-        sp00 |= r4->bmSlot << 18;
-    r2 = (u8 *)&sp00;
-    for (i = 0; i < r8->unk00; ++i)
-        *(*r12)++ = *r2++;
-    if (r5 != 0)
+        frame |= NI_comm->bmSlot << 18;
+    frame8_p = (u8 *)&frame;
+    for (i = 0; i < llsf->frameSize; ++i)
+        *(*dest_pp)++ = *frame8_p++;
+    if (size != 0)
     {
-        const u8 *sp04 = r4->now_p[r4->phase];
+        const u8 *src = NI_comm->now_p[NI_comm->phase];
 
-        gRfuFixed->fastCopyPtr(&sp04, r12, r5);
+        gRfuFixed->fastCopyPtr(&src, dest_pp, size);
     }
-    if (r4->state == SLOT_STATE_SENDING)
+    if (NI_comm->state == SLOT_STATE_SENDING)
     {
-        ++r4->phase;
-        if (r4->phase == 4)
-            r4->phase = 0;
+        ++NI_comm->phase;
+        if (NI_comm->phase == 4)
+            NI_comm->phase = 0;
     }
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
         gRfuLinkStatus->LLFReadyFlag = 1;
     else
-        gRfuLinkStatus->LLFReadyFlag |= 1 << r10;
-    return r5 + r8->unk00;
+        gRfuLinkStatus->LLFReadyFlag |= 1 << bm_slot_id;
+    return size + llsf->frameSize;
 }
 
-static u16 rfu_STC_UNI_constructLLSF(u8 r8, u8 **r6)
+static u16 rfu_STC_UNI_constructLLSF(u8 bm_slot_id, u8 **dest_p)
 {
-    const struct LLSFStruct *r5;
-    const u8 *sp04;
-    u32 sp00;
-    u8 *r2;
+    const struct LLSFStruct *llsf;
+    const u8 *src_p;
+    u32 frame;
+    u8 *frame8_p;
     u8 i;
-    struct UNISend *r4 = &gRfuSlotStatusUNI[r8]->send;
+    struct UNISend *UNI_send = &gRfuSlotStatusUNI[bm_slot_id]->send;
 
-    if (!r4->dataReadyFlag || !r4->bmSlot)
+    if (!UNI_send->dataReadyFlag || !UNI_send->bmSlot)
         return 0;
-    r5 = &llsf_struct[gRfuLinkStatus->parentChild];
-    sp00 = (r4->state & 0xF) << r5->unk03
-         | r4->payloadSize;
+    llsf = &llsf_struct[gRfuLinkStatus->parentChild];
+    frame = (UNI_send->state & 0xF) << llsf->slotStateShift
+         | UNI_send->payloadSize;
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
-        sp00 |= r4->bmSlot << 18;
-    r2 = (u8 *)&sp00;
-    for (i = 0; i < r5->unk00; ++i)
-        *(*r6)++ = *r2++;
-    sp04 = r4->src;
-    gRfuFixed->fastCopyPtr(&sp04, r6, r4->payloadSize);
+        frame |= UNI_send->bmSlot << 18;
+    frame8_p = (u8 *)&frame;
+    for (i = 0; i < llsf->frameSize; ++i)
+        *(*dest_p)++ = *frame8_p++;
+    src_p = UNI_send->src;
+    gRfuFixed->fastCopyPtr(&src_p, dest_p, UNI_send->payloadSize);
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
         gRfuLinkStatus->LLFReadyFlag = 16;
     else
-        gRfuLinkStatus->LLFReadyFlag |= 16 << r8;
-    return r5->unk00 + r4->payloadSize;
+        gRfuLinkStatus->LLFReadyFlag |= 16 << bm_slot_id;
+    return llsf->frameSize + UNI_send->payloadSize;
 }
 
 void rfu_REQ_recvData(void)
@@ -1784,434 +1873,433 @@ void rfu_REQ_recvData(void)
     }
 }
 
-static void rfu_CB_recvData(u8 r9, u16 r7)
+static void rfu_CB_recvData(u8 reqCommand, u16 reqResult)
 {
-    u8 r6;
-    struct RfuSlotStatusNI *r4;
-    struct NIComm *r5;
+    u8 i;
+    struct RfuSlotStatusNI *slotStatusNI;
+    struct NIComm *NI_comm;
 
-    if (r7 == 0 && gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[1])
+    if (reqResult == 0 && gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[1])
     {
         gRfuStatic->NIEndRecvFlag = 0;
         if (gRfuLinkStatus->parentChild == MODE_PARENT)
             rfu_STC_PARENT_analyzeRecvPacket();
         else
             rfu_STC_CHILD_analyzeRecvPacket();
-        for (r6 = 0; r6 < RFU_CHILD_MAX; ++r6)
+        for (i = 0; i < RFU_CHILD_MAX; ++i)
         {
-            r4 = gRfuSlotStatusNI[r6];
-            if (r4->recv.state == SLOT_STATE_RECV_LAST && !((gRfuStatic->NIEndRecvFlag >> r6) & 1))
+            slotStatusNI = gRfuSlotStatusNI[i];
+            if (slotStatusNI->recv.state == SLOT_STATE_RECV_LAST && !((gRfuStatic->NIEndRecvFlag >> i) & 1))
             {
-                r5 = &r4->recv;
-                if (r5->dataType == 1)
-                    gRfuLinkStatus->getNameFlag |= 1 << r6;
-                rfu_STC_releaseFrame(r6, 1, r5);
-                gRfuLinkStatus->recvSlotNIFlag &= ~r5->bmSlot;
-                r4->recv.state = SLOT_STATE_RECV_SUCCESS;
+                NI_comm = &slotStatusNI->recv;
+                if (NI_comm->dataType == 1)
+                    gRfuLinkStatus->getNameFlag |= 1 << i;
+                rfu_STC_releaseFrame(i, 1, NI_comm);
+                gRfuLinkStatus->recvSlotNIFlag &= ~NI_comm->bmSlot;
+                slotStatusNI->recv.state = SLOT_STATE_RECV_SUCCESS;
             }
         }
         if (gRfuStatic->recvErrorFlag)
-            r7 = gRfuStatic->recvErrorFlag | ERR_DATA_RECV;
+            reqResult = gRfuStatic->recvErrorFlag | ERR_DATA_RECV;
     }
-    rfu_STC_REQ_callback(r9, r7);
+    rfu_STC_REQ_callback(reqCommand, reqResult);
 }
 
 static void rfu_STC_PARENT_analyzeRecvPacket(void)
 {
-    u32 r3;
-    u8 r5;
-    u8 sp[4];
-    u8 *r6;
+    u32 frames32;
+    u8 bm_slot_id;
+    u8 frame_counts[RFU_CHILD_MAX];
+    u8 *packet_p;
 
-    r3 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] >> 8;
-    for (r5 = 0; r5 < NELEMS(sp); ++r5)
+    frames32 = gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket32.data[0] >> 8;
+    for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
     {
-        sp[r5] = r3 & 0x1F;
-        r3 >>= 5;
-        if (sp[r5] == 0)
-            gRfuStatic->NIEndRecvFlag |= 1 << r5;
+        frame_counts[bm_slot_id] = frames32 & 0x1F;
+        frames32 >>= 5;
+        if (frame_counts[bm_slot_id] == 0)
+            gRfuStatic->NIEndRecvFlag |= 1 << bm_slot_id;
     }
-    r6 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[8];
-    for (r5 = 0; r5 < NELEMS(sp); ++r5)
+    packet_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[8];
+    for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
     {
-        if (sp[r5])
+        if (frame_counts[bm_slot_id])
         {
-            u8 *r4 = &sp[r5];
+            u8 *frames_p = &frame_counts[bm_slot_id];
 
             do
             {
-                u8 r0 = rfu_STC_analyzeLLSF(r5, r6, *r4);
+                u8 analyzed_frames = rfu_STC_analyzeLLSF(bm_slot_id, packet_p, *frames_p);
 
-                r6 += r0;
-                *r4 -= r0;
-            } while (!(*r4 & 0x80) && (*r4));
+                packet_p += analyzed_frames;
+                *frames_p -= analyzed_frames;
+            } while (!(*frames_p & 0x80) && (*frames_p));
         }
     }
 }
 
 static void rfu_STC_CHILD_analyzeRecvPacket(void)
 {
-    u16 r4;
-    u8 *r5;
-    u16 r0;
+    u16 frames_remaining;
+    u8 *packet_p;
+    u16 analyzed_frames;
 
-    r4 = *(u16 *)&gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4] & 0x7F;
-    r5 = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[8];
-    if (r4 == 0)
+    frames_remaining = *(u16 *)&gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[4] & 0x7F;
+    packet_p = &gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[8];
+    if (frames_remaining == 0)
         gRfuStatic->NIEndRecvFlag = 15;
     do
     {
-        if (r4 == 0)
+        if (frames_remaining == 0)
             break;
-        r0 = rfu_STC_analyzeLLSF(0, r5, r4);
-        r5 += r0;
-        r4 -= r0;
-    } while (!(r4 & 0x8000));
-}
-
-static u16 rfu_STC_analyzeLLSF(u8 r12, const u8 *r7, u16 r3)
-{
-    struct RfuLocalStruct sp00;
-    const struct LLSFStruct *r6;
-    u32 r5;
-    u8 r4;
-    u32 r0;
-    u16 r10;
-
-    r6 = &llsf_struct[~gRfuLinkStatus->parentChild & (MODE_NEUTRAL & MODE_PARENT)];
-    if (r3 < r6->unk00)
-        return r3;
-    r5 = 0;
-    for (r4 = 0; r4 < r6->unk00; ++r4)
-        r5 |= *r7++ << 8 * r4;
-    sp00.unk00 = (r5 >> r6->unk01) & r6->unk07;
-    sp00.unk01 = (r5 >> r6->unk02) & r6->unk08;
-    sp00.unk02 = (r5 >> r6->unk03) & r6->unk09;
-    sp00.unk03 = (r5 >> r6->unk04) & r6->unk0A;
-    sp00.unk04 = (r5 >> r6->unk05) & r6->unk0B;
-    sp00.unk05 = (r5 >> r6->unk06) & r6->unk0C;
-    sp00.unk06 = (r5  & r6->unk0E) & r5;
-    r10 = sp00.unk06 + r6->unk00;
-    if (sp00.unk00 == 0)
+        analyzed_frames = rfu_STC_analyzeLLSF(0, packet_p, frames_remaining);
+        packet_p += analyzed_frames;
+        frames_remaining -= analyzed_frames;
+    } while (!(frames_remaining & 0x8000));
+}
+
+static u16 rfu_STC_analyzeLLSF(u8 slot_id, const u8 *src, u16 last_frame)
+{
+    struct RfuLocalStruct llsf_NI;
+    const struct LLSFStruct *llsf_p;
+    u32 frames;
+    u8 i;
+    u16 retVal;
+
+    llsf_p = &llsf_struct[~gRfuLinkStatus->parentChild & (MODE_NEUTRAL & MODE_PARENT)];
+    if (last_frame < llsf_p->frameSize)
+        return last_frame;
+    frames = 0;
+    for (i = 0; i < llsf_p->frameSize; ++i)
+        frames |= *src++ << 8 * i;
+    llsf_NI.recvFirst = (frames >> llsf_p->recvFirstShift) & llsf_p->recvFirstMask;
+    llsf_NI.connSlotFlag = (frames >> llsf_p->connSlotFlagShift) & llsf_p->connSlotFlagMask;
+    llsf_NI.slotState = (frames >> llsf_p->slotStateShift) & llsf_p->slotStateMask;
+    llsf_NI.ack = (frames >> llsf_p->ackShift) & llsf_p->ackMask;
+    llsf_NI.phase = (frames >> llsf_p->phaseShit) & llsf_p->phaseMask;
+    llsf_NI.n = (frames >> llsf_p->nShift) & llsf_p->nMask;
+    llsf_NI.frame = (frames  & llsf_p->framesMask) & frames;
+    retVal = llsf_NI.frame + llsf_p->frameSize;
+    if (llsf_NI.recvFirst == 0)
     {
         if (gRfuLinkStatus->parentChild == MODE_PARENT)
         {
-            if ((gRfuLinkStatus->connSlotFlag >> r12) & 1)
+            if ((gRfuLinkStatus->connSlotFlag >> slot_id) & 1)
             {
-                if (sp00.unk02 == 4)
+                if (llsf_NI.slotState == LCOM_UNI)
                 {
-                    rfu_STC_UNI_receive(r12, &sp00, r7);
+                    rfu_STC_UNI_receive(slot_id, &llsf_NI, src);
                 }
-                else if (sp00.unk03 == 0)
+                else if (llsf_NI.ack == 0)
                 {
-                    rfu_STC_NI_receive_Receiver(r12, &sp00, r7);
+                    rfu_STC_NI_receive_Receiver(slot_id, &llsf_NI, src);
                 }
                 else
                 {
-                    for (r4 = 0; r4 < RFU_CHILD_MAX; ++r4)
-                        if (((gRfuSlotStatusNI[r4]->send.bmSlot >> r12) & 1)
-                         && ((gRfuLinkStatus->sendSlotNIFlag >> r12) & 1))
+                    for (i = 0; i < RFU_CHILD_MAX; ++i)
+                        if (((gRfuSlotStatusNI[i]->send.bmSlot >> slot_id) & 1)
+                         && ((gRfuLinkStatus->sendSlotNIFlag >> slot_id) & 1))
                             break;
-                    if (r4 <= 3)
-                        rfu_STC_NI_receive_Sender(r4, r12, &sp00, r7);
+                    if (i < RFU_CHILD_MAX)
+                        rfu_STC_NI_receive_Sender(i, slot_id, &llsf_NI, src);
                 }
             }
         }
         else
         {
-            s32 r5 = gRfuLinkStatus->connSlotFlag & sp00.unk01;
+            s32 conSlots = gRfuLinkStatus->connSlotFlag & llsf_NI.connSlotFlag;
 
-            if (r5)
+            if (conSlots)
             {
-                for (r4 = 0; r4 < RFU_CHILD_MAX; ++r4)
+                for (i = 0; i < RFU_CHILD_MAX; ++i)
                 {
-                    if ((r5 >> r4) & 1)
+                    if ((conSlots >> i) & 1)
                     {
-                        if (sp00.unk02 == 4)
-                            rfu_STC_UNI_receive(r4, &sp00, r7);
-                        else if (sp00.unk03 == 0)
-                            rfu_STC_NI_receive_Receiver(r4, &sp00, r7);
-                        else if ((gRfuLinkStatus->sendSlotNIFlag >> r4) & 1)
-                            rfu_STC_NI_receive_Sender(r4, r4, &sp00, r7);
+                        if (llsf_NI.slotState == LCOM_UNI)
+                            rfu_STC_UNI_receive(i, &llsf_NI, src);
+                        else if (llsf_NI.ack == 0)
+                            rfu_STC_NI_receive_Receiver(i, &llsf_NI, src);
+                        else if ((gRfuLinkStatus->sendSlotNIFlag >> i) & 1)
+                            rfu_STC_NI_receive_Sender(i, i, &llsf_NI, src);
                     }
                 }
             }
         }
     }
-    return r10;
+    return retVal;
 }
 
-static void rfu_STC_UNI_receive(u8 r7, const struct RfuLocalStruct *r6, const u8 *sp00)
+static void rfu_STC_UNI_receive(u8 bm_slot_id, const struct RfuLocalStruct *llsf_NI, const u8 *src)
 {
-    u8 *sp04;
-    u32 r2;
-    struct RfuSlotStatusUNI *r3 = gRfuSlotStatusUNI[r7];
-    struct UNIRecv *r5 = &r3->recv;
+    u8 *dest;
+    u32 size;
+    struct RfuSlotStatusUNI *slotStatusUNI = gRfuSlotStatusUNI[bm_slot_id];
+    struct UNIRecv *UNI_recv = &slotStatusUNI->recv;
 
-    r5->errorCode = 0;
-    if (gRfuSlotStatusUNI[r7]->recvBufferSize < r6->unk06)
+    UNI_recv->errorCode = 0;
+    if (gRfuSlotStatusUNI[bm_slot_id]->recvBufferSize < llsf_NI->frame)
     {
-        r3->recv.state = SLOT_STATE_RECV_IGNORE;
-        r5->errorCode = ERR_RECV_BUFF_OVER;
+        slotStatusUNI->recv.state = SLOT_STATE_RECV_IGNORE;
+        UNI_recv->errorCode = ERR_RECV_BUFF_OVER;
     }
     else
-    { 
-        if (r5->dataBlockFlag)
+    {
+        if (UNI_recv->dataBlockFlag)
         {
-            if (r5->newDataFlag)
+            if (UNI_recv->newDataFlag)
             {
-                r5->errorCode = ERR_RECV_UNK;
-                goto _081E2F0E;
+                UNI_recv->errorCode = ERR_RECV_UNK;
+                goto force_tail_merge;
             }
         }
         else
         {
-            if (r5->newDataFlag)
-                r5->errorCode = ERR_RECV_DATA_OVERWRITED;
+            if (UNI_recv->newDataFlag)
+                UNI_recv->errorCode = ERR_RECV_DATA_OVERWRITED;
         }
-        r5->state = SLOT_STATE_RECEIVING;
-        r2 = r5->dataSize = r6->unk06;
-        sp04 = gRfuSlotStatusUNI[r7]->recvBuffer;
-        gRfuFixed->fastCopyPtr(&sp00, &sp04, r2);
-        r5->newDataFlag = 1;
-        r5->state = 0;
+        UNI_recv->state = SLOT_STATE_RECEIVING;
+        size = UNI_recv->dataSize = llsf_NI->frame;
+        dest = gRfuSlotStatusUNI[bm_slot_id]->recvBuffer;
+        gRfuFixed->fastCopyPtr(&src, &dest, size);
+        UNI_recv->newDataFlag = 1;
+        UNI_recv->state = 0;
     }
-_081E2F0E:
-    if (r5->errorCode)
-        gRfuStatic->recvErrorFlag |= 16 << r7;
+force_tail_merge:
+    if (UNI_recv->errorCode)
+        gRfuStatic->recvErrorFlag |= 16 << bm_slot_id;
 }
 
-static void rfu_STC_NI_receive_Sender(u8 r0, u8 r10, const struct RfuLocalStruct *r6, const u8 *r3)
+static void rfu_STC_NI_receive_Sender(u8 NI_slot, u8 bm_flag, const struct RfuLocalStruct *llsf_NI, const u8 *data_p)
 {
-    struct NIComm *r12 = &gRfuSlotStatusNI[r0]->send;
-    u16 r9 = r12->state;
-    u8 sp00 = r12->n[r6->unk04];
-    u8 *r8;
-    u8 r4;
-    u16 r2;
+    struct NIComm *NI_comm = &gRfuSlotStatusNI[NI_slot]->send;
+    u16 state = NI_comm->state;
+    u8 n = NI_comm->n[llsf_NI->phase];
+    u8 i;
+    u16 imeBak;
 
-    if ((r6->unk02 == 2 && r9 == SLOT_STATE_SENDING)
-     || (r6->unk02 == 1 && r9 == SLOT_STATE_SEND_START)
-     || (r6->unk02 == 3 && r9 == SLOT_STATE_SEND_LAST))
+    if ((llsf_NI->slotState == LCOM_NI && state == SLOT_STATE_SENDING)
+     || (llsf_NI->slotState == LCOM_NI_START && state == SLOT_STATE_SEND_START)
+     || (llsf_NI->slotState == LCOM_NI_END && state == SLOT_STATE_SEND_LAST))
     {
-        if (r12->n[r6->unk04] == r6->unk05)
-            r12->recvAckFlag[r6->unk04] |= 1 << r10;
+        if (NI_comm->n[llsf_NI->phase] == llsf_NI->n)
+            NI_comm->recvAckFlag[llsf_NI->phase] |= 1 << bm_flag;
     }
-    if ((r12->recvAckFlag[r6->unk04] & r12->bmSlot) == r12->bmSlot)
+    if ((NI_comm->recvAckFlag[llsf_NI->phase] & NI_comm->bmSlot) == NI_comm->bmSlot)
     {
-        r12->n[r6->unk04] = (r12->n[r6->unk04] + 1) & 3;
-        r12->recvAckFlag[r6->unk04] = 0;
-        if ((u16)(r12->state + ~SLOT_STATE_SEND_NULL) <= 1)
+        NI_comm->n[llsf_NI->phase] = (NI_comm->n[llsf_NI->phase] + 1) & 3;
+        NI_comm->recvAckFlag[llsf_NI->phase] = 0;
+        if ((u16)(NI_comm->state + ~SLOT_STATE_SEND_NULL) <= 1)
         {
-            if (r12->state == SLOT_STATE_SEND_START)
-                r12->now_p[r6->unk04] += r12->payloadSize;
+            if (NI_comm->state == SLOT_STATE_SEND_START)
+                NI_comm->now_p[llsf_NI->phase] += NI_comm->payloadSize;
             else
-                r12->now_p[r6->unk04] += r12->payloadSize << 2;
-            r12->remainSize -= r12->payloadSize;
-            if (r12->remainSize != 0)
-                if (r12->remainSize >= 0)
+                NI_comm->now_p[llsf_NI->phase] += NI_comm->payloadSize << 2;
+            NI_comm->remainSize -= NI_comm->payloadSize;
+            if (NI_comm->remainSize != 0)
+                if (NI_comm->remainSize >= 0)
                     goto _081E30AE;
-            // Above is a hack to avoid optimization over comparison. 
-            // rfu_STC_NI_constructLLSF uses this field as u32. 
-            // It's equivalent to the following condition: 
-            // if (r12->remainSize == 0 || r12->remainSize < 0)
-            {
-                r12->phase = 0;
-                if (r12->state == SLOT_STATE_SEND_START)
+            // Above is a hack to avoid optimization over comparison.
+            // rfu_STC_NI_constructLLSF uses this field as u32.
+            // It's equivalent to the following condition:
+            // if (NI_comm->remainSize == 0 || NI_comm->remainSize < 0)
                 {
-                    for (r4 = 0; r4 < WINDOW_COUNT; ++r4)
+                    NI_comm->phase = 0;
+                    if (NI_comm->state == SLOT_STATE_SEND_START)
                     {
-                        r12->n[r4] = 1;
-                        r12->now_p[r4] = r12->src + r12->payloadSize * r4;
+                        for (i = 0; i < WINDOW_COUNT; ++i)
+                        {
+                            NI_comm->n[i] = 1;
+                            NI_comm->now_p[i] = NI_comm->src + NI_comm->payloadSize * i;
+                        }
+                        NI_comm->remainSize = NI_comm->dataSize;
+                        NI_comm->state = SLOT_STATE_SENDING;
+                    }
+                    else
+                    {
+                        NI_comm->n[0] = 0;
+                        NI_comm->remainSize = 0;
+                        NI_comm->state = SLOT_STATE_SEND_LAST;
                     }
-                    r12->remainSize = r12->dataSize;
-                    r12->state = SLOT_STATE_SENDING;
-                }
-                else
-                {
-                    r12->n[0] = 0;
-                    r12->remainSize = 0;
-                    r12->state = SLOT_STATE_SEND_LAST;
                 }
-            }
         _081E30AE:
+            ;
         }
-        else if (r12->state == SLOT_STATE_SEND_LAST)
+        else if (NI_comm->state == SLOT_STATE_SEND_LAST)
         {
-            r12->state = SLOT_STATE_SEND_NULL;
+            NI_comm->state = SLOT_STATE_SEND_NULL;
         }
     }
-    if (r12->state != r9
-     || r12->n[r6->unk04] != sp00
-     || (r12->recvAckFlag[r6->unk04] >> r10) & 1)
+    if (NI_comm->state != state
+     || NI_comm->n[llsf_NI->phase] != n
+     || (NI_comm->recvAckFlag[llsf_NI->phase] >> bm_flag) & 1)
     {
-        r2 = REG_IME;
+        imeBak = REG_IME;
         REG_IME = 0;
-        gRfuStatic->recvRenewalFlag |= 16 << r10;
-        gRfuSlotStatusNI[r10]->send.failCounter = 0;
-        REG_IME = r2;
+        gRfuStatic->recvRenewalFlag |= 16 << bm_flag;
+        gRfuSlotStatusNI[bm_flag]->send.failCounter = 0;
+        REG_IME = imeBak;
     }
 }
 
-static void rfu_STC_NI_receive_Receiver(u8 r8, const struct RfuLocalStruct *r6, const u8 *sp00)
+static void rfu_STC_NI_receive_Receiver(u8 bm_slot_id, const struct RfuLocalStruct *llsf_NI, const u8 *data_p)
 {
-    u16 r2;
-    u32 r7 = 0;
-    struct RfuSlotStatusNI *r4 = gRfuSlotStatusNI[r8];
-    struct NIComm *r5 = &r4->recv;
-    u16 r9 = r4->recv.state;
-    u8 r10 = r4->recv.n[r6->unk04];
+    u16 imeBak;
+    u32 state_check = 0;
+    struct RfuSlotStatusNI *slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
+    struct NIComm *recvSlot = &slotStatus_NI->recv;
+    u16 state = slotStatus_NI->recv.state;
+    u8 n = slotStatus_NI->recv.n[llsf_NI->phase];
 
-    if (r6->unk02 == 3)
+    if (llsf_NI->slotState == LCOM_NI_END)
     {
-        gRfuStatic->NIEndRecvFlag |= 1 << r8;
-        if (r4->recv.state == SLOT_STATE_RECEIVING)
+        gRfuStatic->NIEndRecvFlag |= 1 << bm_slot_id;
+        if (slotStatus_NI->recv.state == SLOT_STATE_RECEIVING)
         {
-            r4->recv.phase = 0;
-            r4->recv.n[0] = 0;
-            r4->recv.state = SLOT_STATE_RECV_LAST;
+            slotStatus_NI->recv.phase = 0;
+            slotStatus_NI->recv.n[0] = 0;
+            slotStatus_NI->recv.state = SLOT_STATE_RECV_LAST;
         }
     }
-    else if (r6->unk02 == 2)
+    else if (llsf_NI->slotState == LCOM_NI)
     {
-        if (r9 == SLOT_STATE_RECV_START && !r5->remainSize)
-            rfu_STC_NI_initSlot_asRecvDataEntity(r8, r5);
-        if (r5->state == SLOT_STATE_RECEIVING)
-            r7 = 1;
+        if (state == SLOT_STATE_RECV_START && !recvSlot->remainSize)
+            rfu_STC_NI_initSlot_asRecvDataEntity(bm_slot_id, recvSlot);
+        if (recvSlot->state == SLOT_STATE_RECEIVING)
+            state_check = 1;
     }
-    else if (r6->unk02 == 1)
+    else if (llsf_NI->slotState == LCOM_NI_START)
     {
-        if (r9 == SLOT_STATE_RECV_START)
+        if (state == SLOT_STATE_RECV_START)
         {
-            r7 = 1;
+            state_check = 1;
         }
         else
         {
-            rfu_STC_NI_initSlot_asRecvControllData(r8, r5);
-            if (r4->recv.state != SLOT_STATE_RECV_START)
+            rfu_STC_NI_initSlot_asRecvControllData(bm_slot_id, recvSlot);
+            if (slotStatus_NI->recv.state != SLOT_STATE_RECV_START)
                 return;
-            r7 = 1;
+            state_check = 1;
         }
     }
-    if (r7 != 0)
+    if (state_check != 0)
     {
-        if (r6->unk05 == ((r5->n[r6->unk04] + 1) & 3))
+        if (llsf_NI->n == ((recvSlot->n[llsf_NI->phase] + 1) & 3))
         {
-            gRfuFixed->fastCopyPtr(&sp00, (u8 **)&r5->now_p[r6->unk04], r6->unk06);
-            if (r5->state == SLOT_STATE_RECEIVING)
-                r5->now_p[r6->unk04] += 3 * r5->payloadSize;
-            r5->remainSize -= r6->unk06;
-            r5->n[r6->unk04] = r6->unk05;
+            gRfuFixed->fastCopyPtr(&data_p, (u8 **)&recvSlot->now_p[llsf_NI->phase], llsf_NI->frame);
+            if (recvSlot->state == SLOT_STATE_RECEIVING)
+                recvSlot->now_p[llsf_NI->phase] += 3 * recvSlot->payloadSize;
+            recvSlot->remainSize -= llsf_NI->frame;
+            recvSlot->n[llsf_NI->phase] = llsf_NI->n;
         }
     }
-    if (r5->errorCode == 0)
+    if (recvSlot->errorCode == 0)
     {
-        r5->phase = r6->unk04;
-        if (r5->state != r9 || r5->n[r6->unk04] != r10 || r5->n[r6->unk04] == r6->unk05)
+        recvSlot->phase = llsf_NI->phase;
+        if (recvSlot->state != state || recvSlot->n[llsf_NI->phase] != n || recvSlot->n[llsf_NI->phase] == llsf_NI->n)
         {
-            r2 = REG_IME;
+            imeBak = REG_IME;
             REG_IME = 0;
-            gRfuStatic->recvRenewalFlag |= 1 << r8;
-            r5->failCounter = 0;
-            REG_IME = r2;
+            gRfuStatic->recvRenewalFlag |= 1 << bm_slot_id;
+            recvSlot->failCounter = 0;
+            REG_IME = imeBak;
         }
     }
 }
 
-static void rfu_STC_NI_initSlot_asRecvControllData(u8 r4, struct NIComm *r2)
+static void rfu_STC_NI_initSlot_asRecvControllData(u8 bm_slot_id, struct NIComm *NI_comm)
 {
-    u8 *r1;
-    u32 r5;
-    u8 r6;
+    u8 *llFrameSize_p;
+    u32 llFrameSize;
+    u8 bm_slot_flag;
 
     if (gRfuLinkStatus->parentChild == MODE_PARENT)
     {
-        r5 = 3;
-        r1 = &gRfuLinkStatus->remainLLFrameSizeParent;
+        llFrameSize = 3;
+        llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeParent;
     }
     else
     {
-        r5 = 2;
-        r1 = &gRfuLinkStatus->remainLLFrameSizeChild[r4];
+        llFrameSize = 2;
+        llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id];
     }
-    r6 = 1 << r4;
-    if (r2->state == 0)
+    bm_slot_flag = 1 << bm_slot_id;
+    if (NI_comm->state == 0)
     {
-        if (*r1 < r5)
+        if (*llFrameSize_p < llFrameSize)
         {
-            r2->state = SLOT_STATE_RECV_IGNORE;
-            r2->errorCode = ERR_RECV_REPLY_SUBFRAME_SIZE;
-            gRfuStatic->recvErrorFlag |= r6;
+            NI_comm->state = SLOT_STATE_RECV_IGNORE;
+            NI_comm->errorCode = ERR_RECV_REPLY_SUBFRAME_SIZE;
+            gRfuStatic->recvErrorFlag |= bm_slot_flag;
         }
         else
         {
-            r2->errorCode = 0;
-            *r1 -= r5;
-            r2->now_p[0] = &r2->dataType;
-            r2->remainSize = 7;
-            r2->ack = 1;
-            r2->payloadSize = 0;
-            r2->bmSlot = r6;
-            r2->state = SLOT_STATE_RECV_START;
-            gRfuLinkStatus->recvSlotNIFlag |= r6;
+            NI_comm->errorCode = 0;
+            *llFrameSize_p -= llFrameSize;
+            NI_comm->now_p[0] = &NI_comm->dataType;
+            NI_comm->remainSize = 7;
+            NI_comm->ack = 1;
+            NI_comm->payloadSize = 0;
+            NI_comm->bmSlot = bm_slot_flag;
+            NI_comm->state = SLOT_STATE_RECV_START;
+            gRfuLinkStatus->recvSlotNIFlag |= bm_slot_flag;
         }
     }
 }
 
-static void rfu_STC_NI_initSlot_asRecvDataEntity(u8 r5, struct NIComm *r4)
+static void rfu_STC_NI_initSlot_asRecvDataEntity(u8 bm_slot_id, struct NIComm *NI_comm)
 {
-    u8 r1, r3;
+    u8 bm_slot_flag, win_id;
 
-    if (r4->dataType == 1)
+    if (NI_comm->dataType == 1)
     {
-        r4->now_p[0] = (void *)&gRfuLinkStatus->partner[r5].serialNo;
+        NI_comm->now_p[0] = (void *)&gRfuLinkStatus->partner[bm_slot_id].serialNo;
     }
     else
     {
-        if (r4->dataSize > gRfuSlotStatusNI[r5]->recvBufferSize)
+        if (NI_comm->dataSize > gRfuSlotStatusNI[bm_slot_id]->recvBufferSize)
         {
-            r1 = 1 << r5;
-            gRfuStatic->recvErrorFlag |= r1;
-            gRfuLinkStatus->recvSlotNIFlag &= ~r1;
-            r4->errorCode = ERR_RECV_BUFF_OVER;
-            r4->state = SLOT_STATE_RECV_FAILED;
-            rfu_STC_releaseFrame(r5, 1, r4);
+            bm_slot_flag = 1 << bm_slot_id;
+            gRfuStatic->recvErrorFlag |= bm_slot_flag;
+            gRfuLinkStatus->recvSlotNIFlag &= ~bm_slot_flag;
+            NI_comm->errorCode = ERR_RECV_BUFF_OVER;
+            NI_comm->state = SLOT_STATE_RECV_FAILED;
+            rfu_STC_releaseFrame(bm_slot_id, 1, NI_comm);
             return;
         }
-        r4->now_p[0] = gRfuSlotStatusNI[r5]->recvBuffer;
+        NI_comm->now_p[0] = gRfuSlotStatusNI[bm_slot_id]->recvBuffer;
     }
-    for (r3 = 0; r3 < WINDOW_COUNT; ++r3)
+    for (win_id = 0; win_id < WINDOW_COUNT; ++win_id)
     {
-        r4->n[r3] = 0;
-        r4->now_p[r3] = &r4->now_p[0][r4->payloadSize * r3];
+        NI_comm->n[win_id] = 0;
+        NI_comm->now_p[win_id] = &NI_comm->now_p[0][NI_comm->payloadSize * win_id];
     }
-    r4->remainSize = r4->dataSize;
-    r4->state = SLOT_STATE_RECEIVING;
+    NI_comm->remainSize = NI_comm->dataSize;
+    NI_comm->state = SLOT_STATE_RECEIVING;
 }
 
 static void rfu_NI_checkCommFailCounter(void)
 {
-    u16 r12;
-    u32 r7;
-    u8 r2, r3;
+    u16 imeBak;
+    u32 recvRenewalFlag;
+    u8 bm_slot_flag, bm_slot_id;
 
     if (gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag)
     {
-        r12 = REG_IME;
+        imeBak = REG_IME;
         REG_IME = 0;
-        r7 = gRfuStatic->recvRenewalFlag >> 4;
-        for (r3 = 0; r3 < RFU_CHILD_MAX; ++r3)
+        recvRenewalFlag = gRfuStatic->recvRenewalFlag >> 4;
+        for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
         {
-            r2 = 1 << r3;
-            if (gRfuLinkStatus->sendSlotNIFlag & r2
-             && !(gRfuStatic->recvRenewalFlag & r2))
-                ++gRfuSlotStatusNI[r3]->send.failCounter;
-            if (gRfuLinkStatus->recvSlotNIFlag & r2
-             && !(r7 & r2))
-                ++gRfuSlotStatusNI[r3]->recv.failCounter;
+            bm_slot_flag = 1 << bm_slot_id;
+            if (gRfuLinkStatus->sendSlotNIFlag & bm_slot_flag
+             && !(gRfuStatic->recvRenewalFlag & bm_slot_flag))
+                ++gRfuSlotStatusNI[bm_slot_id]->send.failCounter;
+            if (gRfuLinkStatus->recvSlotNIFlag & bm_slot_flag
+             && !(recvRenewalFlag & bm_slot_flag))
+                ++gRfuSlotStatusNI[bm_slot_id]->recv.failCounter;
         }
         gRfuStatic->recvRenewalFlag = 0;
-        REG_IME = r12;
+        REG_IME = imeBak;
     }
 }
 
diff --git a/src/librfu_sio32id.c b/src/librfu_sio32id.c
index fc5701986..b6623540f 100644
--- a/src/librfu_sio32id.c
+++ b/src/librfu_sio32id.c
@@ -4,44 +4,56 @@ static void Sio32IDIntr(void);
 static void Sio32IDInit(void);
 static s32 Sio32IDMain(void);
 
+struct RfuSIO32Id
+{
+    u8 MS_mode;
+    u8 state;
+    u16 count;
+    u16 send_id;
+    u16 recv_id;
+    u16 unk8; // unused
+    u16 lastId;
+};
+
 struct RfuSIO32Id gRfuSIO32Id;
 
 static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO
 static const char Sio32IDLib_Var[] = "Sio32ID_030820";
 
-s32 AgbRFU_checkID(u8 r5)
+s32 AgbRFU_checkID(u8 maxTries)
 {
-    u16 r8;
-    vu16 *r4;
-    s32 r6;
+    u16 ieBak;
+    vu16 *regTMCNTL;
+    s32 id;
 
+    // Interrupts must be enabled
     if (REG_IME == 0)
         return -1;
-    r8 = REG_IE;
+    ieBak = REG_IE;
     gSTWIStatus->state = 10;
     STWI_set_Callback_ID(Sio32IDIntr);
     Sio32IDInit();
-    r4 = &REG_TMCNT_L(gSTWIStatus->timerSelect);
-    r5 *= 8;
-    while (--r5 != 0xFF)
+    regTMCNTL = &REG_TMCNT_L(gSTWIStatus->timerSelect);
+    maxTries *= 8;
+    while (--maxTries != 0xFF)
     {
-        r6 = Sio32IDMain();
-        if (r6 != 0)
+        id = Sio32IDMain();
+        if (id != 0)
             break;
-        r4[1] = 0;
-        r4[0] = 0;
-        r4[1] = TIMER_1024CLK | TIMER_ENABLE;
-        while (r4[0] < 32)
+        regTMCNTL[1] = 0;
+        regTMCNTL[0] = 0;
+        regTMCNTL[1] = TIMER_1024CLK | TIMER_ENABLE;
+        while (regTMCNTL[0] < 32)
             ;
-        r4[1] = 0;
-        r4[0] = 0;
+        regTMCNTL[1] = 0;
+        regTMCNTL[0] = 0;
     }
     REG_IME = 0;
-    REG_IE = r8;
+    REG_IE = ieBak;
     REG_IME = 1;
     gSTWIStatus->state = 0;
     STWI_set_Callback_ID(NULL);
-    return r6;
+    return id;
 }
 
 static void Sio32IDInit(void)
@@ -58,107 +70,105 @@ static void Sio32IDInit(void)
 
 static s32 Sio32IDMain(void)
 {
-    u8 r12;
-
-    switch (r12 = gRfuSIO32Id.unk1)
+    switch (gRfuSIO32Id.state)
     {
     case 0:
-        gRfuSIO32Id.unk0 = 1;
+        gRfuSIO32Id.MS_mode = AGB_CLK_MASTER;
         REG_SIOCNT |= SIO_38400_BPS;
-        REG_IME = r12;
+        REG_IME = 0;
         REG_IE |= INTR_FLAG_SERIAL;
         REG_IME = 1;
-        gRfuSIO32Id.unk1 = 1;
+        gRfuSIO32Id.state = 1;
         *(vu8 *)&REG_SIOCNT |= SIO_ENABLE;
         break;
     case 1:
-        if (gRfuSIO32Id.unkA == 0)
+        if (gRfuSIO32Id.lastId == 0)
         {
-            if (gRfuSIO32Id.unk0 == 1)
+            if (gRfuSIO32Id.MS_mode == AGB_CLK_MASTER)
             {
-                if (gRfuSIO32Id.unk2 == 0)
+                if (gRfuSIO32Id.count == 0)
                 {
-                    REG_IME = gRfuSIO32Id.unk2;
+                    REG_IME = 0;
                     REG_SIOCNT |= SIO_ENABLE;
-                    REG_IME = r12;
+                    REG_IME = 1;
                 }
             }
-            else if (gRfuSIO32Id.unk4 != 0x8001 && !gRfuSIO32Id.unk2)
+            else if (gRfuSIO32Id.send_id != RFU_ID && !gRfuSIO32Id.count)
             {
-                REG_IME = gRfuSIO32Id.unk2;
+                REG_IME = 0;
                 REG_IE &= ~INTR_FLAG_SERIAL;
-                REG_IME = r12;
-                REG_SIOCNT = gRfuSIO32Id.unk2;
+                REG_IME = 1;
+                REG_SIOCNT = 0;
                 REG_SIOCNT = SIO_32BIT_MODE;
                 REG_IF = INTR_FLAG_SERIAL;
                 REG_SIOCNT |= SIO_INTR_ENABLE | SIO_ENABLE;
-                REG_IME = gRfuSIO32Id.unk2;
+                REG_IME = 0;
                 REG_IE |= INTR_FLAG_SERIAL;
-                REG_IME = r12;
+                REG_IME = 1;
             }
             break;
         }
         else
         {
-            gRfuSIO32Id.unk1 = 2;
+            gRfuSIO32Id.state = 2;
             // fallthrough
         }
     default:
-        return gRfuSIO32Id.unkA;
+        return gRfuSIO32Id.lastId;
     }
     return 0;
 }
 
 static void Sio32IDIntr(void)
 {
-    u32 r5;
-    u16 r0;
+    u32 regSIODATA32;
+    u16 delay;
 #ifndef NONMATCHING
-    register u32 r1 asm("r1");
-    register u16 r0_ asm("r0");
+    register u32 rfuSIO32IdUnk0_times_16 asm("r1");
+    register u16 negRfuSIO32IdUnk6 asm("r0");
 #else
-    u32 r1;
-    u16 r0_;
+    u32 rfuSIO32IdUnk0_times_16;
+    u16 negRfuSIO32IdUnk6;
 #endif
 
-    r5 = REG_SIODATA32;
-    if (gRfuSIO32Id.unk0 != 1)
+    regSIODATA32 = REG_SIODATA32;
+    if (gRfuSIO32Id.MS_mode != AGB_CLK_MASTER)
         REG_SIOCNT |= SIO_ENABLE;
-    r1 = 16 * gRfuSIO32Id.unk0; // to handle side effect of inline asm
-    r1 = (r5 << r1) >> 16;
-    r5 = (r5 << 16 * (1 - gRfuSIO32Id.unk0)) >> 16;
-    if (gRfuSIO32Id.unkA == 0)
+    rfuSIO32IdUnk0_times_16 = 16 * gRfuSIO32Id.MS_mode; // to handle side effect of inline asm
+    rfuSIO32IdUnk0_times_16 = (regSIODATA32 << rfuSIO32IdUnk0_times_16) >> 16;
+    regSIODATA32 = (regSIODATA32 << 16 * (1 - gRfuSIO32Id.MS_mode)) >> 16;
+    if (gRfuSIO32Id.lastId == 0)
     {
-        if (r1 == gRfuSIO32Id.unk6)
+        if (rfuSIO32IdUnk0_times_16 == gRfuSIO32Id.recv_id)
         {
-            if (gRfuSIO32Id.unk2 > 3)
+            if (gRfuSIO32Id.count > 3)
             {
-                gRfuSIO32Id.unkA = r5;
+                gRfuSIO32Id.lastId = regSIODATA32;
             }
-            else if (r1 == (u16)~gRfuSIO32Id.unk4)
+            else if (rfuSIO32IdUnk0_times_16 == (u16)~gRfuSIO32Id.send_id)
             {
-                r0_ = ~gRfuSIO32Id.unk6;
-                if (r5 == r0_)
-                    ++gRfuSIO32Id.unk2;
+                negRfuSIO32IdUnk6 = ~gRfuSIO32Id.recv_id;
+                if (regSIODATA32 == negRfuSIO32IdUnk6)
+                    ++gRfuSIO32Id.count;
             }
         }
         else
         {
-            gRfuSIO32Id.unk2 = gRfuSIO32Id.unkA;
+            gRfuSIO32Id.count = 0;
         }
     }
-    if (gRfuSIO32Id.unk2 < 4)
-        gRfuSIO32Id.unk4 = *(gRfuSIO32Id.unk2 + Sio32ConnectionData);
+    if (gRfuSIO32Id.count < 4)
+        gRfuSIO32Id.send_id = *(gRfuSIO32Id.count + Sio32ConnectionData);
     else
-        gRfuSIO32Id.unk4 = 0x8001;
-    gRfuSIO32Id.unk6 = ~r5;
-    REG_SIODATA32 = (gRfuSIO32Id.unk4 << 16 * (1 - gRfuSIO32Id.unk0))
-                  + (gRfuSIO32Id.unk6 << 16 * gRfuSIO32Id.unk0);
-    if (gRfuSIO32Id.unk0 == 1 && (gRfuSIO32Id.unk2 || r5 == 0x494E))
+        gRfuSIO32Id.send_id = RFU_ID;
+    gRfuSIO32Id.recv_id = ~regSIODATA32;
+    REG_SIODATA32 = (gRfuSIO32Id.send_id << 16 * (1 - gRfuSIO32Id.MS_mode))
+                  + (gRfuSIO32Id.recv_id << 16 * gRfuSIO32Id.MS_mode);
+    if (gRfuSIO32Id.MS_mode == AGB_CLK_MASTER && (gRfuSIO32Id.count != 0 || regSIODATA32 == 0x494e))
     {
-        for (r0 = 0; r0 < 600; ++r0)
+        for (delay = 0; delay < 600; ++delay)
             ;
-        if (gRfuSIO32Id.unkA == 0)
+        if (gRfuSIO32Id.lastId == 0)
             REG_SIOCNT |= SIO_ENABLE;
     }
 }
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index b88f21737..0287b358a 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -28,8 +28,8 @@ void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, b
     }
     gSTWIStatus->rxPacket = &interruptStruct->rxPacketAlloc;
     gSTWIStatus->txPacket = &interruptStruct->txPacketAlloc;
-    gSTWIStatus->msMode = 1;
-    gSTWIStatus->state = 0;
+    gSTWIStatus->msMode = AGB_CLK_MASTER;
+    gSTWIStatus->state = 0; // master send req
     gSTWIStatus->reqLength = 0;
     gSTWIStatus->reqNext = 0;
     gSTWIStatus->ackLength = 0;
@@ -39,7 +39,7 @@ void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, b
     gSTWIStatus->timerActive = 0;
     gSTWIStatus->error = 0;
     gSTWIStatus->recoveryCount = 0;
-    gSTWIStatus->unk_2c = 0;
+    gSTWIStatus->sending = 0;
     REG_RCNT = 0x100; // TODO: mystery bit? 
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
     STWI_init_Callback_M();
@@ -71,7 +71,7 @@ void AgbRFU_SoftReset(void)
     *timerH = 3;
     REG_RCNT = 0x80A0;
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
-    gSTWIStatus->state = 0;
+    gSTWIStatus->state = 0; // master send req
     gSTWIStatus->reqLength = 0;
     gSTWIStatus->reqNext = 0;
     gSTWIStatus->reqActiveCommand = 0;
@@ -81,9 +81,9 @@ void AgbRFU_SoftReset(void)
     gSTWIStatus->timerState = 0;
     gSTWIStatus->timerActive = 0;
     gSTWIStatus->error = 0;
-    gSTWIStatus->msMode = 1;
+    gSTWIStatus->msMode = AGB_CLK_MASTER;
     gSTWIStatus->recoveryCount = 0;
-    gSTWIStatus->unk_2c = 0;
+    gSTWIStatus->sending = 0;
 }
 
 void STWI_set_MS_mode(u8 mode)
@@ -131,12 +131,12 @@ void STWI_set_Callback_S(void (*callbackS)(u16))
 
 void STWI_set_Callback_ID(void (*func)(void)) // name in SDK, but is actually setting a function pointer
 {
-    gSTWIStatus->unk_20 = func;
+    gSTWIStatus->callbackID = func;
 }
 
 u16 STWI_poll_CommandEnd(void)
 {
-    while (gSTWIStatus->unk_2c == TRUE)
+    while (gSTWIStatus->sending == 1)
         ;
     return gSTWIStatus->error;
 }
@@ -195,7 +195,7 @@ void STWI_send_ConfigStatusREQ(void)
     }
 }
 
-void STWI_send_GameConfigREQ(const u8 *unk1, const u8 *data)
+void STWI_send_GameConfigREQ(const u8 *serial_gname, const u8 *uname)
 {
     u8 *packetBytes;
     s32 i;
@@ -203,29 +203,28 @@ void STWI_send_GameConfigREQ(const u8 *unk1, const u8 *data)
     if (!STWI_init(ID_GAME_CONFIG_REQ))
     {
         gSTWIStatus->reqLength = 6;
-        // TODO: what is unk1
         packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
         packetBytes += sizeof(u32);
-        *(u16 *)packetBytes = *(u16 *)unk1;
+        *(u16 *)packetBytes = *(u16 *)serial_gname;
         packetBytes += sizeof(u16);
-        unk1 += sizeof(u16);
+        serial_gname += sizeof(u16);
         for (i = 0; i < 14; ++i)
         {
-            *packetBytes = *unk1;
+            *packetBytes = *serial_gname;
             ++packetBytes;
-            ++unk1;
+            ++serial_gname;
         }
         for (i = 0; i < 8; ++i)
         {
-            *packetBytes = *data;
+            *packetBytes = *uname;
             ++packetBytes;
-            ++data;
+            ++uname;
         }
         STWI_start_Command();
     }
 }
 
-void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
+void STWI_send_SystemConfigREQ(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer)
 {
     if (!STWI_init(ID_SYSTEM_CONFIG_REQ))
     {
@@ -234,9 +233,9 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3)
         gSTWIStatus->reqLength = 1;
         packetBytes = gSTWIStatus->txPacket->rfuPacket8.data;
         packetBytes += sizeof(u32);
-        *packetBytes++ = unk3;
-        *packetBytes++ = unk2;
-        *(u16*)packetBytes = unk1;
+        *packetBytes++ = mcTimer;
+        *packetBytes++ = maxMFrame;
+        *(u16*)packetBytes = availSlotFlag;
         STWI_start_Command();
     }
 }
@@ -499,20 +498,17 @@ static void STWI_intr_timer(void)
         STWI_stop_timer();
         STWI_reset_ClockCounter();
         if (gSTWIStatus->callbackM != NULL)
-            gSTWIStatus->callbackM(255, 0);
+            gSTWIStatus->callbackM(ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ, 0);
         break;
     }
 }
 
-static void STWI_set_timer(u8 unk)
+static void STWI_set_timer(u8 count)
 {
-    vu16 *timerL;
-    vu16 *timerH;
-
-    timerL = &REG_TMCNT_L(gSTWIStatus->timerSelect);
-    timerH = &REG_TMCNT_H(gSTWIStatus->timerSelect);
+    vu16 *timerL = &REG_TMCNT_L(gSTWIStatus->timerSelect);
+    vu16 *timerH = &REG_TMCNT_H(gSTWIStatus->timerSelect);
     REG_IME = 0;
-    switch (unk)
+    switch (count)
     {
     case 50:
         *timerL = 0xFCCB;
@@ -543,25 +539,31 @@ static void STWI_stop_timer(void)
     REG_TMCNT_H(gSTWIStatus->timerSelect) = 0;
 }
 
+/*
+ * Set up STWI to send REQ. Returns 1 if error (see below).
+ */
 static u16 STWI_init(u8 request)
 {
     if (!REG_IME)
     {
+        // Can't start sending if IME is disabled.
         gSTWIStatus->error = ERR_REQ_CMD_IME_DISABLE;
         if (gSTWIStatus->callbackM != NULL)
             gSTWIStatus->callbackM(request, gSTWIStatus->error);
         return TRUE;
     }
-    else if (gSTWIStatus->unk_2c == TRUE)
+    else if (gSTWIStatus->sending == 1)
     {
+        // Already sending something. Cancel and error.
         gSTWIStatus->error = ERR_REQ_CMD_SENDING;
-        gSTWIStatus->unk_2c = FALSE;
+        gSTWIStatus->sending = 0;
         if (gSTWIStatus->callbackM != NULL)
             gSTWIStatus->callbackM(request, gSTWIStatus->error);
         return TRUE;
     }
-    else if(!gSTWIStatus->msMode)
+    else if (gSTWIStatus->msMode == AGB_CLK_SLAVE)
     {
+        // Can't send if clock slave
         gSTWIStatus->error = ERR_REQ_CMD_CLOCK_SLAVE;
         if (gSTWIStatus->callbackM != NULL)
             gSTWIStatus->callbackM(request, gSTWIStatus->error, gSTWIStatus);
@@ -569,9 +571,10 @@ static u16 STWI_init(u8 request)
     }
     else
     {
-        gSTWIStatus->unk_2c = TRUE;
+        // Good to go, start sending
+        gSTWIStatus->sending = 1;
         gSTWIStatus->reqActiveCommand = request;
-        gSTWIStatus->state = 0;
+        gSTWIStatus->state = 0; // master send req
         gSTWIStatus->reqLength = 0;
         gSTWIStatus->reqNext = 0;
         gSTWIStatus->ackLength = 0;
@@ -595,7 +598,7 @@ static s32 STWI_start_Command(void)
     // but the cast here is required to avoid register issue
     *(u32 *)gSTWIStatus->txPacket->rfuPacket8.data = 0x99660000 | (gSTWIStatus->reqLength << 8) | gSTWIStatus->reqActiveCommand;
     REG_SIODATA32 = gSTWIStatus->txPacket->rfuPacket32.command;
-    gSTWIStatus->state = 0;
+    gSTWIStatus->state = 0; // master send req
     gSTWIStatus->reqNext = 1;
     imeTemp = REG_IME;
     REG_IME = 0;
@@ -608,7 +611,7 @@ static s32 STWI_start_Command(void)
 
 static s32 STWI_restart_Command(void)
 {
-    if (gSTWIStatus->recoveryCount <= 1)
+    if (gSTWIStatus->recoveryCount < 2)
     {
         ++gSTWIStatus->recoveryCount;
         STWI_start_Command();
@@ -618,17 +621,17 @@ static s32 STWI_restart_Command(void)
         if (gSTWIStatus->reqActiveCommand == ID_MS_CHANGE_REQ || gSTWIStatus->reqActiveCommand == ID_DATA_TX_AND_CHANGE_REQ || gSTWIStatus->reqActiveCommand == ID_UNK35_REQ || gSTWIStatus->reqActiveCommand == ID_RESUME_RETRANSMIT_AND_CHANGE_REQ)
         {
             gSTWIStatus->error = ERR_REQ_CMD_CLOCK_DRIFT;
-            gSTWIStatus->unk_2c = 0;
+            gSTWIStatus->sending = 0;
             if (gSTWIStatus->callbackM != NULL)
                 gSTWIStatus->callbackM(gSTWIStatus->reqActiveCommand, gSTWIStatus->error);
         }
         else
         {
             gSTWIStatus->error = ERR_REQ_CMD_CLOCK_DRIFT;
-            gSTWIStatus->unk_2c = 0;
+            gSTWIStatus->sending = 0;
             if (gSTWIStatus->callbackM != NULL)
                 gSTWIStatus->callbackM(gSTWIStatus->reqActiveCommand, gSTWIStatus->error);
-            gSTWIStatus->state = 4; // TODO: what's 4
+            gSTWIStatus->state = 4; // error
         }
     }
     return 0;
@@ -636,7 +639,7 @@ static s32 STWI_restart_Command(void)
 
 static s32 STWI_reset_ClockCounter(void)
 {
-    gSTWIStatus->state = 5; // TODO: what is 5
+    gSTWIStatus->state = 5; // slave receive req init
     gSTWIStatus->reqLength = 0;
     gSTWIStatus->reqNext = 0;
     REG_SIODATA32 = (1 << 31);
diff --git a/src/link.c b/src/link.c
index dfb21f126..26e223153 100644
--- a/src/link.c
+++ b/src/link.c
@@ -82,14 +82,14 @@ u32 gFiller_3003EC0;
 u16 gLinkHeldKeys;
 u16 gRecvCmds[MAX_RFU_PLAYERS][CMD_LENGTH];
 u32 gLinkStatus;
-bool8 gUnknown_3003F24;
+bool8 gLinkAllAcked5FFF;
 bool8 gUnknown_3003F28;
-bool8 gUnknown_3003F2C[MAX_LINK_PLAYERS];
-bool8 gUnknown_3003F30[MAX_LINK_PLAYERS];
-u16 gUnknown_3003F34;
+bool8 gLinkCommand2FFEAck[MAX_LINK_PLAYERS];
+bool8 gLinkCommand5FFFAck[MAX_LINK_PLAYERS];
+u16 gLinkCmd5FFFparam;
 u8 gSuppressLinkErrorMessage;
-bool8 gWirelessCommType;
-bool8 gSavedLinkPlayerCount;
+u8 gWirelessCommType;
+u8 gSavedLinkPlayerCount;
 u16 gSendCmd[CMD_LENGTH];
 u8 gSavedMultiplayerId;
 bool8 gReceivedRemoteLinkPlayers;
@@ -123,8 +123,8 @@ EWRAM_DATA struct {
     u8 lastSendQueueCount;
     u8 unk_06;
 } sLinkErrorBuffer = {};
-EWRAM_DATA u16 gUnknown_202285C = 0;
-EWRAM_DATA void *gUnknown_2022860 = NULL;
+static EWRAM_DATA u16 sStartSend5FFFfailures = 0;
+static EWRAM_DATA void *sLinkErrorBgTilemapBuffer = NULL;
 
 static void InitLocalLinkPlayer(void);
 static void sub_800978C(void);
@@ -142,13 +142,13 @@ static u16 LinkTestCalcBlockChecksum(const u16 *src, u16 size);
 static void LinkTest_prnthex(u32 pos, u8 a0, u8 a1, u8 a2);
 static void LinkCB_RequestPlayerDataExchange(void);
 static void Task_PrintTestData(u8 taskId);
-static void sub_800AB0C(void);
-static void sub_800AB38(void);
-static void sub_800ABD4(void);
-static void sub_800AC00(void);
+static void LinkCB_BuildCommand5FFF(void);
+static void LinkCB_WaitAckCommand5FFF(void);
+static void LinkFunc_Send2FFE_1(void);
+static void LinkFunc_Send2FFE_2(void);
 static void CheckErrorStatus(void);
 static void CB2_PrintErrorMessage(void);
-static void sub_800B210(void);
+static void SetWirelessCommType0(void);
 static void DisableSerial(void);
 static void EnableSerial(void);
 static bool8 IsSioMultiMaster(void);
@@ -232,16 +232,16 @@ bool8 IsWirelessAdapterConnected(void)
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return FALSE;
 
-    sub_800B1F4();
+    SetWirelessCommType1();
     sub_80F86F4();
     sub_80FB128(TRUE);
-    if (sub_80FD3A4() == RFU_ID)
+    if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID)
     {
         rfu_REQ_stopMode();
         rfu_waitREQComplete();
         return TRUE;
     }
-    sub_800B210();
+    SetWirelessCommType0();
     CloseLink();
     RestoreSerialTimer3IntrHandlers();
     return FALSE;
@@ -379,8 +379,8 @@ void OpenLink(void)
         ResetBlockSend();
         gUnknown_3000E4C = 0;
         gUnknown_3003F28 = FALSE;
-        gUnknown_3003F24 = FALSE;
-        gUnknown_3003F34 = 0;
+        gLinkAllAcked5FFF = FALSE;
+        gLinkCmd5FFFparam = 0;
         CreateTask(Task_TriggerHandshake, 2);
     }
     else
@@ -391,8 +391,8 @@ void OpenLink(void)
     for (i = 0; i < MAX_LINK_PLAYERS; i++)
     {
         gRemoteLinkPlayersNotReceived[i] = TRUE;
-        gUnknown_3003F30[i] = FALSE;
-        gUnknown_3003F2C[i] = FALSE;
+        gLinkCommand5FFFAck[i] = FALSE;
+        gLinkCommand2FFEAck[i] = FALSE;
     }
 }
 
@@ -401,7 +401,7 @@ void CloseLink(void)
     gReceivedRemoteLinkPlayers = FALSE;
     if (gWirelessCommType)
     {
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
     }
     gLinkOpen = FALSE;
     DisableSerial();
@@ -468,7 +468,7 @@ void LinkTestProcessKeyInput(void)
     }
     if (JOY_NEW(SELECT_BUTTON))
     {
-        sub_800AAC0();
+        Link_TryStartSend5FFF();
     }
     if (gLinkTestDebugValuesEnabled)
     {
@@ -613,7 +613,7 @@ void ProcessRecvCmds(u8 unused)
                         linkPlayer->name[9] = 0;
                         linkPlayer->name[8] = 0;
                     }
-                    sub_800B284(linkPlayer);
+                    IntlConvertLinkPlayerName(linkPlayer);
                     if (strcmp(block->magic1, sASCIIGameFreakInc) != 0
                         || strcmp(block->magic2, sASCIIGameFreakInc) != 0)
                     {
@@ -632,10 +632,10 @@ void ProcessRecvCmds(u8 unused)
         }
             break;
         case LINKCMD_0x5FFF:
-            gUnknown_3003F30[i] = TRUE;
+            gLinkCommand5FFFAck[i] = TRUE;
             break;
         case LINKCMD_0x2FFE:
-            gUnknown_3003F2C[i] = TRUE;
+            gLinkCommand2FFEAck[i] = TRUE;
             break;
         case LINKCMD_0xAAAA:
             sub_800A3CC();
@@ -701,7 +701,7 @@ void BuildSendCmd(u16 command)
         break;
     case LINKCMD_0x5FFF:
         gSendCmd[0] = LINKCMD_0x5FFF;
-        gSendCmd[1] = gUnknown_3003F34;
+        gSendCmd[1] = gLinkCmd5FFFparam;
         break;
     case LINKCMD_0x5566:
         gSendCmd[0] = LINKCMD_0x5566;
@@ -721,7 +721,7 @@ void sub_8009FE8(void)
 {
     if (gWirelessCommType)
     {
-        sub_80F9828();
+        StartSendingKeysToRfu();
     }
     gLinkCallback = sub_800A040;
 }
@@ -1312,54 +1312,54 @@ u8 sub_800AA74(void)
     return gUnknown_3000E50;
 }
 
-void sub_800AA80(u16 a0)
+void Link_StartSend5FFFwithParam(u16 a0)
 {
     if (gWirelessCommType == 1)
     {
-        task_add_05_task_del_08FA224_when_no_RfuFunc();
+        Rfu_BeginBuildAndSendCommand5F();
     }
     else
     {
         if (gLinkCallback == NULL)
         {
-            gLinkCallback = sub_800AB0C;
-            gUnknown_3003F24 = FALSE;
-            gUnknown_3003F34 = a0;
+            gLinkCallback = LinkCB_BuildCommand5FFF;
+            gLinkAllAcked5FFF = FALSE;
+            gLinkCmd5FFFparam = a0;
         }
     }
 }
 
-void sub_800AAC0(void)
+void Link_TryStartSend5FFF(void)
 {
     if (gWirelessCommType == 1)
     {
-        task_add_05_task_del_08FA224_when_no_RfuFunc();
+        Rfu_BeginBuildAndSendCommand5F();
     }
     else
     {
         if (gLinkCallback != NULL)
         {
-            gUnknown_202285C++;
+            sStartSend5FFFfailures++;
         }
         else
         {
-            gLinkCallback = sub_800AB0C;
-            gUnknown_3003F24 = FALSE;
-            gUnknown_3003F34 = 0;
+            gLinkCallback = LinkCB_BuildCommand5FFF;
+            gLinkAllAcked5FFF = FALSE;
+            gLinkCmd5FFFparam = 0;
         }
     }
 }
 
-static void sub_800AB0C(void)
+static void LinkCB_BuildCommand5FFF(void)
 {
     if (gLastRecvQueueCount == 0)
     {
         BuildSendCmd(LINKCMD_0x5FFF);
-        gLinkCallback = sub_800AB38;
+        gLinkCallback = LinkCB_WaitAckCommand5FFF;
     }
 }
 
-static void sub_800AB38(void)
+static void LinkCB_WaitAckCommand5FFF(void)
 {
     int i;
     unsigned count;
@@ -1369,7 +1369,7 @@ static void sub_800AB38(void)
     count = 0;
     for (i = 0; i < linkPlayerCount; i++)
     {
-        if (gUnknown_3003F30[i])
+        if (gLinkCommand5FFFAck[i])
         {
             count++;
         }
@@ -1380,36 +1380,36 @@ static void sub_800AB38(void)
         gLinkVSyncDisabled = TRUE;
         CloseLink();
         gLinkCallback = NULL;
-        gUnknown_3003F24 = TRUE;
+        gLinkAllAcked5FFF = TRUE;
     }
 }
 
-void sub_800AB9C(void)
+void PrepareSendLinkCmd2FFE_or_RfuCmd6600(void)
 {
     if (gWirelessCommType == 1)
     {
-        sub_80FA42C();
+        LinkRfu_SetRfuFuncToSend6600();
     }
     else
     {
         if (gLinkCallback == NULL)
         {
-            gLinkCallback = sub_800ABD4;
+            gLinkCallback = LinkFunc_Send2FFE_1;
         }
-        gUnknown_3003F24 = FALSE;
+        gLinkAllAcked5FFF = FALSE;
     }
 }
 
-static void sub_800ABD4(void)
+static void LinkFunc_Send2FFE_1(void)
 {
     if (gLastRecvQueueCount == 0)
     {
         BuildSendCmd(LINKCMD_0x2FFE);
-        gLinkCallback = sub_800AC00;
+        gLinkCallback = LinkFunc_Send2FFE_2;
     }
 }
 
-static void sub_800AC00(void)
+static void LinkFunc_Send2FFE_2(void)
 {
     u8 i;
     u8 linkPlayerCount;
@@ -1417,7 +1417,7 @@ static void sub_800AC00(void)
     linkPlayerCount = GetLinkPlayerCount();
     for (i = 0; i < linkPlayerCount; i++)
     {
-        if (!gUnknown_3003F2C[i])
+        if (!gLinkCommand2FFEAck[i])
         {
             break;
         }
@@ -1426,7 +1426,7 @@ static void sub_800AC00(void)
     {
         for (i = 0; i < MAX_LINK_PLAYERS; i++)
         {
-            gUnknown_3003F2C[i] = FALSE;
+            gLinkCommand2FFEAck[i] = FALSE;
         }
         gLinkCallback = NULL;
     }
@@ -1448,7 +1448,7 @@ static void CheckErrorStatus(void)
     }
 }
 
-void sub_800ACBC(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06)
+void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06)
 {
     sLinkErrorBuffer.status = status;
     sLinkErrorBuffer.lastSendQueueCount = lastSendQueueCount;
@@ -1477,12 +1477,12 @@ void CB2_LinkError(void)
         {
             gWirelessCommType = 3;
         }
-        sub_80F85F8();
+        ResetLinkRfuGFLayer();
     }
     SetVBlankCallback(sub_800978C);
-    ResetBgsAndClearDma3BusyFlags(0);
+    ResetBgsAndClearDma3BusyFlags(FALSE);
     InitBgsFromTemplates(0, sLinkErrorBgTemplates, 2);
-    gUnknown_2022860 = tilemapBuffer = malloc(0x800);
+    sLinkErrorBgTilemapBuffer = tilemapBuffer = malloc(0x800);
     SetBgTilemapBuffer(1, tilemapBuffer);
     if (InitWindows(sLinkErrorWindowTemplates))
     {
@@ -1603,12 +1603,12 @@ static void CB2_PrintErrorMessage(void)
 
 bool8 GetSioMultiSI(void)
 {
-    return (REG_SIOCNT & 0x04) != 0;
+    return (REG_SIOCNT & SIO_MULTI_SI) != 0;
 }
 
 static bool8 IsSioMultiMaster(void)
 {
-    return (REG_SIOCNT & 0x8) && !(REG_SIOCNT & 0x04);
+    return (REG_SIOCNT & SIO_MULTI_SD) && !(REG_SIOCNT & SIO_MULTI_SI);
 }
 
 bool8 IsLinkConnectionEstablished(void)
@@ -1626,7 +1626,7 @@ bool8 HasLinkErrorOccurred(void)
     return gLinkErrorOccurred;
 }
 
-void sub_800B0B4(void)
+void PrepareLocalLinkPlayerBlock(void)
 {
     struct LinkPlayerBlock * block;
 
@@ -1638,7 +1638,7 @@ void sub_800B0B4(void)
     memcpy(gBlockSendBuffer, block, sizeof(*block));
 }
 
-void sub_800B110(u32 who)
+void LinkPlayerFromBlock(u32 who)
 {
     u8 who_ = who;
     struct LinkPlayerBlock * block;
@@ -1647,7 +1647,7 @@ void sub_800B110(u32 who)
     block = (struct LinkPlayerBlock *)gBlockRecvBuffer[who_];
     player = &gLinkPlayers[who_];
     *player = block->linkPlayer;
-    sub_800B284(player);
+    IntlConvertLinkPlayerName(player);
     if (strcmp(block->magic1, sASCIIGameFreakInc) != 0 || strcmp(block->magic2, sASCIIGameFreakInc) != 0)
     {
         SetMainCallback2(CB2_LinkError);
@@ -1670,8 +1670,8 @@ bool8 HandleLinkConnection(void)
     }
     else
     {
-        r4 = sub_80FAE94();
-        r5 = sub_80FAEF0();
+        r4 = LinkRfuMain1();
+        r5 = LinkRfuMain2();
         if (sub_8058318() == TRUE)
         {
             if (r4 == TRUE || IsRfuRecvQueueEmpty() || r5)
@@ -1683,7 +1683,7 @@ bool8 HandleLinkConnection(void)
     return FALSE;
 }
 
-void sub_800B1F4(void)
+void SetWirelessCommType1(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
@@ -1691,7 +1691,7 @@ void sub_800B1F4(void)
     }
 }
 
-static void sub_800B210(void)
+static void SetWirelessCommType0(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
@@ -1699,7 +1699,7 @@ static void sub_800B210(void)
     }
 }
 
-void sub_800B22C(void)
+void SetWirelessCommType0_UnusedCopy(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
@@ -1725,7 +1725,7 @@ bool32 sub_800B270(void)
     return FALSE;
 }
 
-void sub_800B284(struct LinkPlayer * player)
+void IntlConvertLinkPlayerName(struct LinkPlayer * player)
 {
     player->name[10] = player->name[8];
     ConvertInternationalString(player->name, player->language);
diff --git a/src/link_rfu.c b/src/link_rfu.c
deleted file mode 100644
index 8ab76ffd5..000000000
--- a/src/link_rfu.c
+++ /dev/null
@@ -1,1381 +0,0 @@
-#include "global.h"
-#include "librfu.h"
-#include "link_rfu.h"
-
-struct UnkRfuStruct_1 gUnknown_3005E10;
-
-static void sub_80FD4E4(void);
-static void sub_80FDC28(u32 a0);
-static void sub_80FDC98(u16 reqCommandId, u16 reqResult);
-static void sub_80FE394(u16 reqCommandId);
-static void sub_80FE418(void);
-static void sub_80FE63C(void);
-static void sub_80FE6F0(void);
-static void sub_80FE74C(void);
-static u8 sub_80FE778(void);
-static void sub_80FE7F0(u8 a0, u8 a1);
-static void sub_80FE818(u8 bmDisconnectSlot);
-static void sub_80FE83C(u8 a0);
-static void sub_80FE918(void);
-static void sub_80FEAF4(void);
-
-u32 sub_80FD3A4(void)
-{
-    u32 id = rfu_REQBN_softReset_and_checkID();
-    if (id == RFU_ID)
-        gUnknown_3005E10.unk_08 = 1;
-    if (gUnknown_3005E10.unk_04 != 0x17 && gUnknown_3005E10.unk_04 != 0x01)
-    {
-        gUnknown_3005E10.unk_05 = 0;
-        gUnknown_3005E10.unk_04 = 0;
-    }
-    gUnknown_3005E10.unk_07 = 0;
-    gUnknown_3005E10.unk_0d = 0;
-    gUnknown_3005E10.unk_01 = 0;
-    gUnknown_3005E10.unk_00 = 0;
-    gUnknown_3005E10.unk_06 = -1;
-    sub_80FEAF4();
-    return id;
-}
-
-void LinkRfu_REQ_SendData_HandleParentRelationship(u8 clockChangeFlag)
-{
-    if (gRfuLinkStatus->parentChild == MODE_CHILD)
-    {
-        if (gUnknown_3005E10.unk_02 == TRUE)
-            clockChangeFlag = TRUE;
-        else
-            clockChangeFlag = FALSE;
-    }
-    else
-        gUnknown_3005E10.unk_03 = 0;
-    rfu_REQ_sendData(clockChangeFlag);
-}
-
-s32 sub_80FD430(void (*func1)(u8, u8), void (*func2)(u16))
-{
-    if (func1 == NULL)
-    {
-        return 4;
-    }
-    CpuFill16(0, &gUnknown_3005E10, sizeof(struct UnkRfuStruct_1));
-    gUnknown_3005E10.unk_06 = -1;
-    gUnknown_3005E10.unk_40 = func1;
-    gUnknown_3005E10.unk_44 = func2;
-    rfu_setMSCCallback(sub_80FE394);
-    rfu_setREQCallback(sub_80FDC98);
-    return 0;
-}
-
-static void sub_80FD484(void)
-{
-    CpuFill16(0, &gUnknown_3005E10, offsetof(struct UnkRfuStruct_1, unk_40));
-    gUnknown_3005E10.unk_06 = -1;
-}
-
-void sub_80FD4B0(const struct UnkLinkRfuStruct_02022B2C *unk0)
-{
-    sub_80FD4E4();
-    gUnknown_3005E10.unk_04 = 1;
-    gUnknown_3005E10.unk_05 = 2;
-    gUnknown_3005E10.unk_3c = unk0;
-    gUnknown_3005E10.unk_09 = unk0->unk_11;
-    gUnknown_3005E10.unk_32 = unk0->unk_12;
-    gUnknown_3005E10.unk_18 = unk0->unk_14;
-    if (unk0->unk_10)
-    {
-        gUnknown_3005E10.unk_0b = 1;
-    }
-}
-
-static void sub_80FD4E4(void)
-{
-    u8 i;
-
-    gUnknown_3005E10.unk_05 = 0;
-    gUnknown_3005E10.unk_04 = 0;
-    gUnknown_3005E10.unk_06 = -1;
-    gUnknown_3005E10.unk_07 = 0;
-    gUnknown_3005E10.unk_10 = 0;
-    gUnknown_3005E10.unk_0c = 0;
-    gUnknown_3005E10.unk_24 = 0;
-    gUnknown_3005E10.unk_30 = 0;
-    for (i = 0; i < RFU_CHILD_MAX; i++)
-    {
-        gUnknown_3005E10.unk_28[i] = 0;
-        gUnknown_3005E10.unk_34[i] = 0;
-    }
-}
-
-void sub_80FD52C(void)
-{
-    gUnknown_3005E10.unk_04 = 0x15;
-}
-
-u8 sub_80FD538(u8 r5, u16 r7, u16 r8, const u16 *r6)
-{
-    u8 i;
-    const u16 *buffer;
-
-    if (gUnknown_3005E10.unk_04 != 0 && (gUnknown_3005E10.unk_04 != 0x08 || r5 != 1))
-    {
-        gUnknown_3005E10.unk_14 = 1;
-        sub_80FE7F0(0xf3, 0x01);
-        return 1;
-    }
-    if (rfu_getMasterSlave() == AGB_CLK_SLAVE)
-    {
-        gUnknown_3005E10.unk_14 = 2;
-        sub_80FE7F0(0xf3, 0x01);
-        return 2;
-    }
-    for (i = 0, buffer = r6; i < 16; i++)
-    {
-        if (*buffer++ == 0xFFFF)
-        {
-            break;
-        }
-    }
-    if (i == 16)
-    {
-        gUnknown_3005E10.unk_14 = 4;
-        sub_80FE7F0(0xf3, 0x01);
-        return 4;
-    }
-    if (r5 > 1)
-    {
-        gUnknown_3005E10.unk_07 = 1;
-        r5 = 1;
-        r7 = 0;
-    }
-    else
-    {
-        gUnknown_3005E10.unk_07 = 0;
-    }
-    if (r5 != 0)
-    {
-        gUnknown_3005E10.unk_04 = 5;
-    }
-    else
-    {
-        gUnknown_3005E10.unk_04 = 9;
-        if (gUnknown_3005E10.unk_0b)
-        {
-            gUnknown_3005E10.unk_0b = 2;
-        }
-    }
-    gUnknown_3005E10.unk_06 = r5;
-    gUnknown_3005E10.unk_1a = r7;
-    gUnknown_3005E10.unk_26 = r8;
-    gUnknown_3005E10.unk_20 = r6;
-    return 0;
-}
-
-u8 sub_80FD610(u16 parentId, u16 unk_1a)
-{
-    u8 i;
-
-    if (gUnknown_3005E10.unk_04 != 0 && (gUnknown_3005E10.unk_04 < 9 || gUnknown_3005E10.unk_04 > 11))
-    {
-        gUnknown_3005E10.unk_14 = 1;
-        sub_80FE7F0(0xF3, 0x01);
-        return 1;
-    }
-    if (rfu_getMasterSlave() == AGB_CLK_SLAVE)
-    {
-        gUnknown_3005E10.unk_14 = 2;
-        sub_80FE7F0(0xF3, 0x01);
-        return 2;
-    }
-    for (i = 0; i < gRfuLinkStatus->findParentCount; i++)
-    {
-        if (gRfuLinkStatus->partner[i].id == parentId)
-        {
-            break;
-        }
-    }
-    if (gRfuLinkStatus->findParentCount == 0 || i == gRfuLinkStatus->findParentCount)
-    {
-        gUnknown_3005E10.unk_14 = 3;
-        sub_80FE7F0(0xF3, 0x01);
-        return 3;
-    }
-    if (gUnknown_3005E10.unk_04 == 0 || gUnknown_3005E10.unk_04 == 9)
-    {
-        gUnknown_3005E10.unk_04 = 12;
-        gUnknown_3005E10.unk_05 = 13;
-    }
-    else
-    {
-        gUnknown_3005E10.unk_04 = 11;
-        gUnknown_3005E10.unk_05 = 12;
-    }
-    gUnknown_3005E10.unk_1e = parentId;
-    gUnknown_3005E10.unk_1a = unk_1a;
-    if (gUnknown_3005E10.unk_07 != 0)
-    {
-        gUnknown_3005E10.unk_07 = 7;
-    }
-    return 0;
-}
-
-static void sub_80FD6F4(u8 lossSlot)
-{
-    u8 i;
-
-    if (lossSlot & gUnknown_3005E10.unk_30)
-    {
-        gUnknown_3005E10.unk_30 &= ~lossSlot;
-        for (i = 0; i < RFU_CHILD_MAX; i++)
-        {
-            if ((lossSlot >> i) & 1)
-            {
-                gUnknown_3005E10.unk_34[i] = 0;
-            }
-        }
-        i = gRfuLinkStatus->linkLossSlotFlag & lossSlot;
-        if (i)
-        {
-            sub_80FE818(i);
-        }
-        gUnknown_3005E10.unk_14 = i;
-        sub_80FE7F0(0x33, i);
-    }
-}
-
-void sub_80FD760(bool8 a0)
-{
-    u8 r2;
-
-    r2 = 0;
-    gUnknown_3005E10.unk_07 = 0;
-    if (a0)
-    {
-        sub_80FD4E4();
-        gUnknown_3005E10.unk_04 = 23;
-    }
-    else
-    {
-        switch (gUnknown_3005E10.unk_04)
-        {
-        case 5:
-            gUnknown_3005E10.unk_04 = 8;
-            gUnknown_3005E10.unk_05 = 0;
-            r2 = 0x13;
-            break;
-        case 6:
-            gUnknown_3005E10.unk_04 = 7;
-            gUnknown_3005E10.unk_05 = 8;
-            break;
-        case 7:
-            gUnknown_3005E10.unk_04 = 7;
-            gUnknown_3005E10.unk_05 = 8;
-            break;
-        case 8:
-            break;
-        case 9:
-            gUnknown_3005E10.unk_05 = 0;
-            gUnknown_3005E10.unk_04 = 0;
-            r2 = 0x21;
-            break;
-        case 10:
-            gUnknown_3005E10.unk_04 = 11;
-            gUnknown_3005E10.unk_05 = 0;
-            break;
-        case 11:
-            gUnknown_3005E10.unk_04 = 11;
-            gUnknown_3005E10.unk_05 = 0;
-            break;
-        case 12:
-            gUnknown_3005E10.unk_05 = 0;
-            gUnknown_3005E10.unk_04 = 0;
-            r2 = 0x23;
-            break;
-        case 13:
-            gUnknown_3005E10.unk_04 = 14;
-            break;
-        case 14:
-            gUnknown_3005E10.unk_04 = 14;
-            break;
-        case 15:
-            break;
-        case 16:
-            gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_11;
-            gUnknown_3005E10.unk_05 = gUnknown_3005E10.unk_12;
-            sub_80FE818(gRfuLinkStatus->linkLossSlotFlag);
-            gUnknown_3005E10.unk_14 = gRfuLinkStatus->linkLossSlotFlag;
-            sub_80FE7F0(0x33, 0x01);
-            return;
-        case 17:
-            gUnknown_3005E10.unk_04 = 18;
-            break;
-        case 18:
-            gUnknown_3005E10.unk_04 = 18;
-            break;
-        default:
-            gUnknown_3005E10.unk_05 = 0;
-            gUnknown_3005E10.unk_04 = 0;
-            r2 = 0x43;
-            break;
-        }
-        if (gUnknown_3005E10.unk_04 == 0)
-        {
-            sub_80FE7F0(r2, 0);
-        }
-    }
-}
-
-static bool8 sub_80FD850(u16 reqCommandId)
-{
-    bool8 retVal;
-    u8 i;
-    u8 bmLinkLossSlot;
-    u8 linkLossReason;
-    u8 parentBmLinkRecoverySlot;
-    u8 flags;
-
-    retVal = FALSE;
-    rfu_REQBN_watchLink(reqCommandId, &bmLinkLossSlot, &linkLossReason, &parentBmLinkRecoverySlot);
-    if (bmLinkLossSlot)
-    {
-        gUnknown_3005E10.unk_14 = bmLinkLossSlot;
-        gUnknown_3005E10.unk_16 = linkLossReason;
-        if (gUnknown_3005E10.unk_09)
-        {
-            gUnknown_3005E10.unk_0a = 1;
-            if (gUnknown_3005E10.unk_06 == 0 && linkLossReason == REASON_DISCONNECTED)
-            {
-                gUnknown_3005E10.unk_0a = 4;
-            }
-            if (gUnknown_3005E10.unk_0a == 1)
-            {
-                for (i = 0; i < RFU_CHILD_MAX; i++)
-                {
-                    if ((bmLinkLossSlot >> i) & 1)
-                    {
-                        gUnknown_3005E10.unk_30 |= (1 << i);
-                        gUnknown_3005E10.unk_34[i] = gUnknown_3005E10.unk_32;
-                    }
-                }
-                sub_80FE7F0(0x31, 0x01);
-            }
-            else
-            {
-                gUnknown_3005E10.unk_0a = 0;
-                sub_80FE818(bmLinkLossSlot);
-                retVal = TRUE;
-                sub_80FE7F0(0x33, 0x01);
-            }
-        }
-        else
-        {
-            sub_80FE818(bmLinkLossSlot);
-            retVal = TRUE;
-            sub_80FE7F0(0x30, 0x02);
-        }
-        sub_80FEAF4();
-    }
-    if (gRfuLinkStatus->parentChild == MODE_PARENT)
-    {
-        if (parentBmLinkRecoverySlot)
-        {
-            for (i = 0; i < RFU_CHILD_MAX; i++)
-            {
-                if ((gUnknown_3005E10.unk_30 >> i) & 1 && (parentBmLinkRecoverySlot >> i) & 1)
-                {
-                    gUnknown_3005E10.unk_34[i] = 0;
-                }
-            }
-            gUnknown_3005E10.unk_30 &= ~parentBmLinkRecoverySlot;
-            gUnknown_3005E10.unk_14 = parentBmLinkRecoverySlot;
-            sub_80FE7F0(0x32, 0x01);
-        }
-        if (gUnknown_3005E10.unk_30)
-        {
-            flags = 0;
-            for (i = 0; i < RFU_CHILD_MAX; i++)
-            {
-                if ((gUnknown_3005E10.unk_30 >> i) & 1 && gUnknown_3005E10.unk_34[i] && --gUnknown_3005E10.unk_34[i] == 0)
-                {
-                    gUnknown_3005E10.unk_30 &= ~(1 << i);
-                    flags |= (1 << i);
-                }
-            }
-            if (flags)
-            {
-                sub_80FE818(flags);
-                retVal = TRUE;
-                gUnknown_3005E10.unk_14 = flags;
-                sub_80FE7F0(0x33, 0x01);
-            }
-        }
-        if (!gUnknown_3005E10.unk_30)
-        {
-            gUnknown_3005E10.unk_0a = 0;
-        }
-    }
-    return retVal;
-}
-
-void LinkRfu_syncVBlank_(void)
-{
-    if (rfu_syncVBlank())
-    {
-        sub_80FE7F0(0xF1, 0x00);
-        sub_80FEAF4();
-    }
-}
-
-void sub_80FDA30(u32 a0)
-{
-    u8 r2;
-
-    if (gUnknown_3005E10.unk_40 == NULL && gUnknown_3005E10.unk_04 != 0)
-    {
-        gUnknown_3005E10.unk_04 = 0;
-    }
-    else
-    {
-        if (gUnknown_3005E10.unk_07 != 0)
-        {
-            sub_80FDC28(a0);
-        }
-        do
-        {
-            if (gUnknown_3005E10.unk_04 != 0)
-            {
-                rfu_waitREQComplete();
-                gUnknown_3005E10.unk_0e = 1;
-                switch (gUnknown_3005E10.unk_04)
-                {
-                case 23:
-                    r2 = sub_80FD3A4() == RFU_ID ? 0x44 : 0xFF;
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                    sub_80FE7F0(r2, 0);
-                    break;
-                case 1:
-                    if (sub_80FD3A4() == RFU_ID)
-                    {
-                        gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                        gUnknown_3005E10.unk_05 = 3;
-                    }
-                    else
-                    {
-                        gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                        sub_80FE7F0(0xFF, 0);
-                    }
-                    break;
-                case 2:
-                    rfu_REQ_reset();
-                    break;
-                case 3:
-                    rfu_REQ_configSystem(gUnknown_3005E10.unk_3c->availSlotFlag, gUnknown_3005E10.unk_3c->maxMFrame, gUnknown_3005E10.unk_3c->mcTimer);
-                    break;
-                case 4:
-                    rfu_REQ_configGameData(gUnknown_3005E10.unk_3c->mbootFlag, gUnknown_3005E10.unk_3c->serialNo, (const u8 *)gUnknown_3005E10.unk_3c->gname, gUnknown_3005E10.unk_3c->uname);
-                    break;
-                case 5:
-                    rfu_REQ_startSearchChild();
-                    break;
-                case 6:
-                    rfu_REQ_pollSearchChild();
-                    break;
-                case 7:
-                    rfu_REQ_endSearchChild();
-                    break;
-                case 8:
-                    break;
-                case 9:
-                    rfu_REQ_startSearchParent();
-                    break;
-                case 10:
-                    rfu_REQ_pollSearchParent();
-                    break;
-                case 11:
-                    rfu_REQ_endSearchParent();
-                    break;
-                case 12:
-                    rfu_REQ_startConnectParent(gUnknown_3005E10.unk_1e);
-                    break;
-                case 13:
-                    rfu_REQ_pollConnectParent();
-                    break;
-                case 14:
-                    rfu_REQ_endConnectParent();
-                    break;
-                case 15:
-                    break;
-                case 16:
-                    rfu_REQ_CHILD_startConnectRecovery(gRfuLinkStatus->linkLossSlotFlag);
-                    break;
-                case 17:
-                    rfu_REQ_CHILD_pollConnectRecovery();
-                    break;
-                case 18:
-                    rfu_REQ_CHILD_endConnectRecovery();
-                    break;
-                case 19:
-                    rfu_REQ_changeMasterSlave();
-                    break;
-                case 20:
-                    break;
-                case 21:
-                    rfu_REQ_stopMode();
-                    break;
-                case 22:
-                    break;
-                }
-                rfu_waitREQComplete();
-                gUnknown_3005E10.unk_0e = 0;
-            }
-        } while (gUnknown_3005E10.unk_04 == 18 || gUnknown_3005E10.unk_04 == 19);
-        if (gRfuLinkStatus->parentChild != MODE_PARENT || !sub_80FD850(0))
-        {
-            sub_80FE418();
-            sub_80FE63C();
-            sub_80FE74C();
-            sub_80FE918();
-        }
-    }
-}
-
-static void sub_80FDC28(u32 a0)
-{
-    if (gUnknown_3005E10.unk_07 == 5)
-    {
-        gUnknown_3005E10.unk_06 = 1;
-        gUnknown_3005E10.unk_04 = 5;
-        gUnknown_3005E10.unk_1a = gUnknown_3005E10.unk_1c;
-        if (gUnknown_3005E10.unk_1a)
-        {
-            gUnknown_3005E10.unk_07 = 6;
-        }
-        else
-        {
-            gUnknown_3005E10.unk_07 = 1;
-        }
-    }
-    if (gUnknown_3005E10.unk_07 == 1)
-    {
-        gUnknown_3005E10.unk_06 = 1;
-        gUnknown_3005E10.unk_04 = 5;
-        gUnknown_3005E10.unk_1a = a0 % 140;
-        gUnknown_3005E10.unk_1c = 140 - gUnknown_3005E10.unk_1a;
-        if (gUnknown_3005E10.unk_1a)
-        {
-            gUnknown_3005E10.unk_07 = 2;
-        }
-        else
-        {
-            gUnknown_3005E10.unk_07 = 3;
-        }
-    }
-    if (gUnknown_3005E10.unk_07 == 3)
-    {
-        gUnknown_3005E10.unk_06 = 0;
-        gUnknown_3005E10.unk_1a = 40;
-        gUnknown_3005E10.unk_07 = 4;
-        gUnknown_3005E10.unk_04 = 9;
-    }
-}
-
-static void sub_80FDC98(u16 reqCommandId, u16 reqResult)
-{
-    u8 sp0;
-    register u8 *stwiRecvBuffer asm("r0");
-    u8 *tmp;
-    u8 i;
-
-    if (gUnknown_3005E10.unk_0e != 0)
-    {
-        gUnknown_3005E10.unk_0e = 0;
-        switch (reqCommandId)
-        {
-        case ID_RESET_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                gUnknown_3005E10.unk_05 = 4;
-            }
-            break;
-        case ID_SYSTEM_CONFIG_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                gUnknown_3005E10.unk_05 = 0;
-            }
-            break;
-        case ID_GAME_CONFIG_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                sub_80FE7F0(0x00, 0x00);
-            }
-            break;
-        case ID_SC_START_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 6;
-            }
-            break;
-        case ID_SC_POLL_REQ:
-            if (gUnknown_3005E10.unk_1a && --gUnknown_3005E10.unk_1a == 0)
-            {
-                gUnknown_3005E10.unk_04 = 7;
-                gUnknown_3005E10.unk_05 = 8;
-            }
-            break;
-        case ID_SC_END_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                gUnknown_3005E10.unk_05 = 0;
-                if (gUnknown_3005E10.unk_07 == 0)
-                {
-                    sub_80FE7F0(0x13, 0x00);
-                }
-            }
-            break;
-        case ID_SP_START_REQ:
-            if (reqResult == 0)
-            {
-                if (gUnknown_3005E10.unk_0b == 1 && gUnknown_3005E10.unk_1a > 1)
-                {
-                    gUnknown_3005E10.unk_1a--;
-                }
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 10;
-            }
-            break;
-        case ID_SP_POLL_REQ:
-            if (reqResult == 0)
-            {
-                sp0 = sub_80FE778();
-                gUnknown_3005E10.unk_14 = sp0;
-                if (sp0)
-                {
-                    sub_80FE7F0(0x20, 0x01);
-                }
-                if (gUnknown_3005E10.unk_0b && gUnknown_3005E10.unk_1a != 1 && gRfuLinkStatus->findParentCount == RFU_CHILD_MAX)
-                {
-                    rfu_REQ_endSearchParent();
-                    rfu_waitREQComplete();
-                    gUnknown_3005E10.unk_04 = 9;
-                    gUnknown_3005E10.unk_0b = 1;
-                }
-            }
-            if (gUnknown_3005E10.unk_1a && --gUnknown_3005E10.unk_1a == 0)
-            {
-                gUnknown_3005E10.unk_04 = 11;
-                gUnknown_3005E10.unk_05 = 0;
-            }
-            break;
-        case ID_SP_END_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                if (gUnknown_3005E10.unk_07 == 0)
-                {
-                    if (gUnknown_3005E10.unk_04 == 0)
-                    {
-                        sub_80FE7F0(0x21, 0x00);
-                    }
-                }
-                else if (gUnknown_3005E10.unk_07 != 7)
-                {
-                    gUnknown_3005E10.unk_04 = 5;
-                    gUnknown_3005E10.unk_07 = 5;
-                }
-            }
-            break;
-        case ID_CP_START_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 13;
-            }
-            break;
-        case ID_CP_POLL_REQ:
-            if (reqResult == 0 && !rfu_getConnectParentStatus(&sp0, &gUnknown_3005E10.unk_10) && !sp0)
-            {
-                gUnknown_3005E10.unk_04 = 14;
-            }
-            if (gUnknown_3005E10.unk_1a && --gUnknown_3005E10.unk_1a == 0)
-            {
-                gUnknown_3005E10.unk_04 = 14;
-            }
-            break;
-        case ID_CP_END_REQ:
-            if (reqResult == 0 && !rfu_getConnectParentStatus(&sp0, &gUnknown_3005E10.unk_10))
-            {
-                if (!sp0)
-                {
-                    gUnknown_3005E10.unk_04 = 19;
-                    gUnknown_3005E10.unk_05 = 15;
-                    gUnknown_3005E10.unk_1e = 0x22;
-                    gUnknown_3005E10.unk_14 = gUnknown_3005E10.unk_10;
-                }
-                else
-                {
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                    gUnknown_3005E10.unk_1e = 0x23;
-                    gUnknown_3005E10.unk_14 = sp0;
-                    if (gUnknown_3005E10.unk_07)
-                    {
-                        gUnknown_3005E10.unk_07 = 3;
-                        gUnknown_3005E10.unk_04 = 9;
-                    }
-                }
-                sub_80FE7F0(gUnknown_3005E10.unk_1e, 0x01);
-                gUnknown_3005E10.unk_1e = 0;
-            }
-            break;
-        case ID_CPR_START_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_14 = gRfuLinkStatus->linkLossSlotFlag;
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 17;
-                for (gUnknown_3005E10.unk_10 = 0; gUnknown_3005E10.unk_10 < RFU_CHILD_MAX; gUnknown_3005E10.unk_10++)
-                {
-                    if ((gRfuLinkStatus->linkLossSlotFlag >> gUnknown_3005E10.unk_10) & 1)
-                    {
-                        break;
-                    }
-                }
-            }
-            break;
-        case ID_CPR_POLL_REQ:
-            if (reqResult == 0 && !rfu_CHILD_getConnectRecoveryStatus(&sp0) && sp0 < 2)
-            {
-                gUnknown_3005E10.unk_04 = 18;
-            }
-            if (gUnknown_3005E10.unk_34[gUnknown_3005E10.unk_10] && --gUnknown_3005E10.unk_34[gUnknown_3005E10.unk_10] == 0)
-            {
-                gUnknown_3005E10.unk_04 = 18;
-            }
-            break;
-        case ID_CPR_END_REQ:
-            if (reqResult == 0 && !rfu_CHILD_getConnectRecoveryStatus(&sp0))
-            {
-                if (!sp0)
-                {
-                    gUnknown_3005E10.unk_04 = 19;
-                    gUnknown_3005E10.unk_05 = 22;
-                    gUnknown_3005E10.unk_1e = 0x32;
-                }
-                else
-                {
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                    sub_80FE818(gRfuLinkStatus->linkLossSlotFlag);
-                    gUnknown_3005E10.unk_1e = 0x33;
-                }
-                gUnknown_3005E10.unk_34[gUnknown_3005E10.unk_10] = 0;
-                gUnknown_3005E10.unk_30 = 0;
-                gUnknown_3005E10.unk_0a = 0;
-                sub_80FE7F0(gUnknown_3005E10.unk_1e, 0x01);
-                gUnknown_3005E10.unk_1e = 0;
-            }
-            break;
-        case ID_MS_CHANGE_REQ:
-            if (reqResult == 0)
-            {
-                if (gUnknown_3005E10.unk_05 == 22)
-                {
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_11;
-                    gUnknown_3005E10.unk_05 = gUnknown_3005E10.unk_12;
-                    gUnknown_3005E10.unk_02 = 1;
-                    sub_80FE7F0(0x41, 0x00);
-                }
-                else if (gUnknown_3005E10.unk_05 == 15)
-                {
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05;
-                    gUnknown_3005E10.unk_02 = 1;
-                    sub_80FE7F0(0x41, 0x00);
-                    gUnknown_3005E10.unk_24 |= 1 << gUnknown_3005E10.unk_10;
-                    gUnknown_3005E10.unk_28[gUnknown_3005E10.unk_10] = gUnknown_3005E10.unk_26;
-                    rfu_clearSlot(TYPE_NI_SEND, gUnknown_3005E10.unk_10);
-                    tmp = &sp0;
-                    *tmp = rfu_NI_CHILD_setSendGameName(gUnknown_3005E10.unk_10, 0x0e);
-                    if (*tmp)
-                    {
-                        gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                        sub_80FEAF4();
-                        sub_80FE818(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
-                        gUnknown_3005E10.unk_14 = sp0;
-                        sub_80FE7F0(0x25, 0x01);
-                    }
-                }
-            }
-            break;
-        case ID_STOP_MODE_REQ:
-            if (reqResult == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                sub_80FE7F0(0x42, 0x00);
-            }
-            break;
-        }
-        gUnknown_3005E10.unk_0e = 1;
-    }
-    else if (reqResult == 3 && gUnknown_3005E10.unk_0f && (reqCommandId == ID_DATA_TX_REQ || reqCommandId == ID_DATA_RX_REQ || reqCommandId == ID_MS_CHANGE_REQ))
-    {
-        rfu_REQ_RFUStatus();
-        rfu_waitREQComplete();
-        rfu_getRFUStatus(&sp0);
-        if (sp0 == 0 && gRfuLinkStatus->parentChild == MODE_CHILD)
-        {
-            stwiRecvBuffer = rfu_getSTWIRecvBuffer()->rxPacketAlloc.rfuPacket8.data;
-            stwiRecvBuffer[4] = gRfuLinkStatus->connSlotFlag;
-            stwiRecvBuffer[5] = 1;
-            sub_80FD850(0x29);
-            reqResult = 0;
-        }
-    }
-    switch (reqCommandId)
-    {
-    case ID_DISCONNECT_REQ:
-        if (reqResult == 0)
-        {
-            stwiRecvBuffer = rfu_getSTWIRecvBuffer()->rxPacketAlloc.rfuPacket8.data;
-            gUnknown_3005E10.unk_14 = stwiRecvBuffer[8];
-            sub_80FE83C(gUnknown_3005E10.unk_14);
-            if (gUnknown_3005E10.unk_30)
-            {
-                gUnknown_3005E10.unk_30 &= ~gUnknown_3005E10.unk_14;
-                for (i = 0; i < RFU_CHILD_MAX; i++)
-                {
-                    if ((gUnknown_3005E10.unk_14 >> i) & 1)
-                    {
-                        gUnknown_3005E10.unk_34[i] = 0;
-                    }
-                }
-                if (gUnknown_3005E10.unk_06 == 0)
-                {
-                    gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                }
-            }
-            sp0 = gUnknown_3005E10.unk_00 & gUnknown_3005E10.unk_14;
-            for (i = 0; i < RFU_CHILD_MAX; i++)
-            {
-                if ((sp0 >> i) & 1 && gUnknown_3005E10.unk_01)
-                {
-                    gUnknown_3005E10.unk_01--;
-                }
-            }
-            gUnknown_3005E10.unk_00 &= ~gUnknown_3005E10.unk_14;
-            if (gUnknown_3005E10.unk_07)
-            {
-                if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
-                {
-                    if (gUnknown_3005E10.unk_07 == 8)
-                    {
-                        gUnknown_3005E10.unk_1a = gUnknown_3005E10.unk_1c;
-                        gUnknown_3005E10.unk_07 = 6;
-                        gUnknown_3005E10.unk_04 = 6;
-                    }
-                    else if (gUnknown_3005E10.unk_04 != 6 && gUnknown_3005E10.unk_04 != 7)
-                    {
-                        gUnknown_3005E10.unk_07 = 1;
-                        gUnknown_3005E10.unk_04 = 5;
-                    }
-                }
-            }
-            if (gRfuLinkStatus->parentChild == MODE_NEUTRAL)
-            {
-                if (gUnknown_3005E10.unk_04 == 0)
-                {
-                    gUnknown_3005E10.unk_06 = -1;
-                }
-            }
-            if (gUnknown_3005E10.unk_0e == 0)
-            {
-                sub_80FE7F0(0x40, 0x01);
-            }
-        }
-        break;
-    case ID_DATA_RX_REQ:
-        sub_80FE6F0();
-        if (gRfuLinkStatus->parentChild != MODE_NEUTRAL)
-        {
-            sub_80FE7F0(0x50, 0x00);
-        }
-        break;
-    case ID_RESET_REQ:
-    case ID_STOP_MODE_REQ:
-        if (reqResult == 0)
-        {
-            gUnknown_3005E10.unk_0d = 0;
-            gUnknown_3005E10.unk_01 = 0;
-            gUnknown_3005E10.unk_00 = 0;;
-            gUnknown_3005E10.unk_06 = -1;
-            sub_80FEAF4();
-            if (reqCommandId == 61)
-            {
-                sub_80FD484();
-            }
-        }
-        break;
-    }
-    if (reqResult != 0)
-    {
-        if (reqCommandId == ID_SP_START_REQ && reqResult != 0 && gUnknown_3005E10.unk_07 == 4)
-        {
-            gRfuLinkStatus->parentChild = MODE_PARENT;
-            gRfuLinkStatus->connSlotFlag = 0xF;
-            sub_80FE818(15);
-            rfu_waitREQComplete();
-            return;
-        }
-        else
-        {
-            gUnknown_3005E10.unk_14 = reqCommandId;
-            gUnknown_3005E10.unk_16 = reqResult;
-            if (gUnknown_3005E10.unk_0e)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-            }
-            sub_80FE7F0(0xf0, 0x02);
-            sub_80FEAF4();
-        }
-    }
-    if (reqCommandId == ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ)
-    {
-        sub_80FE7F0(0xf2, 0x00);
-        sub_80FEAF4();
-    }
-}
-
-static void sub_80FE394(u16 reqCommandId)
-{
-    u8 r7;
-    u8 ackFlag;
-
-    r7 = gUnknown_3005E10.unk_0e;
-    gUnknown_3005E10.unk_0e = 0;
-    gUnknown_3005E10.unk_0f = 1;
-    if (gRfuLinkStatus->parentChild == MODE_CHILD)
-    {
-        sub_80FD850(reqCommandId);
-        if (gUnknown_3005E10.unk_02 != 1)
-        {
-            sub_80FEAF4();
-            gUnknown_3005E10.unk_0f = 0;
-            gUnknown_3005E10.unk_0e = r7;
-            return;
-        }
-    }
-    else
-    {
-        if (!rfu_UNI_PARENT_getDRAC_ACK(&ackFlag))
-        {
-            gUnknown_3005E10.unk_03 |= ackFlag;
-        }
-    }
-    if (gUnknown_3005E10.unk_44 != NULL)
-    {
-        gUnknown_3005E10.unk_44(reqCommandId);
-        rfu_waitREQComplete();
-        if (gUnknown_3005E10.unk_02 == 2)
-        {
-            sub_80FEAF4();
-        }
-    }
-    gUnknown_3005E10.unk_0f = 0;
-    gUnknown_3005E10.unk_0e = r7;
-}
-
-static void sub_80FE418(void)
-{
-    u8 flags;
-    u8 sp0;
-    u8 i;
-    u8 r5;
-    u8 r4;
-    const u16 *ptr;
-
-    if (gUnknown_3005E10.unk_04 == 5 || gUnknown_3005E10.unk_04 == 6 || gUnknown_3005E10.unk_04 == 7 || gUnknown_3005E10.unk_04 == 8)
-    {
-        flags = ((gRfuLinkStatus->connSlotFlag ^ gUnknown_3005E10.unk_0c) & gRfuLinkStatus->connSlotFlag) & ~gRfuLinkStatus->getNameFlag;
-        gUnknown_3005E10.unk_0c = gRfuLinkStatus->connSlotFlag;
-        if (flags)
-        {
-            gUnknown_3005E10.unk_14 = flags;
-            sub_80FE7F0(0x10, 0x01);
-        }
-        sp0 = 0x00;
-        for (i = 0; i < RFU_CHILD_MAX; i++)
-        {
-            r4 = 1 << i;
-            r5 = 0x00;
-            if (flags & r4)
-            {
-                gUnknown_3005E10.unk_28[i] = gUnknown_3005E10.unk_26;
-                gUnknown_3005E10.unk_24 |= r4;
-            }
-            else if (gUnknown_3005E10.unk_24 & r4)
-            {
-                if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS)
-                {
-                    if (gRfuSlotStatusNI[i]->recv.dataType == 1) // Game identification information
-                    {
-                        r5 = 0x02;
-                        for (ptr = gUnknown_3005E10.unk_20; *ptr != 0xFFFF; ptr++)
-                        {
-                            if (gRfuLinkStatus->partner[i].serialNo == *ptr)
-                            {
-                                gUnknown_3005E10.unk_00 |= r4;
-                                gUnknown_3005E10.unk_01++;
-                                sp0 |= r4;
-                                r5 |= 0x01;
-                                break;
-                            }
-                        }
-                        if (!(r5 & 0x01))
-                        {
-                            r5 |= 0x04;
-                        }
-                    }
-                }
-                else if (--gUnknown_3005E10.unk_28[i] == 0)
-                {
-                    r5 = 0x06;
-                }
-                if (r5 & 0x02)
-                {
-                    gUnknown_3005E10.unk_24 &= ~r4;
-                    gUnknown_3005E10.unk_28[i] = 0;
-                    rfu_clearSlot(TYPE_NI_RECV, i);
-                }
-                if (r5 & 0x04)
-                {
-                    gUnknown_3005E10.unk_0d |= r4;
-                }
-            }
-        }
-        if (sp0)
-        {
-            gUnknown_3005E10.unk_14 = sp0;
-            sub_80FE7F0(0x11, 0x01);
-        }
-        if (gUnknown_3005E10.unk_0d)
-        {
-            r5 = 0x01;
-            if (gRfuLinkStatus->sendSlotUNIFlag && ((gUnknown_3005E10.unk_03 & gUnknown_3005E10.unk_00) != gUnknown_3005E10.unk_00))
-            {
-                r5 = 0x00;
-            }
-            if (r5)
-            {
-                sub_80FE818(gUnknown_3005E10.unk_0d);
-                gUnknown_3005E10.unk_14 = gUnknown_3005E10.unk_0d;
-                gUnknown_3005E10.unk_0d = 0;
-                sub_80FE7F0(0x12, 0x01);
-            }
-        }
-        if (gUnknown_3005E10.unk_24 == 0 && gUnknown_3005E10.unk_04 == 8)
-        {
-            if (gUnknown_3005E10.unk_07 == 0)
-            {
-                gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-                sub_80FE7F0(0x14, 0x00);
-            }
-            else
-            {
-                if (gUnknown_3005E10.unk_07 == 2)
-                {
-                    gUnknown_3005E10.unk_07 = 3;
-                    gUnknown_3005E10.unk_04 = 9;
-                }
-                else
-                {
-                    gUnknown_3005E10.unk_07 = 1;
-                    gUnknown_3005E10.unk_04 = 5;
-                }
-                if (gUnknown_3005E10.unk_00)
-                {
-                    gUnknown_3005E10.unk_1a = 0;
-                    gUnknown_3005E10.unk_07 = 8;
-                    gUnknown_3005E10.unk_04 = 5;
-                }
-            }
-        }
-    }
-}
-
-static void sub_80FE63C(void)
-{
-    u16 imeBak = REG_IME;
-    REG_IME = 0;
-    if (gUnknown_3005E10.unk_04 == 15)
-    {
-        if (--gUnknown_3005E10.unk_28[gUnknown_3005E10.unk_10] == 0 || gRfuSlotStatusNI[gUnknown_3005E10.unk_10]->send.state == SLOT_STATE_SEND_FAILED)
-        {
-            sub_80FEB14();
-            gUnknown_3005E10.unk_04 = 24;
-            rfu_clearSlot(TYPE_NI_SEND, gUnknown_3005E10.unk_10);
-            gUnknown_3005E10.unk_24 &= ~(1 << gUnknown_3005E10.unk_10);
-            gUnknown_3005E10.unk_28[gUnknown_3005E10.unk_10] = 0;
-        }
-    }
-    REG_IME = imeBak;
-    if (gUnknown_3005E10.unk_04 == 24)
-    {
-        if (gUnknown_3005E10.unk_02 == 1)
-        {
-            sub_80FEB14();
-        }
-        if (gUnknown_3005E10.unk_02 == 0)
-        {
-            gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-            sub_80FE818(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
-            gUnknown_3005E10.unk_14 = 0;
-            sub_80FE7F0(0x25, 0x01);
-        }
-    }
-}
-
-static void sub_80FE6F0(void)
-{
-    if (gUnknown_3005E10.unk_04 == 15 && gRfuSlotStatusNI[gUnknown_3005E10.unk_10]->send.state == SLOT_STATE_SEND_SUCCESS)
-    {
-        gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
-        rfu_clearSlot(TYPE_NI_SEND, gUnknown_3005E10.unk_10);
-        gUnknown_3005E10.unk_24 &= ~(1 << gUnknown_3005E10.unk_10);
-        gUnknown_3005E10.unk_28[gUnknown_3005E10.unk_10] = 0;
-        sub_80FE7F0(0x24, 0x00);
-    }
-}
-
-static void sub_80FE74C(void)
-{
-    if (gUnknown_3005E10.unk_06 == 0 && gUnknown_3005E10.unk_0a == 1)
-    {
-        gUnknown_3005E10.unk_11 = gUnknown_3005E10.unk_04;
-        gUnknown_3005E10.unk_12 = gUnknown_3005E10.unk_05;
-        gUnknown_3005E10.unk_04 = 16;
-        gUnknown_3005E10.unk_05 = 17;
-        gUnknown_3005E10.unk_0a = 2;
-    }
-}
-
-static u8 sub_80FE778(void)
-{
-    u8 i;
-    const u16 *ptr;
-    u8 flags = 0x00;
-
-    for (i = 0; i < gRfuLinkStatus->findParentCount; i++)
-    {
-        for (ptr = gUnknown_3005E10.unk_20; *ptr != 0xFFFF; ptr++)
-        {
-            if (gRfuLinkStatus->partner[i].serialNo == *ptr)
-            {
-                flags |= (1 << i);
-            }
-        }
-    }
-    return flags;
-}
-
-static void sub_80FE7F0(u8 a0, u8 a1)
-{
-    if (gUnknown_3005E10.unk_40 != NULL)
-    {
-        gUnknown_3005E10.unk_40(a0, a1);
-    }
-    gUnknown_3005E10.unk_14 = gUnknown_3005E10.unk_16 = 0;
-}
-
-static void sub_80FE818(u8 a0)
-{
-    u8 unk_0e_bak = gUnknown_3005E10.unk_0e;
-    gUnknown_3005E10.unk_0e = 1;
-    rfu_REQ_disconnect(a0);
-    rfu_waitREQComplete();
-    gUnknown_3005E10.unk_0e = unk_0e_bak;
-}
-
-static void sub_80FE83C(u8 a0)
-{
-    u8 i;
-
-    if (gRfuLinkStatus->sendSlotNIFlag)
-    {
-        for (i = 0; i < RFU_CHILD_MAX; i++)
-        {
-            if (gRfuSlotStatusNI[i]->send.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->send.bmSlot & a0)
-            {
-                rfu_changeSendTarget(TYPE_NI, i, gRfuSlotStatusNI[i]->send.bmSlot & ~a0);
-            }
-        }
-    }
-    if (gRfuLinkStatus->recvSlotNIFlag)
-    {
-        for (i = 0; i < RFU_CHILD_MAX; i++)
-        {
-            if (gRfuSlotStatusNI[i]->recv.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->recv.bmSlot & a0)
-            {
-                rfu_NI_stopReceivingData(i);
-            }
-        }
-    }
-    if (gRfuLinkStatus->sendSlotUNIFlag)
-    {
-        gRfuLinkStatus->sendSlotUNIFlag &= ~a0;
-        for (i = 0; i < RFU_CHILD_MAX; i++)
-        {
-            if (gRfuSlotStatusUNI[i]->send.state == SLOT_STATE_SEND_UNI && a0 & gRfuSlotStatusUNI[i]->send.bmSlot)
-            {
-                gRfuSlotStatusUNI[i]->send.bmSlot &= ~a0;
-            }
-        }
-    }
-}
-
-static void sub_80FE918(void)
-{
-    u8 i;
-    u8 j;
-    u8 flags;
-
-    if (gUnknown_3005E10.unk_18)
-    {
-        if (gRfuLinkStatus->sendSlotNIFlag)
-        {
-            for (i = 0; i < RFU_CHILD_MAX; i++)
-            {
-                if (gRfuSlotStatusNI[i]->send.state & SLOT_BUSY_FLAG)
-                {
-                    flags = 0;
-                    for (j = 0; j < RFU_CHILD_MAX; j++)
-                    {
-                        if ((gRfuSlotStatusNI[i]->send.bmSlot >> j) & 1 && gRfuSlotStatusNI[j]->send.failCounter > gUnknown_3005E10.unk_18)
-                        {
-                            flags |= (1 << j);
-                        }
-                        if (flags)
-                        {
-                            rfu_changeSendTarget(TYPE_NI, i, flags ^ gRfuSlotStatusNI[i]->send.bmSlot);
-                        }
-                    }
-                }
-            }
-        }
-        if (gRfuLinkStatus->recvSlotNIFlag)
-        {
-            for (i = 0; i < RFU_CHILD_MAX; i++)
-            {
-                if (gRfuSlotStatusNI[i]->recv.state & SLOT_BUSY_FLAG && gRfuSlotStatusNI[i]->recv.failCounter > gUnknown_3005E10.unk_18)
-                {
-                    rfu_NI_stopReceivingData(i);
-                }
-            }
-        }
-    }
-}
-
-void sub_80FEA10(void (*func)(u16))
-{
-    gUnknown_3005E10.unk_44 = func;
-    rfu_setMSCCallback(sub_80FE394);
-}
-
-static void sub_80FEA28(void (*func)(u8, u8))
-{
-    gUnknown_3005E10.unk_40 = func;
-}
-
-u8 sub_80FEA34(u8 a0, u16 a1)
-{
-    u16 imeBak;
-    if (gUnknown_3005E10.unk_09 && a0 == 0 && gUnknown_3005E10.unk_30)
-    {
-        return 5;
-    }
-    imeBak = REG_IME;
-    REG_IME = 0;
-    gUnknown_3005E10.unk_09 = a0;
-    gUnknown_3005E10.unk_32 = a1;
-    REG_IME = imeBak;
-    return 0;
-}
-
-static u8 sub_80FEA78(u16 a0)
-{
-    if (gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag)
-    {
-        gUnknown_3005E10.unk_14 = 6;
-        sub_80FE7F0(0xf3, 0x01);
-        return 6;
-    }
-    gUnknown_3005E10.unk_18 = a0;
-    return 0;
-}
-
-static u8 sub_80FEAB4(u8 a0)
-{
-    if (gUnknown_3005E10.unk_04 == 9 || gUnknown_3005E10.unk_04 == 10 || gUnknown_3005E10.unk_04 == 11)
-    {
-        gUnknown_3005E10.unk_14 = 7;
-        sub_80FE7F0(0xf3, 0x01);
-        return 7;
-    }
-    if (a0)
-    {
-        gUnknown_3005E10.unk_0b = 1;
-    }
-    else
-    {
-        gUnknown_3005E10.unk_0b = 0;
-    }
-    return 0;
-}
-
-static void sub_80FEAF4(void)
-{
-    if (gUnknown_3005E10.unk_02)
-    {
-        gUnknown_3005E10.unk_02 = 0;
-        sub_80FE7F0(0x45, 0x00);
-    }
-}
-
-void sub_80FEB14(void)
-{
-    if (gUnknown_3005E10.unk_02 == 0)
-    {
-        sub_80FE7F0(0x45, 0x00);
-    }
-    else if (gUnknown_3005E10.unk_02 == 1)
-    {
-        gUnknown_3005E10.unk_02 = 2;
-    }
-}
-
-void sub_80FEB3C(void)
-{
-    if (gUnknown_3005E10.unk_07)
-    {
-        switch (gUnknown_3005E10.unk_04)
-        {
-        case 5:
-            gUnknown_3005E10.unk_07 = 3;
-            gUnknown_3005E10.unk_04 = 9;
-            break;
-        case 6:
-            gUnknown_3005E10.unk_07 = 2;
-            gUnknown_3005E10.unk_1a = 1;
-            break;
-        case 7:
-        case 8:
-            gUnknown_3005E10.unk_07 = 2;
-            break;
-        case 9:
-        case 10:
-            gUnknown_3005E10.unk_1a = 40;
-            break;
-        case 11:
-            gUnknown_3005E10.unk_1a = 40;
-            gUnknown_3005E10.unk_04 = 10;
-            break;
-        }
-    }
-}
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index a27948650..2259e9214 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -12,67 +12,69 @@
 #include "string_util.h"
 #include "task.h"
 #include "constants/species.h"
+#include "constants/union_room.h"
 
-struct UnkRfuStruct_8010A14{
-    char unk_00[15]; // PokemonSioInfo
-    u8 unk_0f;
-    u8 unk_10[4];
-    struct LinkPlayer unk_14[5];
+struct SioInfo
+{
+    char magic[15]; // PokemonSioInfo
+    u8 playerCount;
+    u8 linkPlayerIdx[RFU_CHILD_MAX];
+    struct LinkPlayer linkPlayers[MAX_RFU_PLAYERS];
     u8 fill_a0[0x5c];
 };
 
-static EWRAM_DATA struct UnkLinkRfuStruct_02022B2C sRfuReqConfig = {};
+static EWRAM_DATA struct InitializeParametersTag sRfuReqConfig = {};
 static EWRAM_DATA struct UnkLinkRfuStruct_02022B44 gUnknown_203AC08 = {};
 
-static struct RfuAPIBuffer gRfuAPIBuffer;
-static u8 gUnknown_3001FF8[14];
-static u16 gUnknown_3002008[7];
+static u32 gf_rfu_REQ_api[RFU_API_BUFF_SIZE_RAM / 4];
+static u8 sResendBlock8[14];
+static u16 sResendBlock16[7];
 
 struct GFtgtGname gHostRFUtgtGnameBuffer;
-struct UnkRfuStruct_2 Rfu;
+GF_RFU_MANAGER Rfu;
 u8 gHostRFUtgtUnameBuffer[PLAYER_NAME_LENGTH + 1];
 
 static void sub_80F8AA4(void);
 static void sub_80F8AEC(void);
-static void sub_80F8D20(u16 a0);
-static void sub_80F8DA8(u16 a0);
+static void MscCallback_Child(u16 a0);
+static void MSCCallback_SetUnkCDB(u16 a0);
 static void sub_80F906C(void);
-static void sub_80F9868(u8 unused);
-static void sub_80F9CB4(struct UnkRfuStruct_2_Sub_6c *data);
-static void sub_80F9D04(u16 command);
-static void rfufunc_80F9F44(void);
-static void sub_80F9FA8(void);
-static void rfufunc_80FA020(void);
+static void RfuHandleReceiveCommand(u8 unused);
+static void ResetSendDataManager(struct RfuBlockSend *data);
+static void RfuPrepareSendBuffer(u16 command);
+static void RfuFunc_HandleBlockSend(void);
+static void RfuFunc_SendNextBlock(void);
+static void RfuFunc_SendLastBlock(void);
 static void CallRfuFunc(void);
 static void sub_80FA738(void);
 static int sub_80FA788(void);
 static void sub_80FA834(u8 taskId);
 static void sub_80FA9D0(u16 a0);
-static void sub_80FAA58(void * a0);
-static void sub_80FAA94(u8 taskId);
+static void ValidateAndReceivePokemonSioInfo(void * a0);
+static void Task_ExchangeLinkPlayers(u8 taskId);
 static void sub_80FACF0(u8 taskId);
-static void sub_80FB0E8(u32 a0);
-static void sub_80FB564(s32 a0);
+static void GetLinkmanErrorParams(u32 msg);
+static void sub_80FB564(s32 bmConnectedFlag);
 static void sub_80FBB74(void);
-static u8 sub_80FBC70(const u8 *a0, u16 a1);
-static void sub_80FBCF8(u32 a0);
+static u8 GetPartnerIndexByNameAndTrainerID(const u8 *trainerName, u16 trainerId);
+static void RfuReqDisconnectSlot(u32 bmDisconnectSlot);
 static void sub_80FBE20(u32 a0, u32 a1);
 static void sub_80FC028(u8 taskId);
-static void sub_80FC208(void);
-static void nullsub_89(u8 taskId);
+static void rfu_dbg_clear(void);
+static void Task_idle(u8 taskId);
 
-static const struct UnkLinkRfuStruct_02022B2C sRfuReqConfigTemplate = {
+static const struct InitializeParametersTag sRfuReqConfigTemplate = {
     .maxMFrame = 4,
-    .mcTimer = 32,
-    .availSlotFlag = 0,
-    .mbootFlag = 0,
+    .MC_TimerCount = 32,
+    .availSlot_flag = 0,
+    .mboot_flag = 0,
     .serialNo = 0x0002,
-    .gname = &gHostRFUtgtGnameBuffer,
-    .uname = gHostRFUtgtUnameBuffer,
-    .unk_10 = 0x01,
-    .unk_11 = 0x00,
-    .unk_12 = 0x0258,
-    .unk_14 = 0x012c
+    .gameName = (void *)&gHostRFUtgtGnameBuffer,
+    .userName = gHostRFUtgtUnameBuffer,
+    .fastSearchParent_flag = TRUE,
+    .linkRecovery_enable = FALSE,
+    .linkRecovery_period = 600,
+    .NI_failCounter_limit = 300
 };
 
 static const u8 sAvailSlots[] = {
@@ -82,7 +84,7 @@ static const u8 sAvailSlots[] = {
     [4] = AVAIL_SLOT4
 };
 
-static const u32 gUnknown_843EBD4[] = {
+static const u32 sAllBlocksReceived[] = {
     0x000000,
     0x000001,
     0x000003,
@@ -138,8 +140,10 @@ static const struct {
     { gBlockSendBuffer,  40 }
 };
 
-static const u16 gUnknown_843EC8C[] = {
-    0x0002, 0x7f7d, 0xFFFF
+static const u16 sAcceptedSerialNos[] = {
+    0x0002, // Pokemon FR/LG/EM
+    0x7f7d,
+    0xFFFF
 };
 
 static const char sUnref_843EC92[][15] = {
@@ -166,38 +170,38 @@ static const char sUnref_843ED37[][16] = {
 
 static const TaskFunc gUnknown_843ED88[] = {
     sub_80FA834,
-    sub_80FAA94,
+    Task_ExchangeLinkPlayers,
     sub_80FACF0
 };
 
-static void nullsub_87(const void *unused_0, u8 unused_1, u8 unused_2)
+static void rfu_dbg_print_str(const void *string, u8 x, u8 y)
 {
     // debug?
 }
 
-static void nullsub_88(u16 unused_0, u8 unused_1, u8 unused_2, u8 unused_3)
+static void rfu_dbg_print_num(u16 num, u8 x, u8 y, u8 ndigits)
 {
 
 }
 
-void sub_80F85F8(void)
+void ResetLinkRfuGFLayer(void)
 {
     s32 i;
-    u8 unk_ee_bak = Rfu.unk_ee;
+    u8 errorState_bak = Rfu.errorState;
     CpuFill16(0, &Rfu, sizeof Rfu);
-    Rfu.unk_0c = 0xFF;
-    Rfu.unk_ee = unk_ee_bak;
-    if (Rfu.unk_ee != 4)
+    Rfu.parent_child = MODE_NEUTRAL;
+    Rfu.errorState = errorState_bak;
+    if (Rfu.errorState != 4)
     {
-        Rfu.unk_ee = 0;
+        Rfu.errorState = 0;
     }
     for (i = 0; i < 5; i++)
     {
-        sub_80F9CB4(Rfu.unk_80 + i);
+        ResetSendDataManager(Rfu.cmd_8800_recvbuf + i);
     }
-    sub_80F9CB4(&Rfu.unk_6c);
-    sub_80FC478(&Rfu.unk_124);
-    sub_80FC4D4(&Rfu.unk_9e8);
+    ResetSendDataManager(&Rfu.cmd_8800_sendbuf);
+    RFU_queue_20_70_reset(&Rfu.unk_124);
+    RFU_queue_40_14_reset(&Rfu.unk_9e8);
     CpuFill16(0, gSendCmd, sizeof gSendCmd);
     CpuFill16(0, gRecvCmds, sizeof gRecvCmds);
     CpuFill16(0, gLinkPlayers, sizeof gLinkPlayers);
@@ -218,46 +222,46 @@ void InitRFU(void)
 
 void sub_80F86F4(void)
 {
-    if (!rfu_initializeAPI(&gRfuAPIBuffer, sizeof gRfuAPIBuffer, gIntrTable + 1, TRUE))
+    if (!rfu_initializeAPI(gf_rfu_REQ_api, RFU_API_BUFF_SIZE_RAM, gIntrTable + 1, TRUE))
     {
         gLinkType = 0;
         sub_80FB128(FALSE);
-        sub_80F85F8();
+        ResetLinkRfuGFLayer();
         rfu_setTimerInterrupt(3, gIntrTable + 2);
     }
 }
 
-static void sub_80F8738(u8 taskId)
+static void Task_LinkLeaderSearchForChildren(u8 taskId)
 {
     sub_80FA738();
-    switch (Rfu.unk_04)
+    switch (Rfu.state)
     {
     case 0:
-        sub_80FD4B0(&sRfuReqConfig);
-        Rfu.unk_04 = 1;
+        rfu_LMAN_initializeRFU(&sRfuReqConfig);
+        Rfu.state = 1;
         gTasks[taskId].data[1] = 1;
         break;
     case 1:
         break;
     case 2:
-        sub_80FD538(Rfu.unk_0c, 0, 240, gUnknown_843EC8C);
-        Rfu.unk_04 = 3;
+        rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16*)sAcceptedSerialNos);
+        Rfu.state = 3;
         gTasks[taskId].data[1] = 6;
         break;
     case 3:
         break;
     case 4:
-        sub_80FD760(FALSE);
-        Rfu.unk_04 = 5;
+        rfu_LMAN_stopManager(0);
+        Rfu.state = 5;
         break;
     case 5:
         break;
     case 18:
         Rfu.unk_cdb = 0;
-        sub_80FEA10(sub_80F8DA8);
+        rfu_LMAN_setMSCCallback(MSCCallback_SetUnkCDB);
         sub_80F8AA4();
         sub_80F8AEC();
-        Rfu.unk_04 = 20;
+        Rfu.state = 20;
         gTasks[taskId].data[1] = 8;
         CreateTask(sub_80FA834, 5);
         DestroyTask(taskId);
@@ -282,7 +286,7 @@ static void sub_80F887C(s32 r2, s32 r5)
         {
             if (r2 & 1)
             {
-                Rfu.unk_cde[i] = r4;
+                Rfu.linkPlayerIdx[i] = r4;
                 r4++;
             }
         }
@@ -293,12 +297,12 @@ static void sub_80F887C(s32 r2, s32 r5)
         {
             if (!(r1 & 1))
             {
-                Rfu.unk_cde[i] = 0;
+                Rfu.linkPlayerIdx[i] = 0;
             }
         }
         for (r4 = 4; r4 != 0; r4--)
         {
-            for (i = 0; i < RFU_CHILD_MAX && Rfu.unk_cde[i] != r4; i++);
+            for (i = 0; i < RFU_CHILD_MAX && Rfu.linkPlayerIdx[i] != r4; i++);
             if (i == 4)
             {
                 r6 = r4;
@@ -308,26 +312,26 @@ static void sub_80F887C(s32 r2, s32 r5)
         {
             if (r5 & 1)
             {
-                Rfu.unk_cde[i] = r6++;
+                Rfu.linkPlayerIdx[i] = r6++;
             }
         }
     }
 }
 
-static void sub_80F893C(u8 taskId)
+static void Task_JoinGroupSearchForParent(u8 taskId)
 {
-    switch (Rfu.unk_04)
+    switch (Rfu.state)
     {
     case 0:
-        sub_80FD4B0(&sRfuReqConfigTemplate);
-        Rfu.unk_04 = 1;
+        rfu_LMAN_initializeRFU((INIT_PARAM*)&sRfuReqConfigTemplate);
+        Rfu.state = 1;
         gTasks[taskId].data[1] = 1;
         break;
     case 1:
         break;
     case 6:
-        sub_80FD538(Rfu.unk_0c, 0, 0xf0, gUnknown_843EC8C);
-        Rfu.unk_04 = 7;
+        rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16*)sAcceptedSerialNos);
+        Rfu.state = 7;
         gTasks[taskId].data[1] = 7;
         break;
     case 7:
@@ -339,11 +343,11 @@ static void sub_80F893C(u8 taskId)
         switch (sub_80FA788())
         {
         case 5:
-            Rfu.unk_04 = 12;
+            Rfu.state = 12;
             break;
         case 6:
         case 9:
-            sub_80FEB14();
+            rfu_LMAN_requestChangeAgbClockMaster();
             Rfu.unk_ce4 = 2;
             DestroyTask(taskId);
             break;
@@ -351,15 +355,15 @@ static void sub_80F893C(u8 taskId)
         break;
     case 12:
     {
-        u8 r5 = 1 << Rfu.unk_c3e;
-        rfu_clearSlot(TYPE_NI_SEND | TYPE_NI_RECV, Rfu.unk_c3e);
-        rfu_setRecvBuffer(TYPE_UNI, Rfu.unk_c3e, Rfu.unk_c3f, sizeof(Rfu.unk_c3f));
-        rfu_UNI_setSendData(r5, Rfu.unk_4c, sizeof(Rfu.unk_4c));
+        u8 bmChildSlot = 1 << Rfu.child_slot;
+        rfu_clearSlot(TYPE_NI_SEND | TYPE_NI_RECV, Rfu.child_slot);
+        rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f));
+        rfu_UNI_setSendData(bmChildSlot, Rfu.unk_4c, sizeof(Rfu.unk_4c));
         gTasks[taskId].data[1] = 8;
         DestroyTask(taskId);
         if (gUnknown_203AC08.unk_0f == 0)
         {
-            sub_80FC208();
+            rfu_dbg_clear();
             gUnknown_203AC08.unk_0f++;
         }
         CreateTask(sub_80FA834, 5);
@@ -371,56 +375,56 @@ static void sub_80F893C(u8 taskId)
 static void sub_80F8AA4(void)
 {
     u8 i;
-    u8 r5 = gUnknown_3005E10.unk_00;
+    u8 acceptSlot = lman.acceptSlot_flag;
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (r5 & 1)
+        if (acceptSlot & 1)
         {
             rfu_setRecvBuffer(TYPE_UNI, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i]));
             rfu_clearSlot(TYPE_UNI_SEND | TYPE_UNI_RECV, i);
         }
-        r5 >>= 1;
+        acceptSlot >>= 1;
     }
 }
 
 static void sub_80F8AEC(void)
 {
-    u8 r5 = gUnknown_3005E10.unk_00;
-    rfu_UNI_setSendData(r5, Rfu.unk_c87, sizeof(Rfu.unk_c87));
-    Rfu.unk_cda = sub_80F886C(r5);
-    Rfu.unk_ce2 = r5;
-    sub_80F887C(r5, -1);
-    Rfu.unk_0c = 1;
+    u8 acceptSlot = lman.acceptSlot_flag;
+    rfu_UNI_setSendData(acceptSlot, Rfu.recvCmds, sizeof(Rfu.recvCmds));
+    Rfu.unk_cda = sub_80F886C(acceptSlot);
+    Rfu.bm_PartnerFlags = acceptSlot;
+    sub_80F887C(acceptSlot, -1);
+    Rfu.parent_child = MODE_PARENT;
 }
 
-static void sub_80F8B34(u8 taskId)
+static void Task_LinkRfu_UnionRoomListen(u8 taskId)
 {
-    if (sub_80F9800()->unk_0a_0 == 0x54 && sub_80FB9F4() == 4)
+    if (GetHostRFUtgtGname()->activity == (ACTIVITY_PLYRTALK | IN_UNION_ROOM) && RfuGetErrorStatus() == 4)
     {
-        rfu_REQ_disconnect(gUnknown_3005E10.unk_00);
+        rfu_REQ_disconnect(lman.acceptSlot_flag);
         rfu_waitREQComplete();
-        sub_80FB9E4(0, 0);
+        RfuSetErrorStatus(0, 0);
     }
-    switch (Rfu.unk_04)
+    switch (Rfu.state)
     {
     case 0:
-        sub_80FD4B0(&sRfuReqConfig);
-        Rfu.unk_04 = 1;
+        rfu_LMAN_initializeRFU(&sRfuReqConfig);
+        Rfu.state = 1;
         gTasks[taskId].data[1] = 1;
         break;
     case 1:
         break;
     case 17:
-        sub_80FD538(2, 0, 240, gUnknown_843EC8C);
-        sub_80FEA10(sub_80F8D20);
-        Rfu.unk_04 = 18;
+        rfu_LMAN_establishConnection(2, 0, 240, (u16*)sAcceptedSerialNos);
+        rfu_LMAN_setMSCCallback(MscCallback_Child);
+        Rfu.state = 18;
         break;
     case 18:
         break;
     case 13:
-        if (rfu_UNI_setSendData(1 << Rfu.unk_c3e, Rfu.unk_4c, sizeof(Rfu.unk_4c)) == 0)
+        if (rfu_UNI_setSendData(1 << Rfu.child_slot, Rfu.unk_4c, sizeof(Rfu.unk_4c)) == 0)
         {
-            Rfu.unk_0c = 0;
+            Rfu.parent_child = MODE_CHILD;
             DestroyTask(taskId);
             if (gTasks[taskId].data[7])
             {
@@ -433,20 +437,20 @@ static void sub_80F8B34(u8 taskId)
         }
         break;
     case 14:
-        sub_80FD760(0);
-        Rfu.unk_04 = 15;
+        rfu_LMAN_stopManager(0);
+        Rfu.state = 15;
         break;
     case 15:
         break;
     case 16:
         Rfu.unk_cdb = 0;
-        sub_80FEA10(sub_80F8DA8);
-        sub_80FAFE0(1);
+        rfu_LMAN_setMSCCallback(MSCCallback_SetUnkCDB);
+        UpdateGameData_GroupLockedIn(1);
         sub_80F8AA4();
         sub_80F8AEC();
-        Rfu.unk_04 = 20;
+        Rfu.state = 20;
         gTasks[taskId].data[1] = 8;
-        Rfu.unk_0c = 1;
+        Rfu.parent_child = MODE_PARENT;
         CreateTask(sub_80FA834, 5);
         Rfu.unk_ce8 = TRUE;
         DestroyTask(taskId);
@@ -454,17 +458,17 @@ static void sub_80F8B34(u8 taskId)
     }
 }
 
-void sub_80F8CFC(void)
+void LinkRfu_CreateConnectionAsParent(void)
 {
-    sub_80FD538(1, 0, 240, gUnknown_843EC8C);
+    rfu_LMAN_establishConnection(MODE_PARENT, 0, 240, (u16*)sAcceptedSerialNos);
 }
 
-void sub_80F8D14(void)
+void LinkRfu_StopManagerBeforeEnteringChat(void)
 {
-    sub_80FD760(FALSE);
+    rfu_LMAN_stopManager(0);
 }
 
-static void sub_80F8D20(u16 unused)
+static void MscCallback_Child(u16 unused)
 {
     s32 i;
 
@@ -474,53 +478,53 @@ static void sub_80F8D20(u16 unused)
     }
     rfu_REQ_recvData();
     rfu_waitREQComplete();
-    if (gRfuSlotStatusUNI[Rfu.unk_c3e]->recv.newDataFlag)
+    if (gRfuSlotStatusUNI[Rfu.child_slot]->recv.newDataFlag)
     {
         Rfu.unk_cd0++;
-        sub_80FC588(&Rfu.unk_124, Rfu.unk_c3f);
+        RFU_queue_20_70_recv(&Rfu.unk_124, Rfu.unk_c3f);
         gUnknown_203AC08.unk_06++;
         sub_80F906C();
-        rfu_UNI_readySendData(Rfu.unk_c3e);
-        rfu_UNI_clearRecvNewDataFlag(Rfu.unk_c3e);
+        rfu_UNI_readySendData(Rfu.child_slot);
+        rfu_UNI_clearRecvNewDataFlag(Rfu.child_slot);
     }
-    LinkRfu_REQ_SendData_HandleParentRelationship(TRUE);
+    rfu_LMAN_REQ_sendData(TRUE);
 }
 
-static void sub_80F8DA8(u16 unused)
+static void MSCCallback_SetUnkCDB(u16 unused)
 {
     Rfu.unk_cdb = 1;
 }
 
-void sub_80F8DC0(void)
+void LinkRfu_Shutdown(void)
 {
     u8 i;
 
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return;
 
-    sub_80FD52C();
-    if (Rfu.unk_0c == 1)
+    rfu_LMAN_powerDownRFU();
+    if (Rfu.parent_child == MODE_PARENT)
     {
-        if (FuncIsActiveTask(sub_80F8738) == TRUE)
+        if (FuncIsActiveTask(Task_LinkLeaderSearchForChildren) == TRUE)
         {
             DestroyTask(Rfu.unk_67);
-            sub_80F85F8();
+            ResetLinkRfuGFLayer();
         }
     }
-    else if (Rfu.unk_0c == 0)
+    else if (Rfu.parent_child == MODE_CHILD)
     {
-        if (FuncIsActiveTask(sub_80F893C) == TRUE)
+        if (FuncIsActiveTask(Task_JoinGroupSearchForParent) == TRUE)
         {
             DestroyTask(Rfu.unk_67);
-            sub_80F85F8();
+            ResetLinkRfuGFLayer();
         }
     }
-    else if (Rfu.unk_0c == 2)
+    else if (Rfu.parent_child == 2)
     {
-        if (FuncIsActiveTask(sub_80F8B34) == TRUE)
+        if (FuncIsActiveTask(Task_LinkRfu_UnionRoomListen) == TRUE)
         {
             DestroyTask(Rfu.unk_67);
-            sub_80F85F8();
+            ResetLinkRfuGFLayer();
         }
     }
     for (i = 0; i < NELEMS(gUnknown_843ED88); i++)
@@ -532,59 +536,59 @@ void sub_80F8DC0(void)
     }
 }
 
-static void sub_80F8E74(void)
+static void CreateTask_LinkLeaderSearchForChildren(void)
 {
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return;
-    Rfu.unk_67 = CreateTask(sub_80F8738, 1);
+    Rfu.unk_67 = CreateTask(Task_LinkLeaderSearchForChildren, 1);
 }
 
-static bool8 sub_80F8EA4(void)
+static bool8 RfuStateIs7AndPlayerIsChild(void)
 {
-    if (Rfu.unk_04 == 7 && Rfu.unk_ccd)
+    if (Rfu.state == 7 && Rfu.parentId)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-static bool32 sub_80F8ECC(void)
+static bool32 IsParentSuccessfullyReconnected(void)
 {
-    if (Rfu.unk_04 == 7 && !sub_80FD610(gRfuLinkStatus->partner[Rfu.unk_c3d].id, 240))
+    if (Rfu.state == 7 && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[Rfu.reconnectedParentIdx].id, 240))
     {
-        Rfu.unk_04 = 9;
+        Rfu.state = 9;
         return TRUE;
     }
     return FALSE;
 }
 
-static void sub_80F8F10(void)
+static void CreateTask_JoinGroupSearchForParent(void)
 {
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return;
-    Rfu.unk_67 = CreateTask(sub_80F893C, 1);
+    Rfu.unk_67 = CreateTask(Task_JoinGroupSearchForParent, 1);
 }
 
-bool8 sub_80F8F40(void)
+bool8 LmanAcceptSlotFlagIsNotZero(void)
 {
-    if (gUnknown_3005E10.unk_00)
+    if (lman.acceptSlot_flag)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-void sub_80F8F5C(void)
+void LinkRfu_StopManagerAndFinalizeSlots(void)
 {
-    Rfu.unk_04 = 4;
-    Rfu.unk_ce7 = gUnknown_3005E10.unk_00;
+    Rfu.state = 4;
+    Rfu.acceptSlot_flag = lman.acceptSlot_flag;
 }
 
-bool32 sub_80F8F7C(bool32 a0)
+bool32 WaitRfuState(bool32 force)
 {
-    if (Rfu.unk_04 == 17 || a0)
+    if (Rfu.state == 17 || force)
     {
-        Rfu.unk_04 = 18;
+        Rfu.state = 18;
         return TRUE;
     }
     return FALSE;
@@ -592,7 +596,7 @@ bool32 sub_80F8F7C(bool32 a0)
 
 void sub_80F8FA0(void)
 {
-    Rfu.unk_04 = 14;
+    Rfu.state = 14;
 }
 
 static void sub_80F8FAC(u8 a0)
@@ -616,11 +620,11 @@ static void sub_80F8FD4(void)
 
     for (i = 0; i < 5; i++)
     {
-        struct UnkRfuStruct_2 *ptr = &Rfu;
+        GF_RFU_MANAGER *ptr = &Rfu;
         for (j = 0; j < 7; j++)
         {
-            ptr->unk_c87[i][j][1] = gRecvCmds[i][j] >> 8;
-            ptr->unk_c87[i][j][0] = gRecvCmds[i][j];
+            ptr->recvCmds[i][j][1] = gRecvCmds[i][j] >> 8;
+            ptr->recvCmds[i][j][0] = gRecvCmds[i][j];
         }
     }
     CpuFill16(0, gRecvCmds, sizeof gRecvCmds);
@@ -643,8 +647,8 @@ static void sub_80F906C(void)
 {
     if (Rfu.unk_c3c)
     {
-        u8 r2 = sub_80FC888(&Rfu.unk_c1c, Rfu.unk_4c);
-        if (Rfu.unk_c1c.unk_1e == 0)
+        u8 r2 = RFU_queue_2_14_send(&Rfu.unk_c1c, Rfu.unk_4c);
+        if (Rfu.unk_c1c.count == 0)
         {
             Rfu.unk_c3c = 0;
         }
@@ -655,8 +659,8 @@ static void sub_80F906C(void)
     }
     if (Rfu.unk_c3c == 0)
     {
-        sub_80FC79C(&Rfu.unk_9e8, Rfu.unk_4c);
-        sub_80FC828(&Rfu.unk_c1c, Rfu.unk_4c);
+        RFU_queue_40_14_send(&Rfu.unk_9e8, Rfu.unk_4c);
+        RFU_queue_2_14_recv(&Rfu.unk_c1c, Rfu.unk_4c);
     }
 }
 
@@ -684,39 +688,39 @@ bool32 IsRfuRecvQueueEmpty(void)
 
 static bool32 sub_80F911C(void)
 {
-    if (Rfu.unk_04 < 20)
+    if (Rfu.state < 20)
     {
         rfu_REQ_recvData();
         rfu_waitREQComplete();
-        LinkRfu_REQ_SendData_HandleParentRelationship(FALSE);
+        rfu_LMAN_REQ_sendData(FALSE);
     }
     else
     {
         Rfu.unk_cdb = 0;
-        if ((Rfu.unk_ce2 & gRfuLinkStatus->connSlotFlag) == Rfu.unk_ce2 && (Rfu.unk_ce2 & gRfuLinkStatus->connSlotFlag))
+        if ((Rfu.bm_PartnerFlags & gRfuLinkStatus->connSlotFlag) == Rfu.bm_PartnerFlags && (Rfu.bm_PartnerFlags & gRfuLinkStatus->connSlotFlag))
         {
             if (!Rfu.unk_cdc)
             {
-                if (Rfu.unk_ce3)
+                if (Rfu.bm_DisconnectSlot)
                 {
-                    sub_80FBCF8(Rfu.unk_ce3);
-                    Rfu.unk_ce3 = 0;
+                    RfuReqDisconnectSlot(Rfu.bm_DisconnectSlot);
+                    Rfu.bm_DisconnectSlot = 0;
                     if (Rfu.unk_ce4 == 1)
                     {
-                        sub_80FB9E4(2, 0x8000);
-                        sub_80FB0E8(0x8000);
+                        RfuSetErrorStatus(2, 0x8000);
+                        GetLinkmanErrorParams(0x8000);
                         return FALSE;
                     }
-                    if (!gUnknown_3005E10.unk_00)
+                    if (!lman.acceptSlot_flag)
                     {
-                        sub_80F8DC0();
+                        LinkRfu_Shutdown();
                         gReceivedRemoteLinkPlayers = 0;
                         return FALSE;
                     }
                 }
                 sub_80F8FD4();
                 rfu_UNI_readySendData(Rfu.unk_cda);
-                LinkRfu_REQ_SendData_HandleParentRelationship(TRUE);
+                rfu_LMAN_REQ_sendData(TRUE);
             }
             else
             {
@@ -736,23 +740,23 @@ static bool32 sub_80F9204(void)
     u16 j;
     u8 retval;
 
-    if (Rfu.unk_04 >= 20 && Rfu.unk_0e == 1)
+    if (Rfu.state >= 20 && Rfu.unk_0e == 1)
     {
         rfu_waitREQComplete();
         while (Rfu.unk_cdb == 0)
         {
-            if (Rfu.unk_ee != 0)
+            if (Rfu.errorState != 0)
             {
                 return FALSE;
             }
         }
         rfu_REQ_recvData();
         rfu_waitREQComplete();
-        if ((gUnknown_3005E10.unk_03 & Rfu.unk_ce2) == Rfu.unk_ce2)
+        if ((lman.parentAck_flag & Rfu.bm_PartnerFlags) == Rfu.bm_PartnerFlags)
         {
             Rfu.unk_cdc = 0;
             gUnknown_203AC08.unk_06++;
-            flags = gUnknown_3005E10.unk_00;
+            flags = lman.acceptSlot_flag;
             for (i = 0; i < RFU_CHILD_MAX; i++)
             {
                 if (flags & 1)
@@ -762,14 +766,14 @@ static bool32 sub_80F9204(void)
                         if (Rfu.unk_cee[i] != 0xFF && (Rfu.unk_14[i][0] >> 5) != ((Rfu.unk_cee[i] + 1) & 7))
                         {
                             if (++Rfu.unk_cea[i] > 4)
-                                sub_80FB0E8(0x8100);
+                                GetLinkmanErrorParams(0x8100);
                         }
                         else
                         {
                             Rfu.unk_cee[i] = Rfu.unk_14[i][0] / 32;
                             Rfu.unk_cea[i] = 0;
                             Rfu.unk_14[i][0] &= 0x1f;
-                            r0 = Rfu.unk_cde[i];
+                            r0 = Rfu.linkPlayerIdx[i];
                             for (j = 0; j < 7; j++)
                             {
                                 gRecvCmds[r0][j] = (Rfu.unk_14[i][(j << 1) + 1] << 8) | Rfu.unk_14[i][(j << 1) + 0];
@@ -783,7 +787,7 @@ static bool32 sub_80F9204(void)
                 flags >>= 1;
             }
             sub_80F9038();
-            sub_80F9868(0);
+            RfuHandleReceiveCommand(0);
             CallRfuFunc();
             if (Rfu.unk_ce5 && !Rfu.unk_cd9)
             {
@@ -796,13 +800,13 @@ static bool32 sub_80F9204(void)
                         rfu_setRecvBuffer(TYPE_UNI, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i]));
                     }
                 }
-                sub_80F887C(Rfu.unk_ce2, Rfu.unk_ce2 | Rfu.unk_ce5);
+                sub_80F887C(Rfu.bm_PartnerFlags, Rfu.bm_PartnerFlags | Rfu.unk_ce5);
                 Rfu.unk_ce9 = Rfu.unk_ce5;
-                Rfu.unk_ce2 |= Rfu.unk_ce5;
+                Rfu.bm_PartnerFlags |= Rfu.unk_ce5;
                 Rfu.unk_ce5 = 0;
-                rfu_UNI_setSendData(Rfu.unk_ce2, Rfu.unk_c87, sizeof(Rfu.unk_c87));
-                Rfu.unk_cda = sub_80F886C(Rfu.unk_ce2);
-                CreateTask(sub_80FAA94, 0);
+                rfu_UNI_setSendData(Rfu.bm_PartnerFlags, Rfu.recvCmds, sizeof(Rfu.recvCmds));
+                Rfu.unk_cda = sub_80F886C(Rfu.bm_PartnerFlags);
+                CreateTask(Task_ExchangeLinkPlayers, 0);
             }
         }
         else
@@ -837,7 +841,7 @@ static void sub_80F94BC(u16 *a0, u8 *a1)
     }
 }
 
-static bool32 sub_80F9514(void)
+static bool32 RfuProcessEnqueuedRecvBlock(void)
 {
     u8 i;
     u8 j;
@@ -845,7 +849,7 @@ static bool32 sub_80F9514(void)
     u8 sp48[2 * (CMD_LENGTH - 1)];
     u8 switchval;
 
-    sub_80FC6E8(&Rfu.unk_124, sp00);
+    RFU_queue_20_70_send(&Rfu.unk_124, sp00);
     for (i = 0; i < MAX_RFU_PLAYERS; i++)
     {
         for (j = 0; j < CMD_LENGTH - 1; j++)
@@ -853,23 +857,23 @@ static bool32 sub_80F9514(void)
             gRecvCmds[i][j] = (sp00[i * 14 + (j << 1) + 1] << 8) | sp00[i * 14 + (j << 1) + 0];
         }
     }
-    sub_80F9868(0);
-    if (gUnknown_3005E10.unk_02 == 0 && Rfu.unk_ce4)
+    RfuHandleReceiveCommand(0);
+    if (lman.childClockSlave_flag == 0 && Rfu.unk_ce4)
     {
         rfu_REQ_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
         rfu_waitREQComplete();
-        switchval = sub_80FB9F4();
+        switchval = RfuGetErrorStatus();
         if (switchval != 1 && switchval != 6 && switchval != 9)
-            sub_80FB9E4(2, 0x9000);
+            RfuSetErrorStatus(2, 0x9000);
         rfu_clearAllSlot();
         gReceivedRemoteLinkPlayers = FALSE;
         Rfu.RfuFunc = NULL;
         if (Rfu.unk_ce4 == 1)
         {
-            sub_80FB9E4(2, 0x9000);
-            sub_80FB0E8(0x9000);
+            RfuSetErrorStatus(2, 0x9000);
+            GetLinkmanErrorParams(0x9000);
         }
-        gUnknown_3005E10.unk_04 = gUnknown_3005E10.unk_05 = 0;
+        lman.state = lman.next_state = 0;
         Rfu.unk_ce4 = 0;
     }
     if (Rfu.unk_cd0)
@@ -877,36 +881,36 @@ static bool32 sub_80F9514(void)
         Rfu.unk_cd0--;
         CallRfuFunc();
         sub_80F94BC(gSendCmd, sp48);
-        sub_80FC63C(&Rfu.unk_9e8, sp48);
+        RFU_queue_40_14_recv(&Rfu.unk_9e8, sp48);
         for (i = 0; i < CMD_LENGTH - 1; i++)
             gSendCmd[i] = 0;
     }
     return IsRfuRecvQueueEmpty();
 }
 
-static void sub_80F965C(u8 unused, u32 flags)
+static void HandleSendFailure(u8 unused, u32 flags)
 {
     s32 i, j;
 
-    const u8 *r10 = Rfu.unk_6c.unk_04;
-    for (i = 0; i < Rfu.unk_6c.unk_02; i++)
+    const u8 *r10 = Rfu.cmd_8800_sendbuf.payload;
+    for (i = 0; i < Rfu.cmd_8800_sendbuf.count; i++)
     {
         if (!(flags & 1))
         {
-            gUnknown_3002008[0] = (~0x76ff) | i;
+            sResendBlock16[0] = RFU_COMMAND_0x8900 | i;
             for (j = 0; j < 7; j++)
             {
-                gUnknown_3002008[j + 1] = (r10[12 * i + (j << 1) + 1] << 8) | r10[12 * i + (j << 1) + 0];
+                sResendBlock16[j + 1] = (r10[12 * i + (j << 1) + 1] << 8) | r10[12 * i + (j << 1) + 0];
             }
             for (j = 0; j < 7; j++)
             {
-                gUnknown_3001FF8[2 * j + 1] = gUnknown_3002008[j] >> 8;
-                gUnknown_3001FF8[2 * j + 0] = gUnknown_3002008[j];
+                sResendBlock8[2 * j + 1] = sResendBlock16[j] >> 8;
+                sResendBlock8[2 * j + 0] = sResendBlock16[j];
 
                 j++;j--; // Needed to match;
             }
-            sub_80FC63C(&Rfu.unk_9e8, gUnknown_3001FF8);
-            Rfu.unk_6c.unk_0c |= (1 << i);
+            RFU_queue_40_14_recv(&Rfu.unk_9e8, sResendBlock8);
+            Rfu.cmd_8800_sendbuf.failedFlags |= (1 << i);
         }
         flags >>= 1;
     }
@@ -914,7 +918,7 @@ static void sub_80F965C(u8 unused, u32 flags)
 
 void Rfu_SetBlockReceivedFlag(u8 a0)
 {
-    if (Rfu.unk_0c == 1 && a0)
+    if (Rfu.parent_child == MODE_PARENT && a0)
         Rfu.unk_61[a0] = 1;
     else
         Rfu.unk_5c[a0] = 1;
@@ -923,23 +927,23 @@ void Rfu_SetBlockReceivedFlag(u8 a0)
 void Rfu_ResetBlockReceivedFlag(u8 a0)
 {
     Rfu.unk_5c[a0] = 0;
-    Rfu.unk_80[a0].unk_12 = 0;
+    Rfu.cmd_8800_recvbuf[a0].receiving = 0;
 }
 
 static u8 sub_80F9770(const u8 *a0)
 {
     u8 i;
 
-    if (Rfu.unk_0c == 1)
+    if (Rfu.parent_child == MODE_PARENT)
         return FALSE;
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        Rfu.unk_cde[i] = a0[i];
+        Rfu.linkPlayerIdx[i] = a0[i];
     }
-    return a0[Rfu.unk_c3e];
+    return a0[Rfu.child_slot];
 }
 
-static void rfu_func_080F97B8(void)
+static void RfuFunc_SendKeysToRfu(void)
 {
      static u8 gUnknown_3001188;
     if (gReceivedRemoteLinkPlayers
@@ -948,24 +952,24 @@ static void rfu_func_080F97B8(void)
     {
         gUnknown_3001188++;
         gHeldKeyCodeToSend |= (gUnknown_3001188 << 8);
-        sub_80F9D04(0xbe00);
+        RfuPrepareSendBuffer(RFU_COMMAND_0xbe00);
     }
 }
 
-struct GFtgtGname *sub_80F9800(void)
+struct GFtgtGname *GetHostRFUtgtGname(void)
 {
     return &gHostRFUtgtGnameBuffer;
 }
 
 bool32 IsSendingKeysToRfu(void)
 {
-    return Rfu.RfuFunc == rfu_func_080F97B8;
+    return Rfu.RfuFunc == RfuFunc_SendKeysToRfu;
 }
 
-void sub_80F9828(void)
+void StartSendingKeysToRfu(void)
 {
     AGB_ASSERT_EX(Rfu.RfuFunc == NULL, ABSPATH("rfu.c"), 1473);
-    Rfu.RfuFunc = rfu_func_080F97B8;
+    Rfu.RfuFunc = RfuFunc_SendKeysToRfu;
 }
 
 void Rfu_set_zero(void)
@@ -973,7 +977,7 @@ void Rfu_set_zero(void)
     Rfu.RfuFunc = NULL;
 }
 
-static void sub_80F9868(u8 unused)
+static void RfuHandleReceiveCommand(u8 unused)
 {
     u16 i;
     u16 j;
@@ -982,63 +986,63 @@ static void sub_80F9868(u8 unused)
     {
         switch (gRecvCmds[i][0] & 0xff00)
         {
-        case 0x7800:
-            if (Rfu.unk_0c == 0 && gReceivedRemoteLinkPlayers != 0)
+        case RFU_COMMAND_0x7800:
+            if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers != 0)
                 return;
             // fallthrough
-        case 0x7700:
+        case RFU_COMMAND_0x7700:
             if (gRfuLinkStatus->parentChild == MODE_CHILD)
             {
                 Rfu.playerCount = gRecvCmds[i][1];
                 Rfu.unk_cce = sub_80F9770((u8 *)(gRecvCmds[i] + 2));
             }
             break;
-        case 0x8800:
-            if (Rfu.unk_80[i].unk_12 == 0)
+        case RFU_COMMAND_0x8800:
+            if (Rfu.cmd_8800_recvbuf[i].receiving == 0)
             {
-                Rfu.unk_80[i].unk_00 = 0;
-                Rfu.unk_80[i].unk_02 = gRecvCmds[i][1];
-                Rfu.unk_80[i].unk_11 = gRecvCmds[i][2];
-                Rfu.unk_80[i].unk_08 = 0;
-                Rfu.unk_80[i].unk_12 = 1;
+                Rfu.cmd_8800_recvbuf[i].next = 0;
+                Rfu.cmd_8800_recvbuf[i].count = gRecvCmds[i][1];
+                Rfu.cmd_8800_recvbuf[i].owner = gRecvCmds[i][2];
+                Rfu.cmd_8800_recvbuf[i].receivedFlags = 0;
+                Rfu.cmd_8800_recvbuf[i].receiving = 1;
                 Rfu.unk_5c[i] = 0;
             }
             break;
-        case 0x8900:
-            if (Rfu.unk_80[i].unk_12 == 1)
+        case RFU_COMMAND_0x8900:
+            if (Rfu.cmd_8800_recvbuf[i].receiving == 1)
             {
-                Rfu.unk_80[i].unk_00 = gRecvCmds[i][0] & 0xff;
-                Rfu.unk_80[i].unk_08 |= (1 << Rfu.unk_80[i].unk_00);
+                Rfu.cmd_8800_recvbuf[i].next = gRecvCmds[i][0] & 0xff;
+                Rfu.cmd_8800_recvbuf[i].receivedFlags |= (1 << Rfu.cmd_8800_recvbuf[i].next);
                 for (j = 0; j < 6; j++)
-                    gBlockRecvBuffer[i][Rfu.unk_80[i].unk_00 * 6 + j] = gRecvCmds[i][j + 1];
-                if (Rfu.unk_80[i].unk_08 == gUnknown_843EBD4[Rfu.unk_80[i].unk_02])
+                    gBlockRecvBuffer[i][Rfu.cmd_8800_recvbuf[i].next * 6 + j] = gRecvCmds[i][j + 1];
+                if (Rfu.cmd_8800_recvbuf[i].receivedFlags == sAllBlocksReceived[Rfu.cmd_8800_recvbuf[i].count])
                 {
-                    Rfu.unk_80[i].unk_12 = 2;
+                    Rfu.cmd_8800_recvbuf[i].receiving = 2;
                     Rfu_SetBlockReceivedFlag(i);
-                    if (sub_80F9800()->unk_0a_0 == 0x45 && gReceivedRemoteLinkPlayers != 0 && Rfu.unk_0c == 0)
-                        sub_80FAA58(gBlockRecvBuffer);
+                    if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers != 0 && Rfu.parent_child == MODE_CHILD)
+                        ValidateAndReceivePokemonSioInfo(gBlockRecvBuffer);
                 }
             }
             break;
-        case 0xa100:
+        case RFU_COMMAND_0xa100:
             Rfu_InitBlockSend(gUnknown_843EC64[gRecvCmds[i][1]].buffer, (u16)gUnknown_843EC64[gRecvCmds[i][1]].size);
             break;
-        case 0x5f00:
-            Rfu.unk_e4[i] = 1;
+        case RFU_COMMAND_0x5f00:
+            Rfu.cmd5f00Ack[i] = 1;
             break;
-        case 0x6600:
-            if (Rfu.unk_100 == gRecvCmds[i][1])
-                Rfu.unk_e9[i] = 1;
+        case RFU_COMMAND_0x6600:
+            if (Rfu.cmd_6600_count == gRecvCmds[i][1])
+                Rfu.cmd_6600_recvd[i] = 1;
             break;
-        case 0xed00:
-            if (Rfu.unk_0c == 0)
+        case RFU_COMMAND_0xed00:
+            if (Rfu.parent_child == MODE_CHILD)
             {
                 if (gReceivedRemoteLinkPlayers != 0)
                 {
                     if (gRecvCmds[i][1] & gRfuLinkStatus->connSlotFlag)
                     {
                         gReceivedRemoteLinkPlayers = 0;
-                        sub_80FEB14();
+                        rfu_LMAN_requestChangeAgbClockMaster();
                         Rfu.unk_ce4 = gRecvCmds[i][2];
                     }
                     Rfu.playerCount = gRecvCmds[i][3];
@@ -1047,25 +1051,25 @@ static void sub_80F9868(u8 unused)
             }
             else
             {
-                sub_80F9D04(0xee00);
+                RfuPrepareSendBuffer(RFU_COMMAND_0xee00);
                 gSendCmd[1] = gRecvCmds[i][1];
                 gSendCmd[2] = gRecvCmds[i][2];
                 gSendCmd[3] = gRecvCmds[i][3];
             }
             break;
-        case 0xee00:
-            if (Rfu.unk_0c == 1)
+        case RFU_COMMAND_0xee00:
+            if (Rfu.parent_child == MODE_PARENT)
             {
-                Rfu.unk_ce3 |= gRecvCmds[i][1];
+                Rfu.bm_DisconnectSlot |= gRecvCmds[i][1];
                 Rfu.unk_ce4 = gRecvCmds[i][2];
                 sub_80FA9D0(gRecvCmds[i][1]);
             }
             break;
-        case 0xbe00:
+        case RFU_COMMAND_0xbe00:
             gLinkPartnersHeldKeys[i] = gRecvCmds[i][1];
             break;
         }
-        if (Rfu.unk_0c == 1 && Rfu.unk_61[i])
+        if (Rfu.parent_child == MODE_PARENT && Rfu.unk_61[i])
         {
             if (Rfu.unk_61[i] == 4)
             {
@@ -1078,13 +1082,13 @@ static void sub_80F9868(u8 unused)
     }
 }
 
-static bool8 sub_80F9C50(void)
+static bool8 Cmd8000recvIsFinished(void)
 {
     s32 i;
 
     for (i = 0; i < 5; i++)
     {
-        if (Rfu.unk_80[i].unk_12)
+        if (Rfu.cmd_8800_recvbuf[i].receiving)
             return FALSE;
     }
     return TRUE;
@@ -1096,21 +1100,21 @@ static bool8 sub_80F9C78(void)
 
     for (i = 0; i < Rfu.playerCount; i++)
     {
-        if (Rfu.unk_80[i].unk_12 != 2 || Rfu.unk_5c[i] != 1)
+        if (Rfu.cmd_8800_recvbuf[i].receiving != 2 || Rfu.unk_5c[i] != 1)
             return FALSE;
     }
     return TRUE;
 }
 
-static void sub_80F9CB4(struct UnkRfuStruct_2_Sub_6c *data)
+static void ResetSendDataManager(struct RfuBlockSend *data)
 {
-    data->unk_00 = 0;
-    data->unk_02 = 0;
-    data->unk_04 = NULL;
-    data->unk_08 = 0;
-    data->unk_10 = 0;
-    data->unk_11 = 0;
-    data->unk_12 = 0;
+    data->next = 0;
+    data->count = 0;
+    data->payload = NULL;
+    data->receivedFlags = 0;
+    data->sending = 0;
+    data->owner = 0;
+    data->receiving = 0;
 }
 
 u8 Rfu_GetBlockReceivedStatus(void)
@@ -1120,7 +1124,7 @@ u8 Rfu_GetBlockReceivedStatus(void)
 
     for (i = 0; i < 5; i++)
     {
-        if (Rfu.unk_80[i].unk_12 == 2 && Rfu.unk_5c[i] == 1)
+        if (Rfu.cmd_8800_recvbuf[i].receiving == 2 && Rfu.unk_5c[i] == 1)
         {
             flags |= (1 << i);
         }
@@ -1128,7 +1132,7 @@ u8 Rfu_GetBlockReceivedStatus(void)
     return flags;
 }
 
-static void sub_80F9D04(u16 command)
+static void RfuPrepareSendBuffer(u16 command)
 {
     u8 i;
     u8 *buff;
@@ -1137,47 +1141,47 @@ static void sub_80F9D04(u16 command)
     gSendCmd[0] = command;
     switch (command)
     {
-    case 0x8800:
-        gSendCmd[1] = Rfu.unk_6c.unk_02;
-        gSendCmd[2] = Rfu.unk_6c.unk_11 + 0x80;
+    case RFU_COMMAND_0x8800:
+        gSendCmd[1] = Rfu.cmd_8800_sendbuf.count;
+        gSendCmd[2] = Rfu.cmd_8800_sendbuf.owner + 0x80;
         break;
-    case 0xa100:
-        if (sub_80F9C50())
+    case RFU_COMMAND_0xa100:
+        if (Cmd8000recvIsFinished())
             gSendCmd[1] = Rfu.unk_5a;
         break;
-    case 0x7700:
-    case 0x7800:
-        tmp = Rfu.unk_ce2 ^ Rfu.unk_ce3;
+    case RFU_COMMAND_0x7700:
+    case RFU_COMMAND_0x7800:
+        tmp = Rfu.bm_PartnerFlags ^ Rfu.bm_DisconnectSlot;
         Rfu.playerCount = gUnknown_843EC41[tmp] + 1;
         gSendCmd[1] = Rfu.playerCount;
         buff = (u8 *)(gSendCmd + 2);
         for (i = 0; i < RFU_CHILD_MAX; i++)
-            buff[i] = Rfu.unk_cde[i];
+            buff[i] = Rfu.linkPlayerIdx[i];
         break;
-    case 0x6600:
-    case 0x5f00:
-        gSendCmd[1] = Rfu.unk_100;
+    case RFU_COMMAND_0x6600:
+    case RFU_COMMAND_0x5f00:
+        gSendCmd[1] = Rfu.cmd_6600_count;
         break;
-    case 0x2f00:
+    case RFU_COMMAND_0x2f00:
         for (i = 0; i < 6; i++)
             gSendCmd[1 + i] = Rfu.unk_f2[i];
         break;
-    case 0xbe00:
+    case RFU_COMMAND_0xbe00:
         gSendCmd[1] = gHeldKeyCodeToSend;
         break;
-    case 0xee00:
+    case RFU_COMMAND_0xee00:
         break;
-    case 0xed00:
+    case RFU_COMMAND_0xed00:
         break;
     }
 }
 
-void sub_80F9E2C(void *a0)
+void RfuPrepareSend0x2f00(void * data)
 {
-    if (gSendCmd[0] == 0 && !sub_80FBA00())
+    if (gSendCmd[0] == 0 && !RfuIsErrorStatus1or2())
     {
-        memcpy(Rfu.unk_f2, a0, sizeof(Rfu.unk_f2));
-        sub_80F9D04(0x2f00);
+        memcpy(Rfu.unk_f2, data, sizeof(Rfu.unk_f2));
+        RfuPrepareSendBuffer(RFU_COMMAND_0x2f00);
     }
 }
 
@@ -1189,77 +1193,77 @@ bool32 Rfu_InitBlockSend(const u8 *src, size_t size)
         return FALSE;
     if (gSendCmd[0] != 0)
         return FALSE;
-    if (Rfu.unk_6c.unk_10 != 0)
+    if (Rfu.cmd_8800_sendbuf.sending != 0)
     {
         gUnknown_203AC08.unk_83++;
         return FALSE;
     }
     r4 = (size % 12) != 0;
-    Rfu.unk_6c.unk_11 = GetMultiplayerId();
-    Rfu.unk_6c.unk_10 = 1;
-    Rfu.unk_6c.unk_02 = (size / 12) + r4;
-    Rfu.unk_6c.unk_00 = 0;
-    if (size > 0x100)
-        Rfu.unk_6c.unk_04 = src;
+    Rfu.cmd_8800_sendbuf.owner = GetMultiplayerId();
+    Rfu.cmd_8800_sendbuf.sending = 1;
+    Rfu.cmd_8800_sendbuf.count = (size / 12) + r4;
+    Rfu.cmd_8800_sendbuf.next = 0;
+    if (size > 0x100) // should never be reached
+        Rfu.cmd_8800_sendbuf.payload = src;
     else
     {
         if (src != gBlockSendBuffer)
             memcpy(gBlockSendBuffer, src, size);
-        Rfu.unk_6c.unk_04 = gBlockSendBuffer;
+        Rfu.cmd_8800_sendbuf.payload = gBlockSendBuffer;
     }
-    sub_80F9D04(0x8800);
-    Rfu.RfuFunc = rfufunc_80F9F44;
+    RfuPrepareSendBuffer(RFU_COMMAND_0x8800);
+    Rfu.RfuFunc = RfuFunc_HandleBlockSend;
     Rfu.unk_5b = 0;
     return TRUE;
 }
 
-static void rfufunc_80F9F44(void)
+static void RfuFunc_HandleBlockSend(void)
 {
     if (gSendCmd[0] == 0)
     {
-        sub_80F9D04(0x8800);
-        if (Rfu.unk_0c == 1)
+        RfuPrepareSendBuffer(RFU_COMMAND_0x8800);
+        if (Rfu.parent_child == MODE_PARENT)
         {
             if (++Rfu.unk_5b > 2)
-                Rfu.RfuFunc = sub_80F9FA8;
+                Rfu.RfuFunc = RfuFunc_SendNextBlock;
         }
         else
         {
-            if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == 0x8800)
-                Rfu.RfuFunc = sub_80F9FA8;
+            if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == RFU_COMMAND_0x8800)
+                Rfu.RfuFunc = RfuFunc_SendNextBlock;
         }
     }
 }
-static void sub_80F9FA8(void)
+static void RfuFunc_SendNextBlock(void)
 {
     s32 i;
-    const u8 *src = Rfu.unk_6c.unk_04;
-    gSendCmd[0] = 0x8900 | Rfu.unk_6c.unk_00;
+    const u8 *src = Rfu.cmd_8800_sendbuf.payload;
+    gSendCmd[0] = RFU_COMMAND_0x8900 | Rfu.cmd_8800_sendbuf.next;
     for (i = 0; i < 7; i++)
-        gSendCmd[i + 1] = (src[(i << 1) + Rfu.unk_6c.unk_00 * 12 + 1] << 8) | src[(i << 1) + Rfu.unk_6c.unk_00 * 12 + 0];
-    Rfu.unk_6c.unk_00++;
-    if (Rfu.unk_6c.unk_02 <= Rfu.unk_6c.unk_00)
+        gSendCmd[i + 1] = (src[(i << 1) + Rfu.cmd_8800_sendbuf.next * 12 + 1] << 8) | src[(i << 1) + Rfu.cmd_8800_sendbuf.next * 12 + 0];
+    Rfu.cmd_8800_sendbuf.next++;
+    if (Rfu.cmd_8800_sendbuf.count <= Rfu.cmd_8800_sendbuf.next)
     {
-        Rfu.unk_6c.unk_10 = 0;
-        Rfu.RfuFunc = rfufunc_80FA020;
+        Rfu.cmd_8800_sendbuf.sending = 0;
+        Rfu.RfuFunc = RfuFunc_SendLastBlock;
     }
 }
 
-static void rfufunc_80FA020(void)
+static void RfuFunc_SendLastBlock(void)
 {
-    const u8 *src = Rfu.unk_6c.unk_04;
+    const u8 *src = Rfu.cmd_8800_sendbuf.payload;
     u8 mpId = GetMultiplayerId();
     s32 i;
-    if (Rfu.unk_0c == 0)
+    if (Rfu.parent_child == MODE_CHILD)
     {
-        gSendCmd[0] = (~0x76ff) | (Rfu.unk_6c.unk_02 - 1);
+        gSendCmd[0] = RFU_COMMAND_0x8900 | (Rfu.cmd_8800_sendbuf.count - 1);
         for (i = 0; i < 7; i++)
-            gSendCmd[i + 1] = (src[(i << 1) + (Rfu.unk_6c.unk_02 - 1) * 12 + 1] << 8) | src[(i << 1) + (Rfu.unk_6c.unk_02 - 1) * 12 + 0];
-        if ((u8)gRecvCmds[mpId][0] == Rfu.unk_6c.unk_02 - 1)
+            gSendCmd[i + 1] = (src[(i << 1) + (Rfu.cmd_8800_sendbuf.count - 1) * 12 + 1] << 8) | src[(i << 1) + (Rfu.cmd_8800_sendbuf.count - 1) * 12 + 0];
+        if ((u8)gRecvCmds[mpId][0] == Rfu.cmd_8800_sendbuf.count - 1)
         {
-            if (Rfu.unk_80[mpId].unk_08 != gUnknown_843EBD4[Rfu.unk_80[mpId].unk_02])
+            if (Rfu.cmd_8800_recvbuf[mpId].receivedFlags != sAllBlocksReceived[Rfu.cmd_8800_recvbuf[mpId].count])
             {
-                sub_80F965C(mpId, Rfu.unk_80[mpId].unk_08);
+                HandleSendFailure(mpId, Rfu.cmd_8800_recvbuf[mpId].receivedFlags);
                 gUnknown_203AC08.unk_64++;
             }
             else
@@ -1273,45 +1277,45 @@ static void rfufunc_80FA020(void)
 bool8 sub_80FA0F8(u8 a0)
 {
     Rfu.unk_5a = a0;
-    sub_80F9D04(0xa100);
+    RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
     return TRUE;
 }
 
-static void sub_80FA114(void)
+static void RfuFunc_End5F00_PowerDownRfu(void)
 {
     rfu_clearAllSlot();
-    sub_80FD52C();
+    rfu_LMAN_powerDownRFU();
     gReceivedRemoteLinkPlayers = 0;
     Rfu.unk_ef = 1;
     Rfu.RfuFunc = NULL;
 }
 
-static void sub_80FA140(void)
+static void RfuFunc_End5F00_ParentDisconnect(void)
 {
     rfu_REQ_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
     rfu_waitREQComplete();
-    sub_80FA114();
+    RfuFunc_End5F00_PowerDownRfu();
 }
 
-static void sub_80FA160(void)
+static void RfuFunc_End5F00(void)
 {
-    if (Rfu.unk_0c == 0)
+    if (Rfu.parent_child == MODE_CHILD)
     {
-        sub_80FEB14();
+        rfu_LMAN_requestChangeAgbClockMaster();
         Rfu.unk_ce4 = 2;
     }
     else
-        Rfu.RfuFunc = sub_80FA140;
+        Rfu.RfuFunc = RfuFunc_End5F00_ParentDisconnect;
 }
 
 void LinkRfu_FatalError(void)
 {
-    sub_80FEB14();
+    rfu_LMAN_requestChangeAgbClockMaster();
     Rfu.unk_ce4 = 1;
-    Rfu.unk_ce3 = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
+    Rfu.bm_DisconnectSlot = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag;
 }
 
-static void sub_80FA1C4(void)
+static void RfuFunc_WaitAck5F00(void)
 {
     s32 i;
     u8 playerCount = Rfu.playerCount;
@@ -1319,132 +1323,132 @@ static void sub_80FA1C4(void)
 
     for (i = 0; i < MAX_RFU_PLAYERS; i++)
     {
-        if (Rfu.unk_e4[i])
+        if (Rfu.cmd5f00Ack[i])
             count++;
     }
     if (count == playerCount)
     {
-        gBattleTypeFlags &= (u16)~BATTLE_TYPE_20;
-        if (Rfu.unk_0c == 0)
+        gBattleTypeFlags &= ~(BATTLE_TYPE_20 | 0xFFFF0000);
+        if (Rfu.parent_child == MODE_CHILD)
         {
-            Rfu.unk_ee = 3;
-            sub_80FA160();
+            Rfu.errorState = 3;
+            RfuFunc_End5F00();
         }
         else
-            Rfu.RfuFunc = sub_80FA160;
+            Rfu.RfuFunc = RfuFunc_End5F00;
     }
 }
 
-static void sub_80FA224(void)
+static void RfuFunc_BuildCommand5F00(void)
 {
     if (gSendCmd[0] == 0 && !Rfu.unk_ce8)
     {
-        sub_80F9D04(0x5f00);
-        Rfu.RfuFunc = sub_80FA1C4;
+        RfuPrepareSendBuffer(RFU_COMMAND_0x5f00);
+        Rfu.RfuFunc = RfuFunc_WaitAck5F00;
     }
 }
 
-static void sub_80FA25C(u8 taskId)
+static void Task_WaitRfuFuncAndSetBuildCmd5F00(u8 taskId)
 {
     if (Rfu.RfuFunc == NULL)
     {
         Rfu.unk_cd9 = 1;
-        Rfu.RfuFunc = sub_80FA224;
+        Rfu.RfuFunc = RfuFunc_BuildCommand5F00;
         DestroyTask(taskId);
     }
 }
 
-void task_add_05_task_del_08FA224_when_no_RfuFunc(void)
+void Rfu_BeginBuildAndSendCommand5F(void)
 {
-    if (!FuncIsActiveTask(sub_80FA25C))
-        CreateTask(sub_80FA25C, 5);
+    if (!FuncIsActiveTask(Task_WaitRfuFuncAndSetBuildCmd5F00))
+        CreateTask(Task_WaitRfuFuncAndSetBuildCmd5F00, 5);
 }
 
-static void sub_80FA2B0(void)
+static void RfuFunc_Send6600_3(void)
 {
     u8 playerCount;
     u8 i;
 
-    if (GetMultiplayerId() != 0)
+    if (GetMultiplayerId() != 0) // child
     {
-        if (Rfu.unk_124.unk_8c2 == 0 && Rfu.unk_fe > 0x3c)
+        if (Rfu.unk_124.count == 0 && Rfu.cmd_6600_timer > 60)
         {
-            sub_80F9D04(0x6600);
-            Rfu.unk_fe = 0;
+            RfuPrepareSendBuffer(RFU_COMMAND_0x6600);
+            Rfu.cmd_6600_timer = 0;
         }
     }
     playerCount = GetLinkPlayerCount();
     for (i = 0; i < playerCount; i++)
     {
-        if (Rfu.unk_e9[i] == 0)
+        if (Rfu.cmd_6600_recvd[i] == 0)
             break;
     }
     if (i == playerCount)
     {
         for (i = 0; i < MAX_RFU_PLAYERS; i++)
-            Rfu.unk_e9[i] = 0;
-        Rfu.unk_100++;
+            Rfu.cmd_6600_recvd[i] = 0;
+        Rfu.cmd_6600_count++;
         Rfu.RfuFunc = NULL;
     }
-    Rfu.unk_fe++;
+    Rfu.cmd_6600_timer++;
 }
 
-static void sub_80FA350(void)
+static void RfuFunc_Send6600_2(void)
 {
-    if (Rfu.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
+    if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0)
     {
-        sub_80F9D04(0x6600);
-        Rfu.RfuFunc = sub_80FA2B0;
+        RfuPrepareSendBuffer(RFU_COMMAND_0x6600);
+        Rfu.RfuFunc = RfuFunc_Send6600_3;
     }
 }
 
-static void sub_80FA388(void)
+static void RfuFunc_Send6600_1(void)
 {
     u8 i;
     u8 playerCount;
 
-    if (GetMultiplayerId() != 0)
+    if (GetMultiplayerId() != 0) // child
     {
-        if (Rfu.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
+        if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0)
         {
-            sub_80F9D04(0x6600);
-            Rfu.RfuFunc = sub_80FA2B0;
+            RfuPrepareSendBuffer(RFU_COMMAND_0x6600);
+            Rfu.RfuFunc = RfuFunc_Send6600_3;
         }
     }
-    else
+    else // parent
     {
         playerCount = GetLinkPlayerCount();
         for (i = 1; i < playerCount; i++)
         {
-            if (Rfu.unk_e9[i] == 0)
+            if (Rfu.cmd_6600_recvd[i] == 0)
                 break;
         }
         if (i == playerCount)
         {
-            if (Rfu.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
+            if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0)
             {
-                sub_80F9D04(0x6600);
-                Rfu.RfuFunc = sub_80FA350;
+                RfuPrepareSendBuffer(RFU_COMMAND_0x6600);
+                Rfu.RfuFunc = RfuFunc_Send6600_2;
             }
         }
     }
 }
 
-void sub_80FA42C(void)
+void LinkRfu_SetRfuFuncToSend6600(void)
 {
     if (Rfu.RfuFunc == NULL)
     {
-        Rfu.RfuFunc = sub_80FA388;
-        Rfu.unk_fe = 0;
+        Rfu.RfuFunc = RfuFunc_Send6600_1;
+        Rfu.cmd_6600_timer = 0;
     }
 }
 
-bool32 sub_80FA44C(u32 a0)
+bool32 RfuSerialNumberIsValid(u32 serialNo)
 {
     s32 i;
-    for (i = 0; gUnknown_843EC8C[i] != a0; i++)
+    for (i = 0; sAcceptedSerialNos[i] != serialNo; i++)
     {
-        if (gUnknown_843EC8C[i] == 0xFFFF)
+        if (sAcceptedSerialNos[i] == 0xFFFF)
             return FALSE;
     }
     return TRUE;
@@ -1453,20 +1457,20 @@ bool32 sub_80FA44C(u32 a0)
 u8 sub_80FA484(bool32 a0)
 {
     if (!a0)
-        return sub_80FEA34(0, 0);
-    sub_80FEA34(1, 0x258);
+        return rfu_LMAN_setLinkRecovery(0, 0);
+    rfu_LMAN_setLinkRecovery(1, 600);
     return 0;
 }
 
 void sub_80FA4A8(void)
 {
     Rfu.unk_cd9 = 1;
-    sub_80FD760(FALSE);
+    rfu_LMAN_stopManager(0);
 }
 
 u8 LinkRfu_GetMultiplayerId(void)
 {
-    if (Rfu.unk_0c == 1)
+    if (Rfu.parent_child == MODE_PARENT)
         return 0;
     return Rfu.unk_cce;
 }
@@ -1507,7 +1511,7 @@ static bool8 sub_80FA528(void)
                 }
 
             }
-            else if (gRfuSlotStatusNI[Rfu.unk_c3e]->recv.state == SLOT_STATE_RECV_FAILED)
+            else if (gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_FAILED)
             {
                 rfu_clearSlot(TYPE_NI_RECV, i);
             }
@@ -1541,9 +1545,9 @@ bool32 sub_80FA5D4(void)
     return FALSE;
 }
 
-bool32 sub_80FA634(u16 a0, const u8 *a1)
+bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName)
 {
-    u8 r1 = sub_80FBC70(a1, a0);
+    u8 r1 = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId);
     if (r1 == 0xFF)
         return TRUE;
     if (Rfu.unk_cd1[r1] == 9)
@@ -1551,27 +1555,27 @@ bool32 sub_80FA634(u16 a0, const u8 *a1)
     return FALSE;
 }
 
-void sub_80FA670(u8 a0, u16 a1, const u8 *a2)
+void SendByteToPartnerByIdAndName(u8 value, u16 trainerId, const u8 *trainerName)
 {
-    u8 r4 = sub_80FBC70(a2, a1);
-    Rfu.unk_cd1[r4] = a0;
-    rfu_clearSlot(TYPE_NI_SEND, r4);
-    rfu_NI_setSendData(1 << r4, 8, Rfu.unk_cd1 + r4, 1);
+    u8 slotNo = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId);
+    Rfu.unk_cd1[slotNo] = value;
+    rfu_clearSlot(TYPE_NI_SEND, slotNo);
+    rfu_NI_setSendData(1 << slotNo, 8, Rfu.unk_cd1 + slotNo, 1);
 }
 
-void sub_80FA6BC(void)
+void LinkRfuNIsend8(void)
 {
     Rfu.unk_c85 = 8;
-    rfu_clearSlot(TYPE_NI_SEND, Rfu.unk_c3e);
-    rfu_NI_setSendData(1 << Rfu.unk_c3e, 8, &Rfu.unk_c85, 1);
+    rfu_clearSlot(TYPE_NI_SEND, Rfu.child_slot);
+    rfu_NI_setSendData(1 << Rfu.child_slot, 8, &Rfu.unk_c85, 1);
 }
 
-u32 sub_80FA6FC(u16 a0, const u8 *a1)
+u32 WaitSendByteToPartnerByIdAndName(u16 trainerId, const u8 *trainerName)
 {
-    u8 r0 = sub_80FBC70(a1, a0);
+    u8 r0 = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId);
     if (r0 == 0xFF)
         return 2;
-    if (gRfuSlotStatusNI[r0]->send.state == 0)
+    if (gRfuSlotStatusNI[r0]->send.state == SLOT_STATE_READY)
         return 1;
     return 0;
 }
@@ -1597,18 +1601,18 @@ static s32 sub_80FA788(void)
     s32 retval = 0;
     if (Rfu.unk_c85 == 8)
     {
-        if (gRfuSlotStatusNI[Rfu.unk_c3e]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[Rfu.unk_c3e]->send.state == SLOT_STATE_SEND_FAILED)
-            rfu_clearSlot(TYPE_NI_SEND, Rfu.unk_c3e);
+        if (gRfuSlotStatusNI[Rfu.child_slot]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[Rfu.child_slot]->send.state == SLOT_STATE_SEND_FAILED)
+            rfu_clearSlot(TYPE_NI_SEND, Rfu.child_slot);
     }
-    if (gRfuSlotStatusNI[Rfu.unk_c3e]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[Rfu.unk_c3e]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN)
+    if (gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN)
     {
-        rfu_clearSlot(TYPE_NI_RECV, Rfu.unk_c3e);
-        sub_80FB9E4(Rfu.unk_c86, 0);
+        rfu_clearSlot(TYPE_NI_RECV, Rfu.child_slot);
+        RfuSetErrorStatus(Rfu.unk_c86, 0);
         retval = Rfu.unk_c86;
     }
-    else if (gRfuSlotStatusNI[Rfu.unk_c3e]->recv.state == SLOT_STATE_RECV_FAILED)
+    else if (gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_FAILED)
     {
-        rfu_clearSlot(TYPE_NI_RECV, Rfu.unk_c3e);
+        rfu_clearSlot(TYPE_NI_RECV, Rfu.child_slot);
         retval = 6;
     }
     return retval;
@@ -1626,20 +1630,20 @@ static void sub_80FA834(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        if (sub_80F9C50())
+        if (Cmd8000recvIsFinished())
         {
             ResetBlockReceivedFlags();
-            sub_800B0B4();
+            PrepareLocalLinkPlayerBlock();
             gTasks[taskId].data[0]++;
         }
         break;
     case 1:
-        if (Rfu.unk_0c == 1)
+        if (Rfu.parent_child == MODE_PARENT)
         {
             if (gReceivedRemoteLinkPlayers)
-                sub_80F9D04(0x7800);
+                RfuPrepareSendBuffer(RFU_COMMAND_0x7800);
             else
-                sub_80F9D04(0x7700);
+                RfuPrepareSendBuffer(RFU_COMMAND_0x7700);
             gTasks[taskId].data[0] = 101;
         }
         else
@@ -1654,12 +1658,12 @@ static void sub_80FA834(u8 taskId)
             gTasks[taskId].data[0]++;
         break;
     case 3:
-        if (Rfu.unk_0c == 1)
+        if (Rfu.parent_child == MODE_PARENT)
         {
-            if (sub_80F9C50())
+            if (Cmd8000recvIsFinished())
             {
                 Rfu.unk_5a = 0;
-                sub_80F9D04(0xa100);
+                RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
                 gTasks[taskId].data[0]++;
             }
         }
@@ -1673,7 +1677,7 @@ static void sub_80FA834(u8 taskId)
     case 5:
         for (i = 0; i < Rfu.playerCount; i++)
         {
-            sub_800B110(i);
+            LinkPlayerFromBlock(i);
             Rfu_ResetBlockReceivedFlag(i);
         }
         gTasks[taskId].data[0]++;
@@ -1682,15 +1686,15 @@ static void sub_80FA834(u8 taskId)
         DestroyTask(taskId);
         gReceivedRemoteLinkPlayers = 1;
         Rfu.unk_ce8 = FALSE;
-        sub_80FEA34(1, 0x258);
-        if (Rfu.unk_ce6)
+        rfu_LMAN_setLinkRecovery(1, 600);
+        if (Rfu.unionRoomChatters)
         {
             for (i = 0; i < RFU_CHILD_MAX; i++)
             {
-                if ((Rfu.unk_ce6 >> i) & 1)
+                if ((Rfu.unionRoomChatters >> i) & 1)
                 {
                     Rfu.unk_ce5 = 1 << i;
-                    Rfu.unk_ce6 ^= (1 << i);
+                    Rfu.unionRoomChatters ^= (1 << i);
                 }
             }
         }
@@ -1705,39 +1709,39 @@ static void sub_80FA9D0(u16 a0)
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
         if ((a0 >> i) & 1)
-            Rfu.unk_cde[i] = 0;
+            Rfu.linkPlayerIdx[i] = 0;
     }
 }
 
-static void sub_80FA9FC(const struct UnkRfuStruct_8010A14 *a0)
+static void ReceiveRfuLinkPlayers(const struct SioInfo *chunk)
 {
     s32 i;
-    Rfu.playerCount = a0->unk_0f;
+    Rfu.playerCount = chunk->playerCount;
     for (i = 0; i < RFU_CHILD_MAX; i++)
-        Rfu.unk_cde[i] = a0->unk_10[i];
+        Rfu.linkPlayerIdx[i] = chunk->linkPlayerIdx[i];
     for (i = 0; i < MAX_RFU_PLAYERS; i++)
     {
-        gLinkPlayers[i] = a0->unk_14[i];
-        sub_800B284(gLinkPlayers + i);
+        gLinkPlayers[i] = chunk->linkPlayers[i];
+        IntlConvertLinkPlayerName(gLinkPlayers + i);
     }
 }
 
-static void sub_80FAA58(void *a0)
+static void ValidateAndReceivePokemonSioInfo(void *recvBuffer)
 {
-    if (strcmp("PokemonSioInfo", ((struct UnkRfuStruct_8010A14 *)a0)->unk_00) == 0)
+    if (strcmp("PokemonSioInfo", recvBuffer) == 0)
     {
-        sub_80FA9FC(a0);
-        CpuFill16(0, a0, sizeof(struct UnkRfuStruct_8010A14));
+        ReceiveRfuLinkPlayers(recvBuffer);
+        CpuFill16(0, recvBuffer, sizeof(struct SioInfo));
         ResetBlockReceivedFlag(0);
     }
 }
 
-static void sub_80FAA94(u8 taskId)
+static void Task_ExchangeLinkPlayers(u8 taskId)
 {
     s32 i;
     struct LinkPlayerBlock *r2;
-    struct UnkRfuStruct_8010A14 *r5;
-    u8 r4 = Rfu.unk_cde[gUnknown_843EC38[Rfu.unk_ce9]];
+    struct SioInfo *r5;
+    u8 r4 = Rfu.linkPlayerIdx[gUnknown_843EC38[Rfu.unk_ce9]];
     if (Rfu.unk_f1 == 1 || Rfu.unk_f1 == 2)
     {
         Rfu.unk_ce8 = FALSE;
@@ -1749,7 +1753,7 @@ static void sub_80FAA94(u8 taskId)
         if (gSendCmd[0] == 0)
         {
             ResetBlockReceivedFlag(r4);
-            sub_80F9D04(0x7800);
+            RfuPrepareSendBuffer(RFU_COMMAND_0x7800);
             gTasks[taskId].data[0]++;
         }
         break;
@@ -1763,42 +1767,43 @@ static void sub_80FAA94(u8 taskId)
             ResetBlockReceivedFlag(r4);
             r2 = (struct LinkPlayerBlock *)gBlockRecvBuffer[r4];
             gLinkPlayers[r4] = r2->linkPlayer;
-            sub_800B284(gLinkPlayers + r4);
+            IntlConvertLinkPlayerName(gLinkPlayers + r4);
             gTasks[taskId].data[0]++;
         }
         break;
     case 3:
-        r5 = (struct UnkRfuStruct_8010A14 *)gBlockSendBuffer;
-        memcpy(r5->unk_00, "PokemonSioInfo", sizeof("PokemonSioInfo"));
-        r5->unk_0f = Rfu.playerCount;
+        // Prepare send block
+        r5 = (struct SioInfo *)gBlockSendBuffer;
+        memcpy(r5->magic, "PokemonSioInfo", sizeof("PokemonSioInfo"));
+        r5->playerCount = Rfu.playerCount;
         for (i = 0; i < RFU_CHILD_MAX; i++)
-            r5->unk_10[i] = Rfu.unk_cde[i];
-        memcpy(r5->unk_14, gLinkPlayers, sizeof gLinkPlayers);
+            r5->linkPlayerIdx[i] = Rfu.linkPlayerIdx[i];
+        memcpy(r5->linkPlayers, gLinkPlayers, sizeof gLinkPlayers);
         gTasks[taskId].data[0]++;
         // fallthrough
     case 4:
-        r5 = (struct UnkRfuStruct_8010A14 *)gBlockSendBuffer;
-        r5->unk_0f = Rfu.playerCount;
+        r5 = (struct SioInfo *)gBlockSendBuffer;
+        r5->playerCount = Rfu.playerCount;
         for (i = 0; i < RFU_CHILD_MAX; i++)
-            r5->unk_10[i] = Rfu.unk_cde[i];
-        memcpy(r5->unk_14, gLinkPlayers, sizeof gLinkPlayers);
+            r5->linkPlayerIdx[i] = Rfu.linkPlayerIdx[i];
+        memcpy(r5->linkPlayers, gLinkPlayers, sizeof gLinkPlayers);
         if (SendBlock(0, gBlockSendBuffer, 0xa0))
             gTasks[taskId].data[0]++;
         break;
     case 5:
         if (IsLinkTaskFinished() && GetBlockReceivedStatus() & 1)
         {
-            CpuFill16(0, gBlockRecvBuffer, sizeof(struct UnkRfuStruct_8010A14));
+            CpuFill16(0, gBlockRecvBuffer, sizeof(struct SioInfo));
             ResetBlockReceivedFlag(0);
             Rfu.unk_ce8 = FALSE;
-            if (Rfu.unk_ce6)
+            if (Rfu.unionRoomChatters)
             {
                 for (i = 0; i < RFU_CHILD_MAX; i++)
                 {
-                    if ((Rfu.unk_ce6 >> i) & 1)
+                    if ((Rfu.unionRoomChatters >> i) & 1)
                     {
                         Rfu.unk_ce5 = 1 << i;
-                        Rfu.unk_ce6 ^= (1 << i);
+                        Rfu.unionRoomChatters ^= (1 << i);
                         Rfu.unk_ce8 = TRUE;
                         break;
                     }
@@ -1819,7 +1824,7 @@ static void sub_80FACF0(u8 taskId)
     case 0:
         if (Rfu.playerCount)
         {
-            sub_800B0B4();
+            PrepareLocalLinkPlayerBlock();
             SendBlock(0, gBlockSendBuffer, sizeof(struct LinkPlayerBlock));
             gTasks[taskId].data[0]++;
         }
@@ -1831,7 +1836,7 @@ static void sub_80FACF0(u8 taskId)
     case 2:
         if (GetBlockReceivedStatus() & 1)
         {
-            sub_80FA9FC((const struct UnkRfuStruct_8010A14 *)gBlockRecvBuffer);
+            ReceiveRfuLinkPlayers((const struct SioInfo *)gBlockRecvBuffer);
             ResetBlockReceivedFlag(0);
             gReceivedRemoteLinkPlayers = 1;
             DestroyTask(taskId);
@@ -1840,51 +1845,51 @@ static void sub_80FACF0(u8 taskId)
     }
 }
 
-static void sub_80FAD98(void)
+static void RfuCheckErrorStatus(void)
 {
-    if (Rfu.unk_ee == 1 && gUnknown_3005E10.unk_02 == 0)
+    if (Rfu.errorState == 1 && lman.childClockSlave_flag == 0)
     {
         if (gMain.callback2 == c2_mystery_gift_e_reader_run)
             gWirelessCommType = 2;
         SetMainCallback2(CB2_LinkError);
         gMain.savedCallback = CB2_LinkError;
-        sub_800ACBC((Rfu.unk_0a << 16) | (Rfu.unk_10 << 8) | Rfu.unk_12, Rfu.unk_124.unk_8c2, Rfu.unk_9e8.unk_232, sub_80FB9F4() == 2);
-        Rfu.unk_ee = 2;
+        SetLinkErrorFromRfu((Rfu.linkman_msg << 16) | (Rfu.linkman_param[0] << 8) | Rfu.linkman_param[1], Rfu.unk_124.count, Rfu.unk_9e8.count, RfuGetErrorStatus() == 2);
+        Rfu.errorState = 2;
         CloseLink();
     }
-    else if (Rfu.unk_9e8.unk_233 == 1 || Rfu.unk_124.unk_8c3 == 1)
+    else if (Rfu.unk_9e8.full == 1 || Rfu.unk_124.full == 1)
     {
-        if (gUnknown_3005E10.unk_02)
-            sub_80FEB14();
-        sub_80FB9E4(1, 0x7000);
-        sub_80FB0E8(0x7000);
+        if (lman.childClockSlave_flag)
+            rfu_LMAN_requestChangeAgbClockMaster();
+        RfuSetErrorStatus(1, 0x7000);
+        GetLinkmanErrorParams(0x7000);
     }
 }
 
 static void rfu_REQ_recvData_then_sendData(void)
 {
-    if (gUnknown_3005E10.unk_06 == 1)
+    if (lman.parent_child == MODE_PARENT)
     {
         rfu_REQ_recvData();
         rfu_waitREQComplete();
-        LinkRfu_REQ_SendData_HandleParentRelationship(0);
+        rfu_LMAN_REQ_sendData(RFU_CHILD_CLOCK_SLAVE_OFF);
     }
 }
 
-bool32 sub_80FAE94(void)
+bool32 LinkRfuMain1(void)
 {
     bool32 retval = FALSE;
-    Rfu.unk_ccd = 0;
-    sub_80FDA30(Random());
+    Rfu.parentId = 0;
+    rfu_LMAN_manager_entity(Random());
     if (Rfu.unk_ef == 0)
     {
-        switch (Rfu.unk_0c)
+        switch (Rfu.parent_child)
         {
         case 1:
             sub_80F911C();
             break;
         case 0:
-            retval = sub_80F9514();
+            retval = RfuProcessEnqueuedRecvBlock();
             break;
         case 2:
             rfu_REQ_recvData_then_sendData();
@@ -1894,19 +1899,19 @@ bool32 sub_80FAE94(void)
     return retval;
 }
 
-bool32 sub_80FAEF0(void)
+bool32 LinkRfuMain2(void)
 {
     bool32 retval = FALSE;
     if (Rfu.unk_ef == 0)
     {
-        if (Rfu.unk_0c == 1)
+        if (Rfu.parent_child == MODE_PARENT)
             retval = sub_80F9204();
-        sub_80FAD98();
+        RfuCheckErrorStatus();
     }
     return retval;
 }
 
-static void sub_80FAF1C(void)
+static void CopyPlayerNameToUnameBuffer(void)
 {
     StringCopy(gHostRFUtgtUnameBuffer, gSaveBlock2Ptr->playerName);
 }
@@ -1914,94 +1919,96 @@ static void sub_80FAF1C(void)
 void ClearAndInitHostRFUtgtGname(void)
 {
     memset(&gHostRFUtgtGnameBuffer, 0, RFU_GAME_NAME_LENGTH);
-    InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, 0, 0, 0);
+    InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, 0, FALSE, 0);
 }
 
-void SetHostRFUtgtGname(u8 a0, u32 a1, u32 a2)
+void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 started)
 {
-    InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, a0, a2, a1);
+    InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, activity, started, child_sprite_genders);
 }
 
-void sub_80FAF74(bool32 a0, bool32 a1)
+void SetGnameBufferWonderFlags(bool32 hasNews, bool32 hasCard)
 {
-    gHostRFUtgtGnameBuffer.unk_00.unk_00_4 = a0;
-    gHostRFUtgtGnameBuffer.unk_00.unk_00_5 = a1;
+    gHostRFUtgtGnameBuffer.unk_00.hasNews = hasNews;
+    gHostRFUtgtGnameBuffer.unk_00.hasCard = hasCard;
 }
 
-void sub_80FAFA0(u32 type, u32 species, u32 level)
+void RfuUpdatePlayerGnameStateAndSend(u32 type, u32 species, u32 level)
 {
     gHostRFUtgtGnameBuffer.type = type;
     gHostRFUtgtGnameBuffer.species = species;
     gHostRFUtgtGnameBuffer.level = level;
 }
 
-void sub_80FAFE0(u8 a0)
+void UpdateGameData_GroupLockedIn(bool8 started)
 {
-    gHostRFUtgtGnameBuffer.unk_0a_7 = a0;
-    rfu_REQ_configGameData(0, 2, (void *)&gHostRFUtgtGnameBuffer, gHostRFUtgtUnameBuffer);
+    gHostRFUtgtGnameBuffer.started = started;
+    rfu_REQ_configGameData(0, 0x0002, (void *)&gHostRFUtgtGnameBuffer, gHostRFUtgtUnameBuffer);
 }
 
-void sub_80FB008(u8 a0, u32 a1, u32 a2)
+void UpdateGameDataWithActivitySpriteGendersFlag(u8 activity, u32 child_sprite_genders, u32 started)
 {
-    if (a0)
-        SetHostRFUtgtGname(a0, a1, a2);
-    rfu_REQ_configGameData(0, 2, (void *)&gHostRFUtgtGnameBuffer, gHostRFUtgtUnameBuffer);
+    if (activity)
+        SetHostRFUtgtGname(activity, child_sprite_genders, started);
+    rfu_REQ_configGameData(0, 0x0002, (void *)&gHostRFUtgtGnameBuffer, gHostRFUtgtUnameBuffer);
 }
 
 void sub_80FB030(u32 linkPlayerCount)
 {
     s32 i;
-    u32 r5;
-    u32 r7;
-    s32 r8;
+    u32 numConnectedChildren;
+    u32 child_sprite_genders;
+    s32 bm_child_slots;
 
-    if (sub_80F9800()->unk_0a_0 == 0x45)
+    if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM))
     {
-        r5 = 0;
-        r7 = 0;
-        r8 = Rfu.unk_ce2 ^ Rfu.unk_ce3;
+        numConnectedChildren = 0;
+        child_sprite_genders = 0;
+        bm_child_slots = Rfu.bm_PartnerFlags ^ Rfu.bm_DisconnectSlot;
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
-            if ((r8 >> i) & 1)
+            if ((bm_child_slots >> i) & 1)
             {
-                r7 |= ((
-                    0x80 | ((gLinkPlayers[Rfu.unk_cde[i]].gender & 1) << 3) | (gLinkPlayers[Rfu.unk_cde[i]].trainerId & 7)) << (r5 << 3));
-                r5++;
-                if (r5 == linkPlayerCount - 1)
+                // The 0x80 prevents this element from being incorrectly read as a 0.
+                child_sprite_genders |= ((
+                    0x80 | ((gLinkPlayers[Rfu.linkPlayerIdx[i]].gender & 1) << 3) | (gLinkPlayers[Rfu.linkPlayerIdx[i]].trainerId & 7)
+                ) << (numConnectedChildren << 3));
+                numConnectedChildren++;
+                if (numConnectedChildren == linkPlayerCount - 1)
                     break;
             }
         }
-        sub_80FB008(0x45, r7, 0);
+        UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_CHAT | IN_UNION_ROOM, child_sprite_genders, 0);
     }
 }
 
-static void sub_80FB0E8(u32 a0)
+static void GetLinkmanErrorParams(u32 msg)
 {
-    if (Rfu.unk_ee == 0)
+    if (Rfu.errorState == 0)
     {
-        Rfu.unk_10 = gUnknown_3005E10.unk_14;
-        Rfu.unk_12 = gUnknown_3005E10.unk_16;
-        Rfu.unk_0a = a0;
-        Rfu.unk_ee = 1;
+        Rfu.linkman_param[0] = lman.param[0];
+        Rfu.linkman_param[1] = lman.param[1];
+        Rfu.linkman_msg = msg;
+        Rfu.errorState = 1;
     }
 }
 
-static void sub_80FB118(void)
+static void ResetErrorState(void)
 {
-    Rfu.unk_ee = 0;
+    Rfu.errorState = 0;
 }
 
 void sub_80FB128(bool32 a0)
 {
     if (!a0)
-        Rfu.unk_ee = 0;
+        Rfu.errorState = 0;
     else
-        Rfu.unk_ee = 4;
+        Rfu.errorState = 4;
 }
 
 static void sub_80FB154(void)
 {
-    sub_80FBE20(gUnknown_3005E10.unk_00, 1);
+    sub_80FBE20(lman.acceptSlot_flag, 1);
     Rfu.RfuFunc = NULL;
 }
 
@@ -2010,25 +2017,25 @@ static void sub_80FB174(void)
     Rfu.RfuFunc = sub_80FB154;
 }
 
-static void sub_80FB184(u8 a0, u8 unused1)
+static void LmanCallback_Parent2(u8 msg, u8 param_count)
 {
     u8 i;
-    u8 r6 = 0;
-    switch (a0)
+    u8 bmDisconnectFlag = 0;
+    switch (msg)
     {
-    case 0x00:
-        Rfu.unk_04 = 2;
+    case LMAN_MSG_INITIALIZE_COMPLETED:
+        Rfu.state = 2;
         break;
-    case 0x10:
+    case LMAN_MSG_NEW_CHILD_CONNECT_DETECTED:
         break;
-    case 0x11:
-        sub_80FB564(gUnknown_3005E10.unk_14);
+    case LMAN_MSG_NEW_CHILD_CONNECT_ACCEPTED:
+        sub_80FB564(lman.param[0]);
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
-            if ((gUnknown_3005E10.unk_14 >> i) & 1)
+            if ((lman.param[0] >> i) & 1)
             {
                 struct GFtgtGname *structPtr = (void *)&gRfuLinkStatus->partner[i].gname;
-                if (structPtr->unk_0a_0 == sub_80F9800()->unk_0a_0)
+                if (structPtr->activity == GetHostRFUtgtGname()->activity)
                 {
                     Rfu.unk_cd1[i] = 0;
                     Rfu.unk_cd5[i] = 0;
@@ -2036,60 +2043,64 @@ static void sub_80FB184(u8 a0, u8 unused1)
                 }
                 else
                 {
-                    r6 |= (1 << i);
+                    bmDisconnectFlag |= (1 << i);
                 }
             }
         }
-        if (r6)
+        if (bmDisconnectFlag)
         {
-            rfu_REQ_disconnect(r6);
+            rfu_REQ_disconnect(bmDisconnectFlag);
             rfu_waitREQComplete();
         }
         break;
-    case 0x12:
+    case LMAN_MSG_NEW_CHILD_CONNECT_REJECTED:
         break;
-    case 0x13:
+    case LMAN_MSG_SEARCH_CHILD_PERIOD_EXPIRED:
         break;
-    case 0x14:
-        if (Rfu.unk_ce7 != gUnknown_3005E10.unk_00)
+    case LMAN_MSG_END_WAIT_CHILD_NAME:
+        if (Rfu.acceptSlot_flag != lman.acceptSlot_flag)
         {
-            rfu_REQ_disconnect(Rfu.unk_ce7 ^ gUnknown_3005E10.unk_00);
+            rfu_REQ_disconnect(Rfu.acceptSlot_flag ^ lman.acceptSlot_flag);
             rfu_waitREQComplete();
         }
-        Rfu.unk_04 = 0x11;
+        Rfu.state = 17;
         break;
-    case 0x31:
-        Rfu.unk_f0 = 1;
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY:
+        Rfu.linkLossRecoveryState = 1;
         break;
-    case 0x32:
-        Rfu.unk_f0 = 3;
+    case LMAN_MSG_LINK_RECOVERY_SUCCESSED:
+        Rfu.linkLossRecoveryState = 3;
         break;
-    case 0x30:
-    case 0x33:
-        Rfu.unk_f0 = 4;
-        Rfu.unk_ce2 &= ~gUnknown_3005E10.unk_14;
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED:
+    case LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED:
+        Rfu.linkLossRecoveryState = 4;
+        Rfu.bm_PartnerFlags &= ~lman.param[0];
         if (gReceivedRemoteLinkPlayers == 1)
         {
-            if (Rfu.unk_ce2 == 0)
-                sub_80FB0E8(a0);
+            if (Rfu.bm_PartnerFlags == 0)
+                GetLinkmanErrorParams(msg);
             else
                 sub_80FB174();
         }
-        sub_80FB9E4(2, a0);
+        RfuSetErrorStatus(2, msg);
         break;
     case 0x34:
         break;
-    case 0x42 ... 0x44:
+    case LMAN_MSG_RFU_POWER_DOWN:
+    case LMAN_MSG_MANAGER_STOPPED:
+    case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET:
         break;
-    case 0xf3:
-        sub_80FB9E4(1, a0);
-        sub_80FB0E8(a0);
+    case LMAN_MSG_LMAN_API_ERROR_RETURN:
+        RfuSetErrorStatus(1, msg);
+        GetLinkmanErrorParams(msg);
         Rfu.unk_ef = 1;
         break;
-    case 0xf0 ... 0xf2:
-    case 0xff:
-        sub_80FB0E8(a0);
-        sub_80FB9E4(1, a0);
+    case LMAN_MSG_REQ_API_ERROR:
+    case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
+    case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA:
+    case LMAN_MSG_RFU_FATAL_ERROR:
+        GetLinkmanErrorParams(msg);
+        RfuSetErrorStatus(1, msg);
         Rfu.unk_cdb = 1;
         break;
     }
@@ -2097,80 +2108,84 @@ static void sub_80FB184(u8 a0, u8 unused1)
 
 static const u8 unref_843EDF3[] = _("　あきと");
 
-static void sub_80FB37C(u8 a0, u8 unused1)
+static void LmanCallback_Child(u8 msg, u8 param_count)
 {
-    switch (a0)
+    switch (msg)
     {
-    case 0x00:
-        Rfu.unk_04 = 6;
+    case LMAN_MSG_INITIALIZE_COMPLETED:
+        Rfu.state = 6;
         break;
-    case 0x20:
-        Rfu.unk_ccd = gUnknown_3005E10.unk_14;
+    case LMAN_MSG_PARENT_FOUND:
+        Rfu.parentId = lman.param[0];
         break;
-    case 0x21:
+    case LMAN_MSG_SEARCH_PARENT_PERIOD_EXPIRED:
         break;
-    case 0x22:
-        Rfu.unk_c3e = gUnknown_3005E10.unk_14;
+    case LMAN_MSG_CONNECT_PARENT_SUCCESSED:
+        Rfu.child_slot = lman.param[0];
         break;
-    case 0x23:
-        sub_80FB9E4(2, a0);
+    case LMAN_MSG_CONNECT_PARENT_FAILED:
+        RfuSetErrorStatus(2, msg);
         break;
-    case 0x24:
-        Rfu.unk_04 = 11;
+    case LMAN_MSG_CHILD_NAME_SEND_COMPLETED:
+        Rfu.state = 11;
         Rfu.unk_c85 = 0;
         Rfu.unk_c86 = 0;
-        rfu_setRecvBuffer(TYPE_NI, Rfu.unk_c3e, &Rfu.unk_c86, 1);
-        rfu_setRecvBuffer(TYPE_UNI, Rfu.unk_c3e, Rfu.unk_c3f, 70);
+        rfu_setRecvBuffer(TYPE_NI, Rfu.child_slot, &Rfu.unk_c86, 1);
+        rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f));
         break;
-    case 0x25:
-        sub_80FB9E4(2, 0x25);
+    case LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED:
+        RfuSetErrorStatus(2, msg);
         break;
-    case 0x30:
-        Rfu.unk_f0 = 2;
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED:
+        Rfu.linkLossRecoveryState = 2;
         if (Rfu.unk_c86 == 6)
             break;
-    case 0x33:
-        if (Rfu.unk_f0 != 2)
-            Rfu.unk_f0 = 4;
+    case LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED:
+        if (Rfu.linkLossRecoveryState != 2)
+            Rfu.linkLossRecoveryState = 4;
         if (Rfu.unk_c86 != 9)
-            sub_80FB9E4(2, a0);
-        nullsub_87("LINK LOSS DISCONNECT!", 5, 5);
+            RfuSetErrorStatus(2, msg);
+        rfu_dbg_print_str("LINK LOSS DISCONNECT!", 5, 5);
         if (gReceivedRemoteLinkPlayers == 1)
-            sub_80FB0E8(a0);
+            GetLinkmanErrorParams(msg);
         break;
-    case 0x31:
-        Rfu.unk_f0 = 1;
-        nullsub_87("LINK LOSS RECOVERY NOW", 5, 5);
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY:
+        Rfu.linkLossRecoveryState = 1;
+        rfu_dbg_print_str("LINK LOSS RECOVERY NOW", 5, 5);
         break;
-    case 0x32:
-        Rfu.unk_f0 = 3;
+    case LMAN_MSG_LINK_RECOVERY_SUCCESSED:
+        Rfu.linkLossRecoveryState = 3;
         Rfu.unk_c3c = 1;
         break;
     case 0x34:
         break;
-    case 0x42 ... 0x44:
+    case LMAN_MSG_RFU_POWER_DOWN:
+    case LMAN_MSG_MANAGER_STOPPED:
+    case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET:
         break;
-    case 0xF3:
-        sub_80FB9E4(1, a0);
-        sub_80FB0E8(a0);
+    case LMAN_MSG_LMAN_API_ERROR_RETURN:
+        RfuSetErrorStatus(1, msg);
+        GetLinkmanErrorParams(msg);
         Rfu.unk_ef = 1;
         break;
-    case 0xF0 ... 0xF2:
-    case 0xFF:
-        sub_80FB9E4(1, a0);
-        sub_80FB0E8(a0);
+    case LMAN_MSG_REQ_API_ERROR:
+    case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
+    case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA:
+    case LMAN_MSG_RFU_FATAL_ERROR:
+        RfuSetErrorStatus(1, msg);
+        GetLinkmanErrorParams(msg);
         Rfu.unk_cdb = 1;
         break;
     }
 }
 
-static void sub_80FB564(s32 a0)
+static void sub_80FB564(s32 bmConnectedFlag)
 {
     s32 i;
 
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if ((a0 >> i) & 1)
+        if ((bmConnectedFlag >> i) & 1)
         {
             Rfu.unk_cea[i] = 0;
             Rfu.unk_cee[i] = 0xFF;
@@ -2178,17 +2193,17 @@ static void sub_80FB564(s32 a0)
     }
 }
 
-static u8 sub_80FB5A0(s32 a0)
+static u8 GetNewChildrenInUnionRoomChat(s32 bmNewChildSlot)
 {
     u8 ret = 0;
     u8 i;
 
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if ((a0 >> i) & 1)
+        if ((bmNewChildSlot >> i) & 1)
         {
             struct GFtgtGname *structPtr = (void *)&gRfuLinkStatus->partner[i].gname;
-            if (structPtr->unk_0a_0 == 0x45)
+            if (structPtr->activity == (ACTIVITY_CHAT | IN_UNION_ROOM))
                 ret |= (1 << i);
         }
     }
@@ -2196,73 +2211,73 @@ static u8 sub_80FB5A0(s32 a0)
     return ret;
 }
 
-static void sub_80FB5EC(u8 a0, u8 unused1)
+static void LmanCallback_Parent(u8 msg, u8 param_count)
 {
     u8 r1;
 
-    switch (a0)
+    switch (msg)
     {
-    case 0x00:
-        Rfu.unk_04 = 0x11;
+    case LMAN_MSG_INITIALIZE_COMPLETED:
+        Rfu.state = 17;
         break;
-    case 0x10:
-        sub_80FB9E4(4, 0);
+    case LMAN_MSG_NEW_CHILD_CONNECT_DETECTED:
+        RfuSetErrorStatus(4, 0);
         break;
-    case 0x11:
-        if (sub_80F9800()->unk_0a_0 == 0x45 && Rfu.unk_cd9 == 0)
+    case LMAN_MSG_NEW_CHILD_CONNECT_ACCEPTED:
+        if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && Rfu.unk_cd9 == 0)
         {
-            u8 idx = sub_80FB5A0(gUnknown_3005E10.unk_14);
-            if (idx != 0)
+            u8 bmAcceptSlot = GetNewChildrenInUnionRoomChat(lman.param[0]);
+            if (bmAcceptSlot != 0)
             {
-                r1 = 1 << sub_80F886C(idx);
-                if (Rfu.unk_ce6 == 0 && !Rfu.unk_ce8)
+                r1 = 1 << sub_80F886C(bmAcceptSlot);
+                if (Rfu.unionRoomChatters == 0 && !Rfu.unk_ce8)
                 {
                     Rfu.unk_ce5 = r1;
-                    Rfu.unk_ce6 |= (r1 ^ idx);
+                    Rfu.unionRoomChatters |= (r1 ^ bmAcceptSlot);
                     Rfu.unk_ce8 = TRUE;
                 }
                 else
                 {
-                    Rfu.unk_ce6 |= idx;
+                    Rfu.unionRoomChatters |= bmAcceptSlot;
                 }
             }
-            if (idx != gUnknown_3005E10.unk_14)
+            if (bmAcceptSlot != lman.param[0])
             {
-                Rfu.unk_ce3 |= (idx ^ gUnknown_3005E10.unk_14);
+                Rfu.bm_DisconnectSlot |= (bmAcceptSlot ^ lman.param[0]);
                 Rfu.unk_ce4 = 2;
             }
         }
-        else if (sub_80F9800()->unk_0a_0 == 0x54)
+        else if (GetHostRFUtgtGname()->activity == (ACTIVITY_PLYRTALK | IN_UNION_ROOM))
         {
-            rfu_REQ_disconnect(gUnknown_3005E10.unk_00);
+            rfu_REQ_disconnect(lman.acceptSlot_flag);
             rfu_waitREQComplete();
         }
-        sub_80FB564(gUnknown_3005E10.unk_14);
+        sub_80FB564(lman.param[0]);
         break;
-    case 0x12:
+    case LMAN_MSG_NEW_CHILD_CONNECT_REJECTED:
         break;
-    case 0x13:
+    case LMAN_MSG_SEARCH_CHILD_PERIOD_EXPIRED:
         break;
-    case 0x14:
-        if (sub_80F9800()->unk_0a_0 != 0x45 && gUnknown_3005E10.unk_01 > 1)
+    case LMAN_MSG_END_WAIT_CHILD_NAME:
+        if (GetHostRFUtgtGname()->activity != (ACTIVITY_CHAT | IN_UNION_ROOM) && lman.acceptCount > 1)
         {
-            r1 = 1 << sub_80F886C(gUnknown_3005E10.unk_14);
-            rfu_REQ_disconnect(gUnknown_3005E10.unk_00 ^ r1);
+            r1 = 1 << sub_80F886C(lman.param[0]);
+            rfu_REQ_disconnect(lman.acceptSlot_flag ^ r1);
             rfu_waitREQComplete();
         }
-        if (Rfu.unk_04 == 0xF)
-            Rfu.unk_04 = 0x10;
+        if (Rfu.state == 0xF)
+            Rfu.state = 16;
         break;
-    case 0x20:
-        Rfu.unk_ccd = gUnknown_3005E10.unk_14;
+    case LMAN_MSG_PARENT_FOUND:
+        Rfu.parentId = lman.param[0];
         break;
-    case 0x21:
+    case LMAN_MSG_SEARCH_PARENT_PERIOD_EXPIRED:
         break;
-    case 0x22:
-        Rfu.unk_c3e = gUnknown_3005E10.unk_14;
+    case LMAN_MSG_CONNECT_PARENT_SUCCESSED:
+        Rfu.child_slot = lman.param[0];
         break;
-    case 0x23:
-        Rfu.unk_04 = 0x12;
+    case LMAN_MSG_CONNECT_PARENT_FAILED:
+        Rfu.state = 18;
         if (Rfu.unk_ccf < 2)
         {
             Rfu.unk_ccf++;
@@ -2270,67 +2285,72 @@ static void sub_80FB5EC(u8 a0, u8 unused1)
         }
         else
         {
-            sub_80FB9E4(2, a0);
+            RfuSetErrorStatus(2, msg);
         }
         break;
-    case 0x24:
-        Rfu.unk_04 = 0xD;
-        sub_80FB9E4(3, 0);
-        rfu_setRecvBuffer(TYPE_UNI, Rfu.unk_c3e, Rfu.unk_c3f, sizeof(Rfu.unk_c3f));
+    case LMAN_MSG_CHILD_NAME_SEND_COMPLETED:
+        Rfu.state = 13;
+        RfuSetErrorStatus(3, 0);
+        rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f));
         break;
-    case 0x25:
-        sub_80FB9E4(2, a0);
+    case LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED:
+        RfuSetErrorStatus(2, msg);
         break;
-    case 0x31:
-        if (gUnknown_3005E10.unk_00 & gUnknown_3005E10.unk_14)
-            Rfu.unk_f0 = 1;
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY:
+        if (lman.acceptSlot_flag & lman.param[0])
+            Rfu.linkLossRecoveryState = 1;
         break;
-    case 0x32:
-        Rfu.unk_f0 = 3;
+    case LMAN_MSG_LINK_RECOVERY_SUCCESSED:
+        Rfu.linkLossRecoveryState = 3;
         if (gRfuLinkStatus->parentChild == MODE_CHILD)
             Rfu.unk_c3c = 1;
         break;
-    case 0x30:
-        Rfu.unk_f0 = 2;
-    case 0x33:
-        if (Rfu.unk_f0 != 2)
-            Rfu.unk_f0 = 4;
-        if (Rfu.unk_0c == 1)
+    case LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED:
+        Rfu.linkLossRecoveryState = 2;
+        // fallthrough
+    case LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED:
+        if (Rfu.linkLossRecoveryState != 2)
+            Rfu.linkLossRecoveryState = 4;
+        if (Rfu.parent_child == MODE_PARENT)
         {
             if (gReceivedRemoteLinkPlayers == 1)
             {
-                Rfu.unk_ce2 &= ~(gUnknown_3005E10.unk_14);
-                if (Rfu.unk_ce2 == 0)
-                    sub_80FB0E8(a0);
+                Rfu.bm_PartnerFlags &= ~(lman.param[0]);
+                if (Rfu.bm_PartnerFlags == 0)
+                    GetLinkmanErrorParams(msg);
                 else
                     sub_80FB174();
             }
         }
         else if (Rfu.unk_ce4 != 2 && gReceivedRemoteLinkPlayers == 1)
         {
-            sub_80FB0E8(a0);
-            sub_80FD760(0);
+            GetLinkmanErrorParams(msg);
+            rfu_LMAN_stopManager(0);
         }
 
-        if (gRfuLinkStatus->parentChild == MODE_NEUTRAL && gUnknown_3005E10.unk_07 == 0 && FuncIsActiveTask(sub_80F8B34) == TRUE)
-            Rfu.unk_04 = 0x11;
+        if (gRfuLinkStatus->parentChild == MODE_NEUTRAL && lman.pcswitch_flag == 0 && FuncIsActiveTask(Task_LinkRfu_UnionRoomListen) == TRUE)
+            Rfu.state = 17;
 
-        sub_80FB9E4(2, a0);
+        RfuSetErrorStatus(2, msg);
         break;
-    case 0x40:
-        Rfu.unk_ce3 = 0;
+    case LMAN_MSG_LINK_DISCONNECTED_BY_USER:
+        Rfu.bm_DisconnectSlot = 0;
         break;
-    case 0x42 ... 0x44:
+    case LMAN_MSG_RFU_POWER_DOWN:
+    case LMAN_MSG_MANAGER_STOPPED:
+    case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET:
         break;
-    case 0xF3:
-        sub_80FB9E4(1, a0);
-        sub_80FB0E8(a0);
+    case LMAN_MSG_LMAN_API_ERROR_RETURN:
+        RfuSetErrorStatus(1, msg);
+        GetLinkmanErrorParams(msg);
         Rfu.unk_ef = 1;
         break;
-    case 0xF0 ... 0xF2:
-    case 0xFF:
-        sub_80FB0E8(a0);
-        sub_80FB9E4(1, a0);
+    case LMAN_MSG_REQ_API_ERROR:
+    case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
+    case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA:
+    case LMAN_MSG_RFU_FATAL_ERROR:
+        GetLinkmanErrorParams(msg);
+        RfuSetErrorStatus(1, msg);
         Rfu.unk_cdb = 0;
         break;
     }
@@ -2341,21 +2361,21 @@ void sub_80FB9D0(void)
     Rfu.unk_ce4 = 2;
 }
 
-void sub_80FB9E4(u8 a0, u16 a1)
+void RfuSetErrorStatus(u8 a0, u16 msg)
 {
     Rfu.unk_f1 = a0;
-    Rfu.unk_0a = a1;
+    Rfu.linkman_msg = msg;
 }
 
-u8 sub_80FB9F4(void)
+u8 RfuGetErrorStatus(void)
 {
     return Rfu.unk_f1;
 }
 
-bool32 sub_80FBA00(void)
+bool32 RfuIsErrorStatus1or2(void)
 {
-    u32 var = sub_80FB9F4() - 1;
-    if (var < 2)
+    u32 var = RfuGetErrorStatus();
+    if (var == 1 || var == 2)
         return TRUE;
     else
         return FALSE;
@@ -2368,12 +2388,12 @@ bool32 GetRfuUnkCE8(void)
 
 bool8 Rfu_IsMaster(void)
 {
-    return Rfu.unk_0c;
+    return Rfu.parent_child;
 }
 
 void RFUVSync(void)
 {
-    LinkRfu_syncVBlank_();
+    rfu_LMAN_syncVBlank();
 }
 
 void sub_80FBA44(void)
@@ -2400,7 +2420,7 @@ static void sub_80FBA78(void)
     if (IsWirelessAdapterConnected())
     {
         gLinkType = LINKTYPE_0x1111;
-        sub_800B1F4();
+        SetWirelessCommType1();
         OpenLink();
         SeedRng(gMain.vblankCounter2);
         for (i = 0; i < RFU_CHILD_MAX; i++)
@@ -2411,25 +2431,25 @@ static void sub_80FBA78(void)
         AnimateSprites();
         BuildOamBuffer();
         UpdatePaletteFade();
-        sub_80FBB20();
+        LinkRfu_CreateIdleTask();
         SetMainCallback2(sub_80FBB74);
     }
 }
 
-bool32 sub_80FBB0C(void)
+bool32 IsUnionRoomListenTaskActive(void)
 {
-    return FuncIsActiveTask(sub_80F8B34);
+    return FuncIsActiveTask(Task_LinkRfu_UnionRoomListen);
 }
 
-void sub_80FBB20(void)
+void LinkRfu_CreateIdleTask(void)
 {
-    if (!FuncIsActiveTask(nullsub_89))
-        Rfu.unk_66 = CreateTask(nullsub_89, 0);
+    if (!FuncIsActiveTask(Task_idle))
+        Rfu.unk_66 = CreateTask(Task_idle, 0);
 }
 
-void sub_80FBB4C(void)
+void LinkRfu_DestroyIdleTask(void)
 {
-    if (FuncIsActiveTask(nullsub_89) == TRUE)
+    if (FuncIsActiveTask(Task_idle) == TRUE)
         DestroyTask(Rfu.unk_66);
 }
 
@@ -2441,35 +2461,35 @@ static void sub_80FBB74(void)
     UpdatePaletteFade();
 }
 
-void sub_80FBB8C(u32 a0)
+void InitializeRfuLinkManager_LinkLeader(u32 availSlots)
 {
-    Rfu.unk_0c = 1;
-    sub_80FAF1C();
-    sub_80FD430(sub_80FB184, NULL);
+    Rfu.parent_child = MODE_PARENT;
+    CopyPlayerNameToUnameBuffer();
+    rfu_LMAN_initializeManager(LmanCallback_Parent2, NULL);
     sRfuReqConfig = sRfuReqConfigTemplate;
-    sRfuReqConfig.availSlotFlag = sAvailSlots[a0 - 1];
-    sub_80F8E74();
+    sRfuReqConfig.availSlot_flag = sAvailSlots[availSlots - 1];
+    CreateTask_LinkLeaderSearchForChildren();
 }
 
-void sub_80FBBD8(void)
+void InitializeRfuLinkManager_JoinGroup(void)
 {
-    Rfu.unk_0c = 0;
-    sub_80FAF1C();
-    sub_80FD430(sub_80FB37C, sub_80F8D20);
-    sub_80F8F10();
+    Rfu.parent_child = MODE_CHILD;
+    CopyPlayerNameToUnameBuffer();
+    rfu_LMAN_initializeManager(LmanCallback_Child, MscCallback_Child);
+    CreateTask_JoinGroupSearchForParent();
 }
 
-void sub_80FBC00(void)
+void InitializeRfuLinkManager_EnterUnionRoom(void)
 {
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return;
-    Rfu.unk_0c = 2;
-    sub_80FAF1C();
-    sub_80FD430(sub_80FB5EC, NULL);
+    Rfu.parent_child = 2;
+    CopyPlayerNameToUnameBuffer();
+    rfu_LMAN_initializeManager(LmanCallback_Parent, NULL);
     sRfuReqConfig = sRfuReqConfigTemplate;
-    sRfuReqConfig.unk_11 = 0;
-    sRfuReqConfig.unk_12 = 0x258;
-    Rfu.unk_67 = CreateTask(sub_80F8B34, 1);
+    sRfuReqConfig.linkRecovery_enable = 0;
+    sRfuReqConfig.linkRecovery_period = 600;
+    Rfu.unk_67 = CreateTask(Task_LinkRfu_UnionRoomListen, 1);
 }
 
 static u16 ReadU16(const void *ptr)
@@ -2478,17 +2498,24 @@ static u16 ReadU16(const void *ptr)
     return (ptr_[1] << 8) | (ptr_[0]);
 }
 
-static u8 sub_80FBC70(const u8 *a0, u16 a1)
+/*
+ * ================================================================
+ * Looks up the player by uname and pid. Returns the index in
+ * gRfuLinkStatus->partner of the first match with a valid slot ID.
+ * Returns 0xFF if not found.
+ * ================================================================
+ */
+static u8 GetPartnerIndexByNameAndTrainerID(const u8 *trainerName, u16 trainerId)
 {
     u8 i;
     u8 ret = 0xFF;
 
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        u16 trainerId = ReadU16(((struct GFtgtGname *)gRfuLinkStatus->partner[i].gname)->unk_00.playerTrainerId);
-        if (sub_80FA44C(gRfuLinkStatus->partner[i].serialNo)
-            && !StringCompare(a0, gRfuLinkStatus->partner[i].uname)
-            && a1 == trainerId)
+        u16 partnerTrainerId = ReadU16(((struct GFtgtGname *)gRfuLinkStatus->partner[i].gname)->unk_00.playerTrainerId);
+        if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[i].serialNo)
+            && !StringCompare(trainerName, gRfuLinkStatus->partner[i].uname)
+            && trainerId == partnerTrainerId)
         {
             ret = i;
             if (gRfuLinkStatus->partner[i].slot != 0xFF)
@@ -2499,21 +2526,21 @@ static u8 sub_80FBC70(const u8 *a0, u16 a1)
     return ret;
 }
 
-static void sub_80FBCF8(u32 a0)
+static void RfuReqDisconnectSlot(u32 bmDisconnectSlot)
 {
-    rfu_REQ_disconnect(a0);
+    rfu_REQ_disconnect(bmDisconnectSlot);
     rfu_waitREQComplete();
-    Rfu.unk_ce2 &= ~(a0);
+    Rfu.bm_PartnerFlags &= ~(bmDisconnectSlot);
     rfu_clearSlot(TYPE_UNI_SEND, Rfu.unk_cda);
-    rfu_UNI_setSendData(Rfu.unk_ce2, Rfu.unk_c87, 70);
-    Rfu.unk_cda = sub_80F886C(Rfu.unk_ce2);
+    rfu_UNI_setSendData(Rfu.bm_PartnerFlags, Rfu.recvCmds, 70);
+    Rfu.unk_cda = sub_80F886C(Rfu.bm_PartnerFlags);
 }
 
-void sub_80FBD4C(const u8 *ptr, u16 a1)
+void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId)
 {
-    u8 var = sub_80FBC70(ptr, a1);
+    u8 var = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId);
     if (var != 0xFF)
-        sub_80FBCF8(1 << var);
+        RfuReqDisconnectSlot(1 << var);
 }
 
 void sub_80FBD6C(u32 a0)
@@ -2525,7 +2552,7 @@ void sub_80FBD6C(u32 a0)
 
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
-            if (Rfu.unk_cde[i] == a0 && (Rfu.unk_ce2 >> i) & 1)
+            if (Rfu.linkPlayerIdx[i] == a0 && (Rfu.bm_PartnerFlags >> i) & 1)
                 var |= 1 << i;
         }
         if (var)
@@ -2537,7 +2564,7 @@ static void sub_80FBDB8(u8 taskId)
 {
     if (gSendCmd[0] == 0 && !Rfu.unk_ce8)
     {
-        sub_80F9D04(0xED00);
+        RfuPrepareSendBuffer(RFU_COMMAND_0xed00);
         gSendCmd[1] = gTasks[taskId].data[0];
         gSendCmd[2] = gTasks[taskId].data[1];
         Rfu.playerCount -= gUnknown_843EC41[gTasks[taskId].data[0]];
@@ -2562,35 +2589,35 @@ static void sub_80FBE20(u32 a0, u32 a1)
     gTasks[taskId].data[1] = a1;
 }
 
-static void sub_80FBE80(u8 taskId)
+static void Task_RfuReconnectWithParent(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (sub_80F8EA4())
+    if (RfuStateIs7AndPlayerIsChild())
     {
-        u8 id = sub_80FBC70((u8*)data, ReadU16(&data[8]));
+        u8 id = GetPartnerIndexByNameAndTrainerID((u8*)data, ReadU16(&data[8]));
         if (id != 0xFF)
         {
             if (gRfuLinkStatus->partner[id].slot != 0xFF)
             {
-                Rfu.unk_c3d = id;
-                if (sub_80F8ECC())
+                Rfu.reconnectedParentIdx = id;
+                if (IsParentSuccessfullyReconnected())
                     DestroyTask(taskId);
             }
-            else if (sub_80F9800()->unk_0a_0 == 0x15 || sub_80F9800()->unk_0a_0 == 0x16)
+            else if (GetHostRFUtgtGname()->activity == ACTIVITY_WCARD2 || GetHostRFUtgtGname()->activity == ACTIVITY_WNEWS2)
             {
                 data[15]++;
             }
             else
             {
-                sub_80FB9E4(2, 0x7000);
+                RfuSetErrorStatus(2, 0x7000);
                 DestroyTask(taskId);
             }
         }
         else
         {
             data[15]++;
-            Rfu.unk_c3d = id;
+            Rfu.reconnectedParentIdx = id;
         }
     }
     else
@@ -2600,47 +2627,47 @@ static void sub_80FBE80(u8 taskId)
 
     if (data[15] > 240)
     {
-        sub_80FB9E4(2, 0x7000);
+        RfuSetErrorStatus(2, 0x7000);
         DestroyTask(taskId);
     }
 }
 
-void sub_80FBF54(const u8 *src, u16 trainerId)
+void CreateTask_RfuReconnectWithParent(const u8 *trainerName, u16 trainerId)
 {
     u8 taskId;
     s16 *data;
 
     Rfu.unk_f1 = 0;
-    taskId = CreateTask(sub_80FBE80, 3);
+    taskId = CreateTask(Task_RfuReconnectWithParent, 3);
     data = gTasks[taskId].data;
-    StringCopy((u8*)(data), src);
+    StringCopy((u8*)(data), trainerName);
     data[8] = trainerId;
 }
 
-static bool32 sub_80FBF98(s16 a1, struct GFtgtGname *structPtr)
+static bool32 ShouldRejectPartnerConnectionBasedOnActivity(s16 activity, struct GFtgtGname *partnerGname)
 {
-    if (sub_80F9800()->unk_0a_0 == 0x45)
+    if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM))
     {
-        if (structPtr->unk_0a_0 != 0x45)
+        if (partnerGname->activity != (ACTIVITY_CHAT | IN_UNION_ROOM))
             return TRUE;
     }
-    else if (structPtr->unk_0a_0 != 0x40)
+    else if (partnerGname->activity != IN_UNION_ROOM)
     {
         return TRUE;
     }
-    else if (a1 == 0x44)
+    else if (activity == (ACTIVITY_TRADE | IN_UNION_ROOM))
     {
-        struct GFtgtGname *structPtr2 = (struct GFtgtGname *)&Rfu.unk_104.gname;
-        if (structPtr2->species == SPECIES_EGG)
+        struct GFtgtGname *myTradeGname = (struct GFtgtGname *)&Rfu.unk_104.gname;
+        if (myTradeGname->species == SPECIES_EGG)
         {
-            if (structPtr->species == structPtr2->species)
+            if (partnerGname->species == myTradeGname->species)
                 return FALSE;
             else
                 return TRUE;
         }
-        else if (structPtr->species != structPtr2->species
-                 || structPtr->level != structPtr2->level
-                 || structPtr->type != structPtr2->type)
+        else if (partnerGname->species != myTradeGname->species
+                 || partnerGname->level != myTradeGname->level
+                 || partnerGname->type != myTradeGname->type)
         {
             return TRUE;
         }
@@ -2656,34 +2683,34 @@ static void sub_80FC028(u8 taskId)
 
     if (++gTasks[taskId].data[0] > 300)
     {
-        sub_80FB9E4(2, 0x7000);
+        RfuSetErrorStatus(2, 0x7000);
         DestroyTask(taskId);
     }
 
-    if (Rfu.unk_ccd != 0 && gUnknown_3005E10.unk_06 == 0)
+    if (Rfu.parentId != 0 && lman.parent_child == MODE_CHILD)
     {
         u16 trainerId = ReadU16(((struct GFtgtGname *)&Rfu.unk_104.gname)->unk_00.playerTrainerId);
-        u8 id = sub_80FBC70(Rfu.unk_104.uname, trainerId);
+        u8 id = GetPartnerIndexByNameAndTrainerID(Rfu.unk_104.uname, trainerId);
         if (id != 0xFF)
         {
-            if (!sub_80FBF98(gTasks[taskId].data[1], (struct GFtgtGname *)&gRfuLinkStatus->partner[id].gname))
+            if (!ShouldRejectPartnerConnectionBasedOnActivity(gTasks[taskId].data[1], (struct GFtgtGname *)&gRfuLinkStatus->partner[id].gname))
             {
-                if (gRfuLinkStatus->partner[id].slot != 0xFF && !sub_80FD610(gRfuLinkStatus->partner[id].id, 0x5A))
+                if (gRfuLinkStatus->partner[id].slot != 0xFF && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[id].id, 90))
                 {
-                    Rfu.unk_04 = 0xA;
+                    Rfu.state = 10;
                     DestroyTask(taskId);
                 }
             }
             else
             {
-                sub_80FB9E4(2, 0x7000);
+                RfuSetErrorStatus(2, 0x7000);
                 DestroyTask(taskId);
             }
         }
     }
 }
 
-void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2)
+void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 activity)
 {
     u8 taskId, taskId2;
 
@@ -2691,11 +2718,11 @@ void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2)
     Rfu.unk_f1 = 0;
     StringCopy(Rfu.unk_104.uname, name);
     memcpy(Rfu.unk_104.gname, structPtr, RFU_GAME_NAME_LENGTH);
-    sub_80FEB3C();
+    rfu_LMAN_forceChangeSP();
     taskId = CreateTask(sub_80FC028, 2);
-    gTasks[taskId].data[1] = a2;
-    taskId2 = FindTaskIdByFunc(sub_80F8B34);
-    if (a2 == 0x45)
+    gTasks[taskId].data[1] = activity;
+    taskId2 = FindTaskIdByFunc(Task_LinkRfu_UnionRoomListen);
+    if (activity == (ACTIVITY_CHAT | IN_UNION_ROOM))
     {
         if (taskId2 != 0xFF)
             gTasks[taskId2].data[7] = 1;
@@ -2709,7 +2736,7 @@ void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2)
 
 bool8 sub_80FC1B0(void)
 {
-    if (Rfu.unk_f0 == 1)
+    if (Rfu.linkLossRecoveryState == 1)
         return TRUE;
     else
         return FALSE;
@@ -2721,19 +2748,19 @@ bool32 sub_80FC1CC(void)
 
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if ((gUnknown_3005E10.unk_00 >> i) & 1 && Rfu.unk_cd1[i] == 0)
+        if ((lman.acceptSlot_flag >> i) & 1 && Rfu.unk_cd1[i] == 0)
             return FALSE;
     }
 
     return TRUE;
 }
 
-static void sub_80FC208(void)
+static void rfu_dbg_clear(void)
 {
     s32 i;
 
     for (i = 0; i < 20; i++)
-        nullsub_87("                              ", 0, i);
+        rfu_dbg_print_str("                              ", 0, i);
 }
 
 static const char gUnknown_843EE47[16] = {
@@ -2749,44 +2776,44 @@ static const char gUnknown_843EE57[9] = {
 static const char gUnknown_843EE60[] = {' ', '\0'};
 static const char gUnknown_843EE62[] = {'*', '\0'};
 
-static void sub_80FC228(void)
+static void rfu_dbg_print_status(void)
 {
     s32 i, j;
 
-    nullsub_88(GetBlockReceivedStatus(), 0x1C, 0x13, 2);
-    nullsub_88(gRfuLinkStatus->connSlotFlag, 0x14, 1, 1);
-    nullsub_88(gRfuLinkStatus->linkLossSlotFlag, 0x17, 1, 1);
-    if (Rfu.unk_0c == 1)
+    rfu_dbg_print_num(GetBlockReceivedStatus(), 0x1C, 0x13, 2);
+    rfu_dbg_print_num(gRfuLinkStatus->connSlotFlag, 0x14, 1, 1);
+    rfu_dbg_print_num(gRfuLinkStatus->linkLossSlotFlag, 0x17, 1, 1);
+    if (Rfu.parent_child == MODE_PARENT)
     {
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
             if ((gRfuLinkStatus->getNameFlag >> i) & 1)
             {
-                nullsub_88(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4);
-                nullsub_87((void*) &gRfuLinkStatus->partner[i].gname, 6, i + 3);
-                nullsub_87(gRfuLinkStatus->partner[i].uname, 0x16, i + 3);
+                rfu_dbg_print_num(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4);
+                rfu_dbg_print_str((void*) &gRfuLinkStatus->partner[i].gname, 6, i + 3);
+                rfu_dbg_print_str(gRfuLinkStatus->partner[i].uname, 0x16, i + 3);
             }
         }
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
             for (j = 0; j < 14; j++)
             {
-                nullsub_88(Rfu.unk_14[i][j], j * 2, i + 11, 2);
+                rfu_dbg_print_num(Rfu.unk_14[i][j], j * 2, i + 11, 2);
             }
         }
-        nullsub_87("NOWSLOT", 1, 0xF);
+        rfu_dbg_print_str("NOWSLOT", 1, 0xF);
     }
     else if (gRfuLinkStatus->connSlotFlag != 0 && gRfuLinkStatus->getNameFlag != 0)
     {
         for (i = 0; i < RFU_CHILD_MAX; i++)
         {
-            nullsub_88(0, 1, i + 3, 4);
-            nullsub_87(gUnknown_843EE47, 6, i + 3);
-            nullsub_87(gUnknown_843EE57, 0x16, i + 3);
+            rfu_dbg_print_num(0, 1, i + 3, 4);
+            rfu_dbg_print_str(gUnknown_843EE47, 6, i + 3);
+            rfu_dbg_print_str(gUnknown_843EE57, 0x16, i + 3);
         }
-        nullsub_88(gRfuLinkStatus->partner[Rfu.unk_c3e].serialNo, 1, 3, 4);
-        nullsub_87(gRfuLinkStatus->partner[Rfu.unk_c3e].gname, 6, 3);
-        nullsub_87(gRfuLinkStatus->partner[Rfu.unk_c3e].uname, 0x16, 3);
+        rfu_dbg_print_num(gRfuLinkStatus->partner[Rfu.child_slot].serialNo, 1, 3, 4);
+        rfu_dbg_print_str(gRfuLinkStatus->partner[Rfu.child_slot].gname, 6, 3);
+        rfu_dbg_print_str(gRfuLinkStatus->partner[Rfu.child_slot].uname, 0x16, 3);
     }
     else
     {
@@ -2794,16 +2821,16 @@ static void sub_80FC228(void)
         {
             if (gRfuLinkStatus->partner[i].slot != 0xFF)
             {
-                nullsub_88(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4);
-                nullsub_88(gRfuLinkStatus->partner[i].id, 6, i + 3, 4);
-                nullsub_87(gRfuLinkStatus->partner[i].uname, 0x16, i + 3);
+                rfu_dbg_print_num(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4);
+                rfu_dbg_print_num(gRfuLinkStatus->partner[i].id, 6, i + 3, 4);
+                rfu_dbg_print_str(gRfuLinkStatus->partner[i].uname, 0x16, i + 3);
             }
         }
         for (; i < RFU_CHILD_MAX; i++)
         {
-            nullsub_88(0, 1, i + 3, 4);
-            nullsub_87(gUnknown_843EE47, 6, i + 3);
-            nullsub_87(gUnknown_843EE57, 0x16, i + 3);
+            rfu_dbg_print_num(0, 1, i + 3, 4);
+            rfu_dbg_print_str(gUnknown_843EE47, 6, i + 3);
+            rfu_dbg_print_str(gUnknown_843EE57, 0x16, i + 3);
         }
     }
 }
@@ -2824,15 +2851,15 @@ static const char gUnknown_843EEA8[][8] = {
 
 static u32 sub_80FC44C(void)
 {
-    return Rfu.unk_9e8.unk_232;
+    return Rfu.unk_9e8.count;
 }
 
 u32 GetRfuRecvQueueLength(void)
 {
-    return Rfu.unk_124.unk_8c2;
+    return Rfu.unk_124.count;
 }
 
-static void nullsub_89(u8 taskId)
+static void Task_idle(u8 taskId)
 {
 
 }
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c
index 69b6603a8..d3f6e93db 100644
--- a/src/link_rfu_3.c
+++ b/src/link_rfu_3.c
@@ -166,7 +166,7 @@ static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = {
     SpriteCallbackDummy
 };
 
-void sub_80FC478(struct UnkRfuStruct_2_Sub_124 *ptr)
+void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue)
 {
     s32 i;
     s32 j;
@@ -175,16 +175,16 @@ void sub_80FC478(struct UnkRfuStruct_2_Sub_124 *ptr)
     {
         for (j = 0; j < 70; j++)
         {
-            ptr->unk_00[i][j] = 0;
+            queue->slots[i][j] = 0;
         }
     }
-    ptr->unk_8c1 = 0;
-    ptr->unk_8c0 = 0;
-    ptr->unk_8c2 = 0;
-    ptr->unk_8c3 = 0;
+    queue->send_slot = 0;
+    queue->recv_slot = 0;
+    queue->count = 0;
+    queue->full = 0;
 }
 
-void sub_80FC4D4(struct UnkRfuStruct_2_Sub_9e8 *ptr)
+void RFU_queue_40_14_reset(struct UnkRfuStruct_2_Sub_9e8 *ptr)
 {
     s32 i;
     s32 j;
@@ -193,16 +193,16 @@ void sub_80FC4D4(struct UnkRfuStruct_2_Sub_9e8 *ptr)
     {
         for (j = 0; j < 14; j++)
         {
-            ptr->unk_00[i][j] = 0;
+            ptr->slots[i][j] = 0;
         }
     }
-    ptr->unk_231 = 0;
-    ptr->unk_230 = 0;
-    ptr->unk_232 = 0;
-    ptr->unk_233 = 0;
+    ptr->send_slot = 0;
+    ptr->recv_slot = 0;
+    ptr->count = 0;
+    ptr->full = 0;
 }
 
-static void sub_80FC530(struct UnkRfuStruct_Sub_Unused *ptr)
+static void RFU_queue_2_256_reset(struct UnkRfuStruct_Sub_Unused *ptr)
 {
     s32 i;
     s32 j;
@@ -211,29 +211,29 @@ static void sub_80FC530(struct UnkRfuStruct_Sub_Unused *ptr)
     {
         for (j = 0; j < 256; j++)
         {
-            ptr->unk_00[i][j] = 0;
+            ptr->slots[i][j] = 0;
         }
     }
-    ptr->unk_201 = 0;
-    ptr->unk_200 = 0;
-    ptr->unk_202 = 0;
-    ptr->unk_203 = 0;
+    ptr->send_slot = 0;
+    ptr->recv_slot = 0;
+    ptr->count = 0;
+    ptr->full = 0;
 }
 
-void sub_80FC588(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2)
+void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data)
 {
     s32 i;
     u16 imeBak;
     u8 count;
 
-    if (q1->unk_8c2 < 20)
+    if (queue->count < 20)
     {
         imeBak = REG_IME;
         REG_IME = 0;
         count = 0;
         for (i = 0; i < 70; i += 14)
         {
-            if (q2[i] == 0 && q2[i + 1] == 0)
+            if (data[i] == 0 && data[i + 1] == 0)
             {
                 count++;
             }
@@ -242,36 +242,36 @@ void sub_80FC588(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2)
         {
             for (i = 0; i < 70; i++)
             {
-                q1->unk_00[q1->unk_8c0][i] = q2[i];
+                queue->slots[queue->recv_slot][i] = data[i];
             }
-            q1->unk_8c0++;
-            q1->unk_8c0 %= 20;
-            q1->unk_8c2++;
+            queue->recv_slot++;
+            queue->recv_slot %= 20;
+            queue->count++;
             for (i = 0; i < 70; i++)
             {
-                q2[i] = 0;
+                data[i] = 0;
             }
         }
         REG_IME = imeBak;
     }
     else
     {
-        q1->unk_8c3 = 1;
+        queue->full = 1;
     }
 }
 
-void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2)
+void RFU_queue_40_14_recv(struct UnkRfuStruct_2_Sub_9e8 *queue, u8 *data)
 {
     s32 i;
     u16 imeBak;
 
-    if (q1->unk_232 < 40)
+    if (queue->count < 40)
     {
         imeBak = REG_IME;
         REG_IME = 0;
         for (i = 0; i < 14; i++)
         {
-            if (q2[i] != 0)
+            if (data[i] != 0)
             {
                 break;
             }
@@ -280,57 +280,57 @@ void sub_80FC63C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2)
         {
             for (i = 0; i < 14; i++)
             {
-                q1->unk_00[q1->unk_230][i] = q2[i];
+                queue->slots[queue->recv_slot][i] = data[i];
             }
-            q1->unk_230++;
-            q1->unk_230 %= 40;
-            q1->unk_232++;
+            queue->recv_slot++;
+            queue->recv_slot %= 40;
+            queue->count++;
             for (i = 0; i < 14; i++)
             {
-                q2[i] = 0;
+                data[i] = 0;
             }
         }
         REG_IME = imeBak;
     }
     else
     {
-        q1->unk_233 = 1;
+        queue->full = 1;
     }
 }
 
-bool8 sub_80FC6E8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2)
+bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 *queue, u8 *dest)
 {
     u16 imeBak;
     s32 i;
 
     imeBak = REG_IME;
     REG_IME = 0;
-    if (q1->unk_8c0 == q1->unk_8c1 || q1->unk_8c3 != 0)
+    if (queue->recv_slot == queue->send_slot || queue->full)
     {
         for (i = 0; i < 70; i++)
         {
-            q2[i] = 0;
+            dest[i] = 0;
         }
         REG_IME = imeBak;
         return FALSE;
     }
     for (i = 0; i < 70; i++)
     {
-        q2[i] = q1->unk_00[q1->unk_8c1][i];
+        dest[i] = queue->slots[queue->send_slot][i];
     }
-    q1->unk_8c1++;
-    q1->unk_8c1 %= 20;
-    q1->unk_8c2--;
+    queue->send_slot++;
+    queue->send_slot %= 20;
+    queue->count--;
     REG_IME = imeBak;
     return TRUE;
 }
 
-bool8 sub_80FC79C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2)
+bool8 RFU_queue_40_14_send(struct UnkRfuStruct_2_Sub_9e8 *queue, u8 *dest)
 {
     s32 i;
     u16 imeBak;
 
-    if (q1->unk_230 == q1->unk_231 || q1->unk_233 != 0)
+    if (queue->recv_slot == queue->send_slot || queue->full != 0)
     {
         return FALSE;
     }
@@ -338,98 +338,98 @@ bool8 sub_80FC79C(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2)
     REG_IME = 0;
     for (i = 0; i < 14; i++)
     {
-        q2[i] = q1->unk_00[q1->unk_231][i];
+        dest[i] = queue->slots[queue->send_slot][i];
     }
-    q1->unk_231++;
-    q1->unk_231 %= 40;
-    q1->unk_232--;
+    queue->send_slot++;
+    queue->send_slot %= 40;
+    queue->count--;
     REG_IME = imeBak;
     return TRUE;
 }
 
-void sub_80FC828(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2)
+void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *queue, const u8 *data)
 {
     s32 i;
 
-    if (q2[1] == 0)
+    if (data[1] == 0)
     {
-        sub_80FC888(q1, NULL);
+        RFU_queue_2_14_send(queue, NULL);
     }
     else
     {
         for (i = 0; i < 14; i++)
         {
-            q1->unk_00[q1->unk_1c][i] = q2[i];
+            queue->slots[queue->recv_slot][i] = data[i];
         }
-        q1->unk_1c++;
-        q1->unk_1c %= 2;
-        if (q1->unk_1e < 2)
+        queue->recv_slot++;
+        queue->recv_slot %= 2;
+        if (queue->count < 2)
         {
-            q1->unk_1e++;
+            queue->count++;
         }
         else
         {
-            q1->unk_1d = q1->unk_1c;
+            queue->send_slot = queue->recv_slot;
         }
     }
 }
 
-bool8 sub_80FC888(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2)
+bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *queue, u8 *dest)
 {
     s32 i;
 
-    if (q1->unk_1e == 0)
+    if (queue->count == 0)
     {
         return FALSE;
     }
-    if (q2 != NULL)
+    if (dest != NULL)
     {
         for (i = 0; i < 14; i++)
         {
-            q2[i] = q1->unk_00[q1->unk_1d][i];
+            dest[i] = queue->slots[queue->send_slot][i];
         }
     }
-    q1->unk_1d++;
-    q1->unk_1d %= 2;
-    q1->unk_1e--;
+    queue->send_slot++;
+    queue->send_slot %= 2;
+    queue->count--;
     return TRUE;
 }
 
-static void sub_80FC8D8(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2)
+static void RFU_queue_2_256_recv(struct UnkRfuStruct_Sub_Unused *queue, u8 *data)
 {
     s32 i;
 
-    if (q1->unk_202 < 2)
+    if (queue->count < 2)
     {
         for (i = 0; i < 256; i++)
         {
-            q1->unk_00[q1->unk_200][i] = q2[i];
+            queue->slots[queue->recv_slot][i] = data[i];
         }
-        q1->unk_200++;
-        q1->unk_200 %= 2;
-        q1->unk_202++;
+        queue->recv_slot++;
+        queue->recv_slot %= 2;
+        queue->count++;
     }
     else
     {
-        q1->unk_203 = 1;
+        queue->full = 1;
     }
 }
 
-static bool8 sub_80FC944(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2)
+static bool8 RFU_queue_2_256_send(struct UnkRfuStruct_Sub_Unused *queue, u8 *send)
 {
     s32 i;
 
-    if (q1->unk_200 == q1->unk_201 || q1->unk_203)
+    if (queue->recv_slot == queue->send_slot || queue->full)
     {
         return FALSE;
     }
     for (i = 0; i < 256; i++)
     {
-        q2[i] = q1->unk_00[q1->unk_201][i];
+        send[i] = queue->slots[queue->send_slot][i];
     }
-    q1->unk_201++;
-    q1->unk_201 %= 2;
-    q1->unk_202--;
+    queue->send_slot++;
+    queue->send_slot %= 2;
+    queue->count--;
     return TRUE;
 }
 
@@ -438,7 +438,7 @@ static void sub_80FC9B8(u8 *q1, u8 mode)
     s32 i;
     u8 rval;
     u16 r5 = 0;
-    static u8 _3002018;
+    static u8 counter;
 
     switch (mode)
     {
@@ -470,11 +470,11 @@ static void sub_80FC9B8(u8 *q1, u8 mode)
         case 3:
             for (i = 0; i < 200; i++)
             {
-                q1[i] = i + 1 + _3002018;
-                r5 += (i + 1 + _3002018) & 0xFF;
+                q1[i] = i + 1 + counter;
+                r5 += (i + 1 + counter) & 0xFF;
             }
             *((u16 *)(q1 + i)) = r5;
-            _3002018++;
+            counter++;
             break;
     }
 }
@@ -603,7 +603,7 @@ static u8 GetConnectedChildStrength(u8 maxFlags)
 }
 #endif
 
-void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3)
+void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders)
 {
     s32 i;
 
@@ -613,30 +613,37 @@ void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3
     }
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        data->unk_04[i] = r3;
-        r3 >>= 8;
+        data->child_sprite_gender[i] = child_sprite_genders;
+        child_sprite_genders >>= 8;
     }
     data->playerGender = gSaveBlock2Ptr->playerGender;
-    data->unk_0a_0 = activity;
-    data->unk_0a_7 = r2;
-    data->unk_00.unk_00_0 = GAME_LANGUAGE;
-    data->unk_00.unk_01_2 = GAME_VERSION;
-    data->unk_00.unk_00_4 = 0;
-    data->unk_00.unk_00_5 = 0;
+    data->activity = activity;
+    data->started = started;
+    data->unk_00.language = GAME_LANGUAGE;
+    data->unk_00.version = GAME_VERSION;
+    data->unk_00.hasNews = FALSE;
+    data->unk_00.hasCard = FALSE;
     data->unk_00.unk_00_6 = 0;
     data->unk_00.isChampion = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS);
     data->unk_00.hasNationalDex = IsNationalPokedexEnabled();
     data->unk_00.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR);
 }
 
-bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx)
+/*
+ * ==========================================================
+ * Returns 1 if parent, 0 if child or neutral.
+ * If partner serial number is valid, copies gname and uname.
+ * Otherwise, blanks these.
+ * ==========================================================
+ */
+bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
 {
     bool8 retVal;
 
-    if (gUnknown_3005E10.unk_06 == 1)
+    if (lman.parent_child == MODE_PARENT)
     {
         retVal = TRUE;
-        if (sub_80FA44C(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
+        if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
         {
             memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
             memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -650,7 +657,7 @@ bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx)
     else
     {
         retVal = FALSE;
-        if (sub_80FA44C(gRfuLinkStatus->partner[idx].serialNo))
+        if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo))
         {
             memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
             memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -664,7 +671,13 @@ bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx)
     return retVal;
 }
 
-bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx)
+/*
+ * ==========================================================
+ * Specific check for serial number 0x7F7D,
+ * which comes from ???
+ * ==========================================================
+ */
+bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx)
 {
     bool8 retVal = FALSE;
     if (gRfuLinkStatus->partner[idx].serialNo == 0x7F7D)
@@ -824,7 +837,7 @@ void UpdateWirelessStatusIndicatorSprite(void)
         gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
         gMain.oamBuffer[125].tileNum = sprite->data[6] + sprite->anims[sprite->data[2]][sprite->data[4]].frame.imageValue;
         CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData));
-        if (sub_80FB9F4() == 1)
+        if (RfuGetErrorStatus() == 1)
         {
             DestroyWirelessStatusIndicatorSprite();
         }
diff --git a/src/list_menu.c b/src/list_menu.c
index 6c4d50961..706c1679b 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -763,7 +763,7 @@ void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
     BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32);
 }
 
-void sub_8107D38(u8 palOffset, u8 palId)
+void ListMenuLoadStdPalAt(u8 palOffset, u8 palId)
 {
     const u16 *palette;
 
diff --git a/src/load_save.c b/src/load_save.c
index 9c30494f8..7f16f74a5 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -284,8 +284,8 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey)
 {
     int i;
 
-    for(i = 0; i < 4; i++)
-        ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i].unk4, encryptionKey);
+    for(i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
+        ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->trainerTower[i].bestTime, encryptionKey);
 
     sub_8054F38(encryptionKey);
     ApplyNewEncryptionKeyToBagItems_(encryptionKey);
diff --git a/src/mevent.c b/src/mevent.c
index afad326b5..9eabcad61 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -9,7 +9,7 @@
 #include "decompress.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "unk_815c27c.h"
+#include "ereader_helpers.h"
 #include "util.h"
 #include "script.h"
 #include "event_data.h"
@@ -21,77 +21,65 @@
 #include "mystery_gift_menu.h"
 #include "help_system.h"
 #include "mevent.h"
+#include "strings.h"
 
 struct MEventTaskData1
 {
-    u16 t00;
+    u16 stateAdvanceDelay;
     u16 t02;
     u16 t04;
     u16 t06;
     u8 state;
-    u8 t09;
+    u8 textOrReceiveState;
     u8 t0A;
     u8 t0B;
     u8 t0C;
     u8 t0D;
-    u8 t0E;
+    u8 initialSendResult;
     struct MEvent_Str_2 *t10;
 };
 
-void sub_8143910(u8 taskId);
-bool32 sub_8143E64(const struct MEWonderNewsData * src);
-void sub_8143E9C(void);
-void sub_8143ED0(void);
-bool32 sub_8144018(const struct MEWonderCardData * src);
-void BlankSavedWonderCard(void);
-void BlankMEventBuffer2(void);
-void sub_8144824(u32, u32, u32 *, s32);
-void sub_8144790(void);
-
-extern const u8 gUnknown_841DE52[];
-extern const u8 gUnknown_841DE53[];
-extern const u8 gUnknown_841DE54[];
-extern const u8 gUnknown_841DE7C[];
-extern const u8 gUnknown_841DE7D[];
-extern const u8 gUnknown_841DE95[];
-extern const u8 gUnknown_841DE96[];
-extern const u8 gUnknown_841DE97[];
-extern const u8 gUnknown_841DE98[];
-extern const u8 gUnknown_841DE99[];
-extern const u8 gUnknown_841DE9A[];
-extern const u8 gUnknown_841DE9B[];
-extern const u8 gUnknown_841DE9C[];
+static void Task_EReaderComm(u8 taskId);
+static bool32 IsReceivedWonderNewsHeaderValid(const struct MEWonderNewsData * src);
+static void BlankWonderNews(void);
+static void BlankMENewsJisan(void);
+static bool32 IsReceivedWonderCardHeaderValid(const struct MEWonderCardData * src);
+static void BlankSavedWonderCard(void);
+static void BlankMEventBuffer2(void);
+static void RecordIdOfWonderCardSender(u32 eventId, u32 trainerId, u32 *idsList, s32 count);
+static void BlankBuffer344(void);
+
 extern const u8 gUnknownSerialData_Start[];
 extern const u8 gUnknownSerialData_End[];
 
-const u16 gUnknown_8466F00[] = {
-    0x02a7,
-    0x02a8,
-    0x02a9,
-    0x02aa,
-    0x02ab,
-    0x02ac,
-    0x02ad,
-    0x02ae,
-    0x02af,
-    0x02b0,
-    0x02b1,
-    0x02b2,
-    0x02b3,
-    0x02b4,
-    0x02b5,
-    0x02b6,
-    0x02b7,
-    0x02b8,
-    0x02b9,
-    0x02ba
+static const u16 sGiftItemFlagIds[] = {
+    FLAG_GOT_AURORA_TICKET,
+    FLAG_GOT_MYSTIC_TICKET,
+    FLAG_0x2A9,
+    FLAG_0x2AA,
+    FLAG_0x2AB,
+    FLAG_0x2AC,
+    FLAG_0x2AD,
+    FLAG_0x2AE,
+    FLAG_0x2AF,
+    FLAG_0x2B0,
+    FLAG_0x2B1,
+    FLAG_0x2B2,
+    FLAG_0x2B3,
+    FLAG_0x2B4,
+    FLAG_0x2B5,
+    FLAG_0x2B6,
+    FLAG_0x2B7,
+    FLAG_0x2B8,
+    FLAG_0x2B9,
+    FLAG_0x2BA
 };
 
-struct MEvent_Str_1 gUnknown_3005ED0;
+struct MEvent_Str_1 sMEventSendToEReaderManager;
 
-static EWRAM_DATA bool32 gUnknown_203F3BC = FALSE;
+static EWRAM_DATA bool32 sReceivedWonderCardIsValid = FALSE;
 
-void sub_81435DC(struct MEvent_Str_1 *mgr, size_t size, const void * data)
+void SendUnknownSerialData_Init(struct MEvent_Str_1 *mgr, size_t size, const void * data)
 {
     vu16 imeBak = REG_IME;
     REG_IME = 0;
@@ -106,7 +94,7 @@ void sub_81435DC(struct MEvent_Str_1 *mgr, size_t size, const void * data)
     mgr->data = data;
 }
 
-void sub_8143644(struct MEvent_Str_1 *unused)
+void SendUnknownSerialData_Teardown(struct MEvent_Str_1 *unused)
 {
     vu16 imeBak = REG_IME;
     REG_IME = 0;
@@ -116,15 +104,15 @@ void sub_8143644(struct MEvent_Str_1 *unused)
     REG_IME = imeBak;
 }
 
-u8 sub_8143674(struct MEvent_Str_1 *mgr)
+u8 SendUnknownSerialData_Run(struct MEvent_Str_1 *mgr)
 {
     u8 resp = 0;
     mgr->status = EReaderHandleTransfer(1, mgr->size, mgr->data, 0);
-    if ((mgr->status & 0x13) == 0x10)
+    if ((mgr->status & 0x13) == 0x10) // checksum OK and xfer off
         resp = 1;
-    if (mgr->status & 8)
+    if (mgr->status & 8) // cancelled by player
         resp = 2;
-    if (mgr->status & 4)
+    if (mgr->status & 4) // timed out
         resp = 3;
     gShouldAdvanceLinkState = 0;
     return resp;
@@ -161,32 +149,32 @@ static bool32 IsEReaderConnectionSane(void)
     return FALSE;
 }
 
-u32 sub_8143770(u8 * r4, u16 * r5)
+static u32 EReaderReceive(u8 * state_p, u16 * receiveDelay)
 {
-    if ((*r4 == 3 || *r4 == 4 || *r4 == 5) && HasLinkErrorOccurred())
+    if ((*state_p == 3 || *state_p == 4 || *state_p == 5) && HasLinkErrorOccurred())
     {
-        *r4 = 0;
+        *state_p = 0;
         return 3;
     }
-    switch (*r4)
+    switch (*state_p)
     {
         case 0:
             if (IsLinkMaster() && GetLinkPlayerCount_2() > 1)
             {
-                *r4 = 1;
+                *state_p = 1;
                 ;
             }
             else if (JOY_NEW(B_BUTTON))
             {
-                *r4 = 0;
+                *state_p = 0;
                 return 1;
             }
             break;
         case 1:
-            if (++(*r5) > 5)
+            if (++(*receiveDelay) > 5)
             {
-                *r5 = 0;
-                *r4 = 2;
+                *receiveDelay = 0;
+                *state_p = 2;
             }
             break;
         case 2:
@@ -194,19 +182,19 @@ u32 sub_8143770(u8 * r4, u16 * r5)
             {
                 PlaySE(SE_PINPON);
                 CheckShouldAdvanceLinkState();
-                *r5 = 0;
-                *r4 = 3;
+                *receiveDelay = 0;
+                *state_p = 3;
             }
             else if (JOY_NEW(B_BUTTON))
             {
-                *r4 = 0;
+                *state_p = 0;
                 return 1;
             }
             break;
         case 3:
-            if (++(*r5) > 30)
+            if (++(*receiveDelay) > 30)
             {
-                *r4 = 0;
+                *state_p = 0;
                 return 5;
             }
             else if (IsLinkConnectionEstablished())
@@ -215,24 +203,24 @@ u32 sub_8143770(u8 * r4, u16 * r5)
                 {
                     if (IsLinkPlayerDataExchangeComplete())
                     {
-                        *r4 = 0;
+                        *state_p = 0;
                         return 2;
                     }
                     else
-                        *r4 = 4;
+                        *state_p = 4;
                 }
                 else
-                    *r4 = 3;
+                    *state_p = 3;
             }
             break;
         case 4:
-            sub_800AA80(0);
-            *r4 = 5;
+            Link_StartSend5FFFwithParam(0);
+            *state_p = 5;
             break;
         case 5:
             if (!gReceivedRemoteLinkPlayers)
             {
-                *r4 = 0;
+                *state_p = 0;
                 return 4;
             }
             break;
@@ -242,19 +230,19 @@ u32 sub_8143770(u8 * r4, u16 * r5)
 
 void task_add_00_ereader(void)
 {
-    u8 taskId = CreateTask(sub_8143910, 0);
+    u8 taskId = CreateTask(Task_EReaderComm, 0);
     struct MEventTaskData1 *data = (struct MEventTaskData1 *)gTasks[taskId].data;
     data->state = 0;
-    data->t09 = 0;
+    data->textOrReceiveState = 0;
     data->t0A = 0;
     data->t0B = 0;
     data->t0C = 0;
     data->t0D = 0;
-    data->t00 = 0;
+    data->stateAdvanceDelay = 0;
     data->t02 = 0;
     data->t04 = 0;
     data->t06 = 0;
-    data->t0E = 0;
+    data->initialSendResult = 0;
     data->t10 = AllocZeroed(sizeof(struct MEvent_Str_2));
 }
 
@@ -273,22 +261,22 @@ static bool32 AdvanceDelayTimerCheckTimeout(u16 * a0, u16 a1)
     return FALSE;
 }
 
-void sub_8143910(u8 taskId)
+static void Task_EReaderComm(u8 taskId)
 {
     struct MEventTaskData1 *data = (struct MEventTaskData1 *)gTasks[taskId].data;
     switch (data->state)
     {
         case 0:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE52))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_ReceiveMysteryGiftWithEReader))
                 data->state = 1;
             break;
         case 1:
             ResetTTDataBuffer();
-            ResetDelayTimer(&data->t00);
+            ResetDelayTimer(&data->stateAdvanceDelay);
             data->state = 2;
             break;
         case 2:
-            if (AdvanceDelayTimerCheckTimeout(&data->t00, 10))
+            if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 10))
                 data->state = 3;
             break;
         case 3:
@@ -301,22 +289,22 @@ void sub_8143910(u8 taskId)
                 data->state = 13;
             break;
         case 4:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE53))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_SelectConnectFromEReaderMenu))
             {
-                AddTextPrinterToWindow1(gUnknown_841DE54);
-                ResetDelayTimer(&data->t00);
+                AddTextPrinterToWindow1(gJPText_SelectConnectWithGBA);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 data->state = 5;
             }
             break;
         case 5:
-            if (AdvanceDelayTimerCheckTimeout(&data->t00, 90))
+            if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 90))
             {
                 ResetTTDataBuffer();
                 data->state = 6;
             }
             else if (JOY_NEW(B_BUTTON))
             {
-                ResetDelayTimer(&data->t00);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 PlaySE(SE_SELECT);
                 data->state = 23;
             }
@@ -326,12 +314,12 @@ void sub_8143910(u8 taskId)
             {
                 PlaySE(SE_SELECT);
                 CloseLink();
-                ResetDelayTimer(&data->t00);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 data->state = 23;
             }
             else if (GetLinkPlayerCount_2() > 1)
             {
-                ResetDelayTimer(&data->t00);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 CloseLink();
                 data->state = 7;
             }
@@ -339,72 +327,80 @@ void sub_8143910(u8 taskId)
             {
                 PlaySE(SE_SELECT);
                 CloseLink();
-                ResetDelayTimer(&data->t00);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 data->state = 8;
             }
-            else if (AdvanceDelayTimerCheckTimeout(&data->t00, 10))
+            else if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 10))
             {
                 CloseLink();
                 ResetTTDataBuffer();
-                ResetDelayTimer(&data->t00);
+                ResetDelayTimer(&data->stateAdvanceDelay);
             }
             break;
         case 7:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE7C))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_LinkIsIncorrect))
                 data->state = 4;
             break;
         case 8:
-            AddTextPrinterToWindow1(gUnknown_841DE95);
-            sub_81435DC(&gUnknown_3005ED0, gUnknownSerialData_End - gUnknownSerialData_Start, gUnknownSerialData_Start);
+            AddTextPrinterToWindow1(gJPText_Connecting);
+            SendUnknownSerialData_Init(&sMEventSendToEReaderManager, gUnknownSerialData_End - gUnknownSerialData_Start, gUnknownSerialData_Start);
             data->state = 9;
             break;
         case 9:
-            data->t0E = sub_8143674(&gUnknown_3005ED0);
-            if (data->t0E != 0)
+            data->initialSendResult = SendUnknownSerialData_Run(&sMEventSendToEReaderManager);
+            if (data->initialSendResult != 0)
                 data->state = 10;
             break;
         case 10:
-            sub_8143644(&gUnknown_3005ED0);
-            if (data->t0E == 3)
+            SendUnknownSerialData_Teardown(&sMEventSendToEReaderManager);
+            if (data->initialSendResult == 3)
+                // Error
                 data->state = 20;
-            else if (data->t0E == 1)
+            else if (data->initialSendResult == 1)
             {
-                ResetDelayTimer(&data->t00);
-                AddTextPrinterToWindow1(gUnknown_841DE9B);
+                // OK
+                ResetDelayTimer(&data->stateAdvanceDelay);
+                AddTextPrinterToWindow1(gJPText_PleaseWaitAMoment);
                 data->state = 11;
             }
             else
+                // Try again
                 data->state = 0;
             break;
         case 11:
-            if (AdvanceDelayTimerCheckTimeout(&data->t00, 840))
+            if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 840))
                 data->state = 12;
             break;
         case 12:
             ResetTTDataBuffer();
-            AddTextPrinterToWindow1(gUnknown_841DE98);
+            AddTextPrinterToWindow1(gJPText_AllowEReaderToLoadCard);
             data->state = 13;
             break;
         case 13:
-            switch (sub_8143770(&data->t09, &data->t00))
+            switch (EReaderReceive(&data->textOrReceiveState, &data->stateAdvanceDelay))
             {
                 case 0:
+                    // Running
                     break;
                 case 2:
-                    AddTextPrinterToWindow1(gUnknown_841DE95);
+                    // Done
+                    AddTextPrinterToWindow1(gJPText_Connecting);
                     data->state = 14;
                     break;
                 case 1:
+                    // Cancelled
                     PlaySE(SE_SELECT);
                     CloseLink();
                     data->state = 23;
                     break;
                 case 5:
+                    // Error Try Again
                     CloseLink();
                     data->state = 21;
                     break;
                 case 3:
                 case 4:
+                    // Error CheckLink
                     CloseLink();
                     data->state = 20;
                     break;
@@ -423,55 +419,55 @@ void sub_8143910(u8 taskId)
             }
             break;
         case 15:
-            data->t0E = ValidateTrainerTowerData((struct EReaderTrainerHillSet *)gDecompressionBuffer);
-            sub_800AA80(data->t0E);
+            data->initialSendResult = ValidateTrainerTowerData((struct EReaderTrainerTowerSet *)gDecompressionBuffer);
+            Link_StartSend5FFFwithParam(data->initialSendResult);
             data->state = 16;
             break;
         case 16:
             if (!gReceivedRemoteLinkPlayers)
             {
-                if (data->t0E == 1)
+                if (data->initialSendResult == 1)
                     data->state = 17;
                 else
                     data->state = 20;
             }
             break;
         case 17:
-            if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerHillSet *)gDecompressionBuffer))
+            if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerTowerSet *)gDecompressionBuffer))
             {
-                AddTextPrinterToWindow1(gUnknown_841DE99);
-                ResetDelayTimer(&data->t00);
+                AddTextPrinterToWindow1(gJPText_ConnectionComplete);
+                ResetDelayTimer(&data->stateAdvanceDelay);
                 data->state = 18;
             }
             else
                 data->state = 22;
             break;
         case 18:
-            if (AdvanceDelayTimerCheckTimeout(&data->t00, 120))
+            if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 120))
             {
-                AddTextPrinterToWindow1(gUnknown_841DE9A);
-                PlayFanfare(258);
+                AddTextPrinterToWindow1(gJPText_NewTrainerHasComeToSevii);
+                PlayFanfare(MUS_FANFA4);
                 data->state = 19;
             }
             break;
         case 19:
-            if (IsFanfareTaskInactive() &&JOY_NEW(A_BUTTON | B_BUTTON))
+            if (IsFanfareTaskInactive() && JOY_NEW(A_BUTTON | B_BUTTON))
                 data->state = 26;
             break;
         case 23:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE7D))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_CardReadingHasBeenHalted))
                 data->state = 26;
             break;
         case 20:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE96))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_ConnectionErrorCheckLink))
                 data->state = 0;
             break;
         case 21:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE97))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_ConnectionErrorTryAgain))
                 data->state = 0;
             break;
         case 22:
-            if (MG_PrintTextOnWindow1AndWaitButton(&data->t09, gUnknown_841DE9C))
+            if (MG_PrintTextOnWindow1AndWaitButton(&data->textOrReceiveState, gJPText_WriteErrorUnableToSaveData))
                 data->state = 0;
             break;
         case 26:
@@ -483,10 +479,10 @@ void sub_8143910(u8 taskId)
     }
 }
 
-void sub_8143D24(void)
+void InitMEventData(void)
 {
     CpuFill32(0, &gSaveBlock1Ptr->mysteryEventBuffers, sizeof(gSaveBlock1Ptr->mysteryEventBuffers));
-    sub_8143ED0();
+    BlankMENewsJisan();
     EC_ResetMEventProfileMaybe();
 }
 
@@ -517,14 +513,14 @@ u16 * GetMEventProfileECWordsMaybe(void)
 
 void DestroyWonderNews(void)
 {
-    sub_8143E9C();
+    BlankWonderNews();
 }
 
-bool32 sub_8143DC8(const struct MEWonderNewsData * src)
+bool32 OverwriteSavedWonderNewsWithReceivedNews(const struct MEWonderNewsData * src)
 {
-    if (!sub_8143E64(src))
+    if (!IsReceivedWonderNewsHeaderValid(src))
         return FALSE;
-    sub_8143E9C();
+    BlankWonderNews();
     gSaveBlock1Ptr->mysteryEventBuffers.menews.data = *src;
     gSaveBlock1Ptr->mysteryEventBuffers.menews.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->mysteryEventBuffers.menews.data, sizeof(struct MEWonderNewsData));
     return TRUE;
@@ -534,14 +530,14 @@ bool32 ValidateReceivedWonderNews(void)
 {
     if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->mysteryEventBuffers.menews.data, sizeof(struct MEWonderNewsData)) != gSaveBlock1Ptr->mysteryEventBuffers.menews.crc)
         return FALSE;
-    if (!sub_8143E64(&gSaveBlock1Ptr->mysteryEventBuffers.menews.data))
+    if (!IsReceivedWonderNewsHeaderValid(&gSaveBlock1Ptr->mysteryEventBuffers.menews.data))
         return FALSE;
     return TRUE;
 }
 
-bool32 sub_8143E64(const struct MEWonderNewsData * data)
+static bool32 IsReceivedWonderNewsHeaderValid(const struct MEWonderNewsData * data)
 {
-    if (data->unk_00 == 0)
+    if (data->newsId == 0)
         return FALSE;
     return TRUE;
 }
@@ -549,24 +545,24 @@ bool32 sub_8143E64(const struct MEWonderNewsData * data)
 bool32 WonderNews_Test_Unk_02(void)
 {
     const struct MEWonderNewsData * data = &gSaveBlock1Ptr->mysteryEventBuffers.menews.data;
-    if (data->unk_02 == 0)
+    if (data->shareState == 0)
         return FALSE;
     return TRUE;
 }
 
-void sub_8143E9C(void)
+static void BlankWonderNews(void)
 {
     CpuFill32(0, GetSavedWonderNews(), sizeof(gSaveBlock1Ptr->mysteryEventBuffers.menews.data));
     gSaveBlock1Ptr->mysteryEventBuffers.menews.crc = 0;
 }
 
-void sub_8143ED0(void)
+static void BlankMENewsJisan(void)
 {
     CpuFill32(0, GetMENewsJisanStructPtr(), sizeof(struct MENewsJisanStruct));
     MENewsJisanReset();
 }
 
-bool32 sub_8143EF4(const u8 * src)
+bool32 MEvent_HaveAlreadyReceivedWonderNews(const u8 * src)
 {
     const u8 * r5 = (const u8 *)&gSaveBlock1Ptr->mysteryEventBuffers.menews.data;
     u32 i;
@@ -584,22 +580,23 @@ void DestroyWonderCard(void)
 {
     BlankSavedWonderCard();
     BlankMEventBuffer2();
-    sub_8144790();
+    BlankBuffer344();
     ClearRamScript();
-    sub_806E2D0();
-    sub_806E370();
+    ResetMysteryEventFlags();
+    ResetMysteryEventVars();
     ClearEReaderTrainer(&gSaveBlock2Ptr->battleTower.ereaderTrainer);
 }
 
-bool32 sub_8143F68(const struct MEWonderCardData * data)
+bool32 OverwriteSavedWonderCardWithReceivedCard(const struct MEWonderCardData * data)
 {
     struct MEventBuffer_3430_Sub * r2;
     struct MEWonderCardData * r1;
-    if (!sub_8144018(data))
+    if (!IsReceivedWonderCardHeaderValid(data))
         return FALSE;
     DestroyWonderCard();
     memcpy(&gSaveBlock1Ptr->mysteryEventBuffers.mecard.data, data, sizeof(struct MEWonderCardData));
     gSaveBlock1Ptr->mysteryEventBuffers.mecard.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->mysteryEventBuffers.mecard.data, sizeof(struct MEWonderCardData));
+    // Annoying hack to match
     r2 = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data;
     r1 = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
     r2->unk_06 = r1->unk_02;
@@ -610,24 +607,24 @@ bool32 ValidateReceivedWonderCard(void)
 {
     if (gSaveBlock1Ptr->mysteryEventBuffers.mecard.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->mysteryEventBuffers.mecard.data, sizeof(struct MEWonderCardData)))
         return FALSE;
-    if (!sub_8144018(&gSaveBlock1Ptr->mysteryEventBuffers.mecard.data))
+    if (!IsReceivedWonderCardHeaderValid(&gSaveBlock1Ptr->mysteryEventBuffers.mecard.data))
         return FALSE;
-    if (!sub_8069DFC())
+    if (!ValidateRamScript())
         return FALSE;
     return TRUE;
 }
 
-bool32 sub_8144018(const struct MEWonderCardData * data)
+static bool32 IsReceivedWonderCardHeaderValid(const struct MEWonderCardData * data)
 {
-    if (data->unk_00 == 0)
+    if (data->cardId == 0)
         return FALSE;
     if (data->unk_08_0 > 2)
         return FALSE;
-    if (!(data->unk_08_6 == 0 || data->unk_08_6 == 1 || data->unk_08_6 == 2))
+    if (!(data->shareState == 0 || data->shareState == 1 || data->shareState == 2))
         return FALSE;
     if (data->unk_08_2 > 7)
         return FALSE;
-    if (data->unk_09 > 7)
+    if (data->recvMonCapacity > 7)
         return FALSE;
     return TRUE;
 }
@@ -635,18 +632,18 @@ bool32 sub_8144018(const struct MEWonderCardData * data)
 bool32 WonderCard_Test_Unk_08_6(void)
 {
     const struct MEWonderCardData * data = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
-    if (data->unk_08_6 == 0)
+    if (data->shareState == 0)
         return FALSE;
     return TRUE;
 }
 
-void BlankSavedWonderCard(void)
+static void BlankSavedWonderCard(void)
 {
     CpuFill32(0, &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data, sizeof(struct MEWonderCardData));
     gSaveBlock1Ptr->mysteryEventBuffers.mecard.crc = 0;
 }
 
-void BlankMEventBuffer2(void)
+static void BlankMEventBuffer2(void)
 {
     CpuFill32(0, sav1_get_mevent_buffer_2(), 18 * sizeof(u16));
     gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.crc = 0;
@@ -655,17 +652,17 @@ void BlankMEventBuffer2(void)
 u16 GetWonderCardFlagId(void)
 {
     if (ValidateReceivedWonderCard())
-        return gSaveBlock1Ptr->mysteryEventBuffers.mecard.data.unk_00;
+        return gSaveBlock1Ptr->mysteryEventBuffers.mecard.data.cardId;
     return 0;
 }
 
-void sub_814410C(struct MEWonderCardData * buffer)
+void MEvent_WonderCardResetUnk08_6(struct MEWonderCardData * buffer)
 {
-    if (buffer->unk_08_6 == 1)
-        buffer->unk_08_6 = 0;
+    if (buffer->shareState == 1)
+        buffer->shareState = 0;
 }
 
-bool32 sub_8144124(u16 a0)
+static bool32 IsCardIdInValidRange(u16 a0)
 {
     if (a0 >= 1000 && a0 < 1020)
         return TRUE;
@@ -675,33 +672,33 @@ bool32 sub_8144124(u16 a0)
 bool32 CheckReceivedGiftFromWonderCard(void)
 {
     u16 value = GetWonderCardFlagId();
-    if (!sub_8144124(value))
+    if (!IsCardIdInValidRange(value))
         return FALSE;
-    if (FlagGet(gUnknown_8466F00[value - 1000]) == TRUE)
+    if (FlagGet(sGiftItemFlagIds[value - 1000]) == TRUE)
         return FALSE;
     return TRUE;
 }
 
-s32 sub_8144184(const struct MEventBuffer_3430_Sub * data, s32 size)
+static s32 CountReceivedDistributionMons(const struct MEventBuffer_3430_Sub * data, s32 size)
 {
     s32 r3 = 0;
     s32 i;
     for (i = 0; i < size; i++)
     {
-        if (data->unk_08[1][i] && data->unk_08[0][i])
+        if (data->distributedMons[1][i] && data->distributedMons[0][i])
             r3++;
     }
     return r3;
 }
 
-bool32 sub_81441AC(const struct MEventBuffer_3430_Sub * data1, const u16 * data2, s32 size)
+static bool32 HasPlayerAlreadyReceivedDistributedMon(const struct MEventBuffer_3430_Sub * data1, const u16 * data2, s32 size)
 {
     s32 i;
     for (i = 0; i < size; i++)
     {
-        if (data1->unk_08[1][i] == data2[1])
+        if (data1->distributedMons[1][i] == data2[1])
             return TRUE;
-        if (data1->unk_08[0][i] == data2[0])
+        if (data1->distributedMons[0][i] == data2[0])
             return TRUE;
     }
     return FALSE;
@@ -718,7 +715,7 @@ static bool32 IsWonderCardSpeciesValid(const u16 * data)
     return TRUE;
 }
 
-s32 sub_8144218(void)
+static s32 ValidateCardAndCountMonsReceived(void)
 {
     struct MEWonderCardData * data;
     if (!ValidateReceivedWonderCard())
@@ -726,24 +723,24 @@ s32 sub_8144218(void)
     data = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
     if (data->unk_08_0 != 1)
         return 0;
-    return sub_8144184(&gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data, data->unk_09);
+    return CountReceivedDistributionMons(&gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data, data->recvMonCapacity);
 }
 
-bool32 sub_8144254(const u16 * data)
+bool32 MEvent_ReceiveDistributionMon(const u16 * data)
 {
     struct MEWonderCardData * buffer = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
-    s32 size = buffer->unk_09;
+    s32 capacity = buffer->recvMonCapacity;
     s32 i;
     if (!IsWonderCardSpeciesValid(data))
         return FALSE;
-    if (sub_81441AC(&gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data, data, size))
+    if (HasPlayerAlreadyReceivedDistributedMon(&gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data, data, capacity))
         return FALSE;
-    for (i = 0; i < size; i++)
+    for (i = 0; i < capacity; i++)
     {
-        if (gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_08[1][i] == 0 && gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_08[0][i] == 0)
+        if (gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.distributedMons[1][i] == 0 && gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.distributedMons[0][i] == 0)
         {
-            gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_08[1][i] = data[1];
-            gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_08[0][i] = data[0];
+            gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.distributedMons[1][i] = data[1];
+            gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.distributedMons[0][i] = data[0];
             return TRUE;
         }
     }
@@ -771,9 +768,9 @@ void BuildMEventClientHeader(struct MEventClientHeaderStruct * data)
     if (ValidateReceivedWonderCard())
     {
         // Populate fields
-        data->id = GetSavedWonderCard()->unk_00;
+        data->id = GetSavedWonderCard()->cardId;
         data->unk_20 = *sav1_get_mevent_buffer_2();
-        data->unk_44 = GetSavedWonderCard()->unk_09;
+        data->maxDistributionMons = GetSavedWonderCard()->recvMonCapacity;
     }
     else
         data->id = 0;
@@ -815,14 +812,14 @@ u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void
     return 2;
 }
 
-u32 sub_8144434(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused)
+u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused)
 {
-    s32 r4 = a1->unk_44 - sub_8144184(&a1->unk_20, a1->unk_44);
-    if (r4 == 0)
+    s32 numSpaces = a1->maxDistributionMons - CountReceivedDistributionMons(&a1->unk_20, a1->maxDistributionMons);
+    if (numSpaces == 0)
         return 1;
-    if (sub_81441AC(&a1->unk_20, a0, a1->unk_44))
+    if (HasPlayerAlreadyReceivedDistributedMon(&a1->unk_20, a0, a1->maxDistributionMons))
         return 3;
-    if (r4 == 1)
+    if (numSpaces == 1)
         return 4;
     return 2;
 }
@@ -838,9 +835,9 @@ bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1)
     return TRUE;
 }
 
-s32 sub_814449C(const struct MEventClientHeaderStruct * a0)
+static s32 GetNumReceivedDistributionMons(const struct MEventClientHeaderStruct * a0)
 {
-    return sub_8144184(&a0->unk_20, a0->unk_44);
+    return CountReceivedDistributionMons(&a0->unk_20, a0->maxDistributionMons);
 }
 
 u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command)
@@ -848,22 +845,23 @@ u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command)
     switch (command)
     {
         case 0:
-            return a0->unk_20.unk_00;
+            return a0->unk_20.linkWins;
         case 1:
-            return a0->unk_20.unk_02;
+            return a0->unk_20.linkLosses;
         case 2:
-            return a0->unk_20.unk_04;
+            return a0->unk_20.linkTrades;
         case 3:
-            return sub_814449C(a0);
+            return GetNumReceivedDistributionMons(a0);
         case 4:
-            return a0->unk_44;
+            return a0->maxDistributionMons;
         default:
              AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 825);
             return 0;
     }
 }
 
-void sub_814451C(u32 command)
+// Increments an interaction count in the save block
+static void IncrementBattleCardCount(u32 command)
 {
     struct MEWonderCardData * data = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
     if (data->unk_08_0 == 2)
@@ -872,13 +870,13 @@ void sub_814451C(u32 command)
         switch (command)
         {
             case 0:
-                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_00;
+                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.linkWins;
                 break;
             case 1:
-                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_02;
+                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.linkLosses;
                 break;
             case 2:
-                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.unk_04;
+                dest = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data.linkTrades;
                 break;
             case 3:
                 break;
@@ -896,7 +894,7 @@ void sub_814451C(u32 command)
     }
 }
 
-u16 sub_81445C0(u32 command)
+u16 MEvent_GetBattleCardCount(u32 command)
 {
     switch (command)
     {
@@ -906,7 +904,7 @@ u16 sub_81445C0(u32 command)
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data;
-                return buffer->unk_00;
+                return buffer->linkWins;
             }
             break;
         }
@@ -916,7 +914,7 @@ u16 sub_81445C0(u32 command)
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data;
-                return buffer->unk_02;
+                return buffer->linkLosses;
             }
             break;
         }
@@ -926,7 +924,7 @@ u16 sub_81445C0(u32 command)
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub * buffer = &gSaveBlock1Ptr->mysteryEventBuffers.buffer_310.data;
-                return buffer->unk_04;
+                return buffer->linkTrades;
             }
             break;
         }
@@ -934,14 +932,14 @@ u16 sub_81445C0(u32 command)
         {
             struct MEWonderCardData * data = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
             if (data->unk_08_0 == 1)
-                return sub_8144218();
+                return ValidateCardAndCountMonsReceived();
             break;
         }
         case 4:
         {
             struct MEWonderCardData * data = &gSaveBlock1Ptr->mysteryEventBuffers.mecard.data;
             if (data->unk_08_0 == 1)
-                return data->unk_09;
+                return data->recvMonCapacity;
             break;
         }
     }
@@ -949,38 +947,38 @@ u16 sub_81445C0(u32 command)
     return 0;
 }
 
-void sub_81446C4(void)
+void ResetReceivedWonderCardFlag(void)
 {
-    gUnknown_203F3BC = FALSE;
+    sReceivedWonderCardIsValid = FALSE;
 }
 
-bool32 sub_81446D0(u16 a0)
+bool32 MEventHandleReceivedWonderCard(u16 cardId)
 {
-    gUnknown_203F3BC = FALSE;
-    if (a0 == 0)
+    sReceivedWonderCardIsValid = FALSE;
+    if (cardId == 0)
         return FALSE;
     if (!ValidateReceivedWonderCard())
         return FALSE;
-    if (gSaveBlock1Ptr->mysteryEventBuffers.mecard.data.unk_00 != a0)
+    if (gSaveBlock1Ptr->mysteryEventBuffers.mecard.data.cardId != cardId)
         return FALSE;
-    gUnknown_203F3BC = TRUE;
+    sReceivedWonderCardIsValid = TRUE;
     return TRUE;
 }
 
-void sub_8144714(u32 a0, u32 a1)
+void MEvent_RecordIdOfWonderCardSenderByEventType(u32 eventId, u32 trainerId)
 {
-    if (gUnknown_203F3BC)
+    if (sReceivedWonderCardIsValid)
     {
-        switch (a0)
+        switch (eventId)
         {
-            case 2:
-                sub_8144824(2, a1, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[1], 5);
+            case 2: // trade
+                RecordIdOfWonderCardSender(2, trainerId, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[1], 5);
                 break;
-            case 0:
-                sub_8144824(0, a1, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
+            case 0: // link win
+                RecordIdOfWonderCardSender(0, trainerId, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
                 break;
-            case 1:
-                sub_8144824(1, a1, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
+            case 1: // link loss
+                RecordIdOfWonderCardSender(1, trainerId, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
                 break;
             default:
                  AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 988);
@@ -988,43 +986,48 @@ void sub_8144714(u32 a0, u32 a1)
     }
 }
 
-void sub_8144790(void)
+static void BlankBuffer344(void)
 {
     CpuFill32(0, gSaveBlock1Ptr->mysteryEventBuffers.unk_344, sizeof(gSaveBlock1Ptr->mysteryEventBuffers.unk_344));
 }
 
-bool32 sub_81447BC(u32 a0, u32 * a1, s32 size)
+// Looks up trainerId in an array idsList with count elements.
+// If trainerId is found, rearranges idsList to put it in the front.
+// Otherwise, drops the last element of the list and inserts
+// trainerId at the front.
+// Returns TRUE in the latter case.
+static bool32 PlaceTrainerIdAtFrontOfList(u32 trainerId, u32 * idsList, s32 count)
 {
     s32 i;
     s32 j;
 
-    for (i = 0; i < size; i++)
+    for (i = 0; i < count; i++)
     {
-        if (a1[i] == a0)
+        if (idsList[i] == trainerId)
             break;
     }
-    if (i == size)
+    if (i == count)
     {
-        for (j = size - 1; j > 0; j--)
+        for (j = count - 1; j > 0; j--)
         {
-            a1[j] = a1[j - 1];
+            idsList[j] = idsList[j - 1];
         }
-        a1[0] = a0;
+        idsList[0] = trainerId;
         return TRUE;
     }
     else
     {
         for (j = i; j > 0; j--)
         {
-            a1[j] = a1[j - 1];
+            idsList[j] = idsList[j - 1];
         }
-        a1[0] = a0;
+        idsList[0] = trainerId;
         return FALSE;
     }
 }
 
-void sub_8144824(u32 a0, u32 a1, u32 * a2, s32 a3)
+static void RecordIdOfWonderCardSender(u32 eventId, u32 trainerId, u32 * idsList, s32 count)
 {
-    if (sub_81447BC(a1, a2, a3))
-        sub_814451C(a0);
+    if (PlaceTrainerIdAtFrontOfList(trainerId, idsList, count))
+        IncrementBattleCardCount(eventId);
 }
diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c
deleted file mode 100644
index 3de09ab44..000000000
--- a/src/mevent_8145654.c
+++ /dev/null
@@ -1,793 +0,0 @@
-#include "global.h"
-#include "constants/species.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "palette.h"
-#include "decompress.h"
-#include "malloc.h"
-#include "menu.h"
-#include "new_menu_helpers.h"
-#include "pokemon_icon.h"
-#include "mystery_gift_menu.h"
-#include "menu_indicators.h"
-#include "string_util.h"
-#include "link_rfu.h"
-#include "mevent.h"
-#include "battle_anim.h"
-
-struct UnkStruct_8467FB8
-{
-    u8 textPal1:4;
-    u8 textPal2:4;
-    u8 textPal3:4;
-    u8 textPal4:4;
-    const u8 * tiles;
-    const u8 * map;
-    const u16 * pal;
-};
-
-struct UnkStruct_203F3C8_02DC
-{
-    u8 unk_00;
-    u8 unk_01[41];
-    u8 unk_42[4];
-};
-
-struct UnkStruct_203F3C8
-{
-    /*0000*/ struct MEWonderCardData unk_0000;
-    /*014c*/ struct MEventBuffer_3430_Sub unk_014C;
-    /*0170*/ const struct UnkStruct_8467FB8 * unk_0170;
-    /*0174*/ u8 unk_0174;
-    /*0175*/ u8 unk_0175;
-    /*0176*/ u16 unk_0176[3];
-    /*017C*/ u8 unk_017C;
-    /*017D*/ u8 unk_017D[7][2];
-    /*018B*/ u8 unk_018B[41];
-    /*01B4*/ u8 unk_01B4[41];
-    /*01DD*/ u8 unk_01DD[7];
-    /*01E4*/ u8 unk_01E4[4][41];
-    /*0288*/ u8 unk_0288[41];
-    /*02B1*/ u8 unk_02B1[41];
-    /*02DC*/ struct UnkStruct_203F3C8_02DC unk_02DC[8];
-    /*045C*/ u8 buffer_045C[0x1000];
-};
-
-EWRAM_DATA struct UnkStruct_203F3C8 * gUnknown_203F3C8 = NULL;
-
-void sub_8145A98(void);
-void sub_8145D18(u8 whichWindow);
-void sub_8146060(void);
-void sub_81461D8(void);
-
-const u8 gUnknown_8467068[][3] = {
-    {0, 2, 3},
-    {0, 1, 2}
-};
-const u8 ALIGNED(4) gUnknown_8467070[3] = {7, 4, 7};
-const struct WindowTemplate gUnknown_8467074[] = {
-    {0x01, 0x01, 0x01, 0x19, 0x04, 0x0f, 0x029c},
-    {0x01, 0x01, 0x06, 0x1c, 0x08, 0x0f, 0x01bc},
-    {0x01, 0x01, 0x0e, 0x1c, 0x05, 0x0f, 0x0130}
-};
-
-const u16 gUnknown_846708C[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
-const u16 gUnknown_84670AC[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal");
-const u16 gUnknown_84670CC[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal");
-const u16 gUnknown_84670EC[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal");
-const u16 gUnknown_846710C[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal");
-const u16 gUnknown_846712C[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal");
-const u16 gUnknown_846714C[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
-const u16 gUnknown_846716C[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
-const u8 gUnknown_846718C[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
-const u8 gUnknown_8467288[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
-const u8 gUnknown_846737C[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
-const u8 gUnknown_8467470[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
-const u8 gUnknown_8467558[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
-const u8 gUnknown_846762C[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
-const u8 gUnknown_8467700[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
-const u8 gUnknown_8467934[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
-const u8 gUnknown_8467A7C[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
-const u8 gUnknown_8467CAC[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
-const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
-const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
-const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
-const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
-const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
-const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
-const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
-const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
-const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");
-
-const struct CompressedSpriteSheet gUnknown_8467F58 = {
-    gUnknown_8467EF4, 0x100, 0x8000
-};
-const struct SpritePalette gUnknown_8467F60[] = {
-    {gUnknown_8467DF4, 0x8000},
-    {gUnknown_8467E14, 0x8000},
-    {gUnknown_8467E34, 0x8000},
-    {gUnknown_8467E54, 0x8000},
-    {gUnknown_8467E74, 0x8000},
-    {gUnknown_8467E94, 0x8000},
-    {gUnknown_8467EB4, 0x8000},
-    {gUnknown_8467ED4, 0x8000}
-};
-const struct SpriteTemplate gUnknown_8467FA0 = {
-    0x8000, 0x8000, &gOamData_AffineOff_ObjNormal_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-};
-const struct UnkStruct_8467FB8 gUnknown_8467FB8[8] = {
-    {1, 0, 0, 0, gUnknown_846718C, gUnknown_8467288, gUnknown_846708C},
-    {1, 0, 0, 1, gUnknown_846737C, gUnknown_8467470, gUnknown_84670AC},
-    {1, 0, 0, 2, gUnknown_8467558, gUnknown_846762C, gUnknown_84670CC},
-    {1, 0, 0, 3, gUnknown_8467558, gUnknown_846762C, gUnknown_84670EC},
-    {1, 0, 0, 4, gUnknown_8467558, gUnknown_846762C, gUnknown_846710C},
-    {1, 0, 0, 5, gUnknown_8467558, gUnknown_846762C, gUnknown_846712C},
-    {1, 0, 0, 6, gUnknown_8467700, gUnknown_8467934, gUnknown_846714C},
-    {1, 0, 0, 7, gUnknown_8467A7C, gUnknown_8467CAC, gUnknown_846716C}
-};
-
-bool32 InitWonderCardResources(struct MEWonderCardData * r5, struct MEventBuffer_3430_Sub * r6)
-{
-    if (r5 == NULL || r6 == NULL)
-        return FALSE;
-    gUnknown_203F3C8 = AllocZeroed(sizeof(struct UnkStruct_203F3C8));
-    if (gUnknown_203F3C8 == NULL)
-        return FALSE;
-    gUnknown_203F3C8->unk_0000 = *r5;
-    gUnknown_203F3C8->unk_014C = *r6;
-    if (gUnknown_203F3C8->unk_0000.unk_08_2 >= NELEMS(gUnknown_8467FB8))
-        gUnknown_203F3C8->unk_0000.unk_08_2 = 0;
-    if (gUnknown_203F3C8->unk_0000.unk_08_0 >= NELEMS(gUnknown_8467070))
-        gUnknown_203F3C8->unk_0000.unk_08_0 = 0;
-    if (gUnknown_203F3C8->unk_0000.unk_09 > NELEMS(gUnknown_203F3C8->unk_017D))
-        gUnknown_203F3C8->unk_0000.unk_09 = 0;
-    gUnknown_203F3C8->unk_0170 = &gUnknown_8467FB8[gUnknown_203F3C8->unk_0000.unk_08_2];
-    return TRUE;
-}
-
-void DestroyWonderCardResources(void)
-{
-    if (gUnknown_203F3C8 != NULL)
-    {
-        *gUnknown_203F3C8 = (struct UnkStruct_203F3C8){};
-        Free(gUnknown_203F3C8);
-        gUnknown_203F3C8 = NULL;
-    }
-}
-
-s32 FadeToWonderCardMenu(void)
-{
-    if (gUnknown_203F3C8 == NULL)
-        return -1;
-    switch(gUnknown_203F3C8->unk_0174)
-    {
-        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-            break;
-        case 1:
-            if (UpdatePaletteFade())
-                return 0;
-            break;
-        case 2:
-            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(1);
-            CopyBgTilemapBufferToVram(2);
-            DecompressAndCopyTileDataToVram(2, gUnknown_203F3C8->unk_0170->tiles, 0, 0x008, 0);
-            gUnknown_203F3C8->unk_0176[0] = AddWindow(&gUnknown_8467074[0]);
-            gUnknown_203F3C8->unk_0176[1] = AddWindow(&gUnknown_8467074[1]);
-            gUnknown_203F3C8->unk_0176[2] = AddWindow(&gUnknown_8467074[2]);
-            break;
-        case 3:
-            if (FreeTempTileDataBuffersIfPossible())
-                return 0;
-            gPaletteFade.bufferTransferDisabled = TRUE;
-            LoadPalette(gUnknown_203F3C8->unk_0170->pal, 0x10, 0x20);
-            LZ77UnCompWram(gUnknown_203F3C8->unk_0170->map, gUnknown_203F3C8->buffer_045C);
-            CopyRectToBgTilemapBufferRect(2, gUnknown_203F3C8->buffer_045C, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0);
-            CopyBgTilemapBufferToVram(2);
-            break;
-        case 4:
-            sub_8145A98();
-            break;
-        case 5:
-            sub_8145D18(0);
-            sub_8145D18(1);
-            sub_8145D18(2);
-            CopyBgTilemapBufferToVram(1);
-            break;
-        case 6:
-            LoadMonIconPalettes();
-            break;
-        case 7:
-            ShowBg(1);
-            ShowBg(2);
-            gPaletteFade.bufferTransferDisabled = FALSE;
-            sub_8146060();
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-            UpdatePaletteFade();
-            break;
-        default:
-            if (UpdatePaletteFade())
-                return 0;
-            gUnknown_203F3C8->unk_0174 = 0;
-            return 1;
-    }
-    ++gUnknown_203F3C8->unk_0174;
-    return 0;
-}
-
-s32 FadeOutFromWonderCard(bool32 flag)
-{
-    if (gUnknown_203F3C8 == NULL)
-        return -1;
-    switch (gUnknown_203F3C8->unk_0174)
-    {
-        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-            break;
-        case 1:
-            if (UpdatePaletteFade())
-                return 0;
-            break;
-        case 2:
-            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(1);
-            CopyBgTilemapBufferToVram(2);
-            break;
-        case 3:
-            HideBg(1);
-            HideBg(2);
-            RemoveWindow(gUnknown_203F3C8->unk_0176[2]);
-            RemoveWindow(gUnknown_203F3C8->unk_0176[1]);
-            RemoveWindow(gUnknown_203F3C8->unk_0176[0]);
-            break;
-        case 4:
-            sub_81461D8();
-            FreeMonIconPalettes();
-            break;
-        case 5:
-            PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag);
-            break;
-        case 6:
-            CopyBgTilemapBufferToVram(0);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-            break;
-        default:
-            if (UpdatePaletteFade())
-                return 0;
-            gUnknown_203F3C8->unk_0174 = 0;
-            return 1;
-    }
-    ++gUnknown_203F3C8->unk_0174;
-    return 0;
-}
-
-void sub_8145A98(void)
-{
-    u16 i = 0;
-    u16 r6;
-    u16 sp0[3] = {0, 0, 0};
-
-    memcpy(gUnknown_203F3C8->unk_018B, gUnknown_203F3C8->unk_0000.unk_0A, 40);
-    gUnknown_203F3C8->unk_018B[40] = EOS;
-    memcpy(gUnknown_203F3C8->unk_01B4, gUnknown_203F3C8->unk_0000.unk_32, 40);
-    gUnknown_203F3C8->unk_01B4[40] = EOS;
-    if (gUnknown_203F3C8->unk_0000.unk_04 > 999999)
-        gUnknown_203F3C8->unk_0000.unk_04 = 999999;
-    ConvertIntToDecimalStringN(gUnknown_203F3C8->unk_01DD, gUnknown_203F3C8->unk_0000.unk_04, STR_CONV_MODE_LEFT_ALIGN, 6);
-    for (i = 0; i < 4; i++)
-    {
-        memcpy(gUnknown_203F3C8->unk_01E4[i], gUnknown_203F3C8->unk_0000.unk_5A[i], 40);
-        gUnknown_203F3C8->unk_01E4[i][40] = EOS;
-    }
-    memcpy(gUnknown_203F3C8->unk_0288, gUnknown_203F3C8->unk_0000.unk_FA, 40);
-    gUnknown_203F3C8->unk_0288[40] = EOS;
-    switch (gUnknown_203F3C8->unk_0000.unk_08_0)
-    {
-        case 0:
-            memcpy(gUnknown_203F3C8->unk_02B1, gUnknown_203F3C8->unk_0000.unk_122, 40);
-            gUnknown_203F3C8->unk_02B1[40] = EOS;
-            break;
-        case 1:
-            gUnknown_203F3C8->unk_02B1[00] = EOS;
-            break;
-        case 2:
-            gUnknown_203F3C8->unk_02B1[00] = EOS;
-            sp0[0] = gUnknown_203F3C8->unk_014C.unk_00 < 999 ? gUnknown_203F3C8->unk_014C.unk_00 : 999;
-            sp0[1] = gUnknown_203F3C8->unk_014C.unk_02 < 999 ? gUnknown_203F3C8->unk_014C.unk_02 : 999;
-            sp0[2] = gUnknown_203F3C8->unk_014C.unk_04 < 999 ? gUnknown_203F3C8->unk_014C.unk_04 : 999;
-            for (i = 0; i < 8; i++)
-            {
-                memset(gUnknown_203F3C8->unk_02DC[i].unk_42, EOS, 4);
-                memset(gUnknown_203F3C8->unk_02DC[i].unk_01, EOS, 41);
-            }
-            for (i = 0, r6 = 0; i < 40; i++)
-            {
-                if (gUnknown_203F3C8->unk_0000.unk_122[i] != 0xF7)
-                {
-                    gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_01[r6] = gUnknown_203F3C8->unk_0000.unk_122[i];
-                    r6++;
-                }
-                else
-                {
-                    u8 r3 = gUnknown_203F3C8->unk_0000.unk_122[i + 1];
-                    if (r3 > 2)
-                    {
-                        i += 2;
-                    }
-                    else
-                    {
-                        ConvertIntToDecimalStringN(gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_42, sp0[r3], STR_CONV_MODE_LEADING_ZEROS, 3);
-                        gUnknown_203F3C8->unk_02DC[gUnknown_203F3C8->unk_0175].unk_00 = gUnknown_203F3C8->unk_0000.unk_122[i + 2];
-                        gUnknown_203F3C8->unk_0175++;
-                        if (gUnknown_203F3C8->unk_0175 > 7)
-                            break;
-                        r6 = 0;
-                        i += 2;
-                    }
-                }
-            }
-    }
-}
-
-void sub_8145D18(u8 whichWindow)
-{
-    s8 sp0C = 0;
-    s32 windowId = gUnknown_203F3C8->unk_0176[whichWindow];
-    PutWindowTilemap(windowId);
-    FillWindowPixelBuffer(windowId, 0);
-    switch (whichWindow)
-    {
-        case 0:
-        {
-            s32 x;
-            AddTextPrinterParameterized3(windowId, 3, 0, 1, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B);
-            x = 160 - GetStringWidth(3, gUnknown_203F3C8->unk_01B4, GetFontAttribute(3, 2));
-            if (x < 0)
-                x = 0;
-            AddTextPrinterParameterized3(windowId, 3, x, 17, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4);
-            if (gUnknown_203F3C8->unk_0000.unk_04 != 0)
-            {
-                AddTextPrinterParameterized3(windowId, 2, 166, 17, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD);
-            }
-            break;
-        }
-        case 1:
-            for (; sp0C < 4; sp0C++)
-            {
-                AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]);
-            }
-            break;
-        case 2:
-            AddTextPrinterParameterized3(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288);
-            if (gUnknown_203F3C8->unk_0000.unk_08_0 != 2)
-            {
-                AddTextPrinterParameterized3(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1);
-            }
-            else
-            {
-                s32 x = 0;
-                s32 y = gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0] + 16;
-                s32 spacing = GetFontAttribute(3, 2);
-                for (; sp0C < gUnknown_203F3C8->unk_0175; sp0C++)
-                {
-                    AddTextPrinterParameterized3(windowId, 3, x, y, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01);
-                    if (gUnknown_203F3C8->unk_02DC[sp0C].unk_42[0] != EOS)
-                    {
-                        x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_01, spacing);
-                        AddTextPrinterParameterized3(windowId, 2, x, y, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42);
-                        x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_42, spacing) + gUnknown_203F3C8->unk_02DC[sp0C].unk_00;
-                    }
-                }
-            }
-            break;
-    }
-    CopyWindowToVram(windowId, 3);
-}
-
-void sub_8146060(void)
-{
-    u8 r7 = 0;
-    gUnknown_203F3C8->unk_017C = 0xFF;
-    if (gUnknown_203F3C8->unk_014C.unk_06 != SPECIES_NONE)
-    {
-        gUnknown_203F3C8->unk_017C = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(gUnknown_203F3C8->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
-        gSprites[gUnknown_203F3C8->unk_017C].oam.priority = 2;
-    }
-    if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1)
-    {
-        LoadCompressedSpriteSheetUsingHeap(&gUnknown_8467F58);
-        LoadSpritePalette(&gUnknown_8467F60[gUnknown_203F3C8->unk_0170->textPal4]);
-        for (; r7 < gUnknown_203F3C8->unk_0000.unk_09; r7++)
-        {
-            gUnknown_203F3C8->unk_017D[r7][0] = 0xFF;
-            gUnknown_203F3C8->unk_017D[r7][1] = 0xFF;
-            gUnknown_203F3C8->unk_017D[r7][0] = CreateSprite(&gUnknown_8467FA0, 0xd8 - 32 * r7, 0x90, 8);
-            if (gUnknown_203F3C8->unk_014C.unk_08[0][r7] != 0)
-            {
-                gUnknown_203F3C8->unk_017D[r7][1] = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(gUnknown_203F3C8->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
-                gSprites[gUnknown_203F3C8->unk_017D[r7][1]].oam.priority = 2;
-            }
-        }
-    }
-}
-
-void sub_81461D8(void)
-{
-    u8 r6 = 0;
-    if (gUnknown_203F3C8->unk_017C != 0xFF)
-        DestroyMonIcon(&gSprites[gUnknown_203F3C8->unk_017C]);
-    if (gUnknown_203F3C8->unk_0000.unk_09 != 0 && gUnknown_203F3C8->unk_0000.unk_08_0 == 1)
-    {
-        for (; r6 < gUnknown_203F3C8->unk_0000.unk_09; r6++)
-        {
-            if (gUnknown_203F3C8->unk_017D[r6][0] != 0xFF)
-            {
-                DestroySprite(&gSprites[gUnknown_203F3C8->unk_017D[r6][0]]);
-                // This might be a typo.  Uncomment the next line, and comment the one that follows, to get the presumed intended behavior.
-                // if (gUnknown_203F3C8->unk_017D[r6][1] != 0xFF)
-                if (gUnknown_203F3C8->unk_017D[r6][0] != 0xFF)
-                {
-                    DestroyMonIcon(&gSprites[gUnknown_203F3C8->unk_017D[r6][1]]);
-                }
-            }
-        }
-        FreeSpriteTilesByTag(0x8000);
-        FreeSpritePaletteByTag(0x8000);
-    }
-}
-
-struct UnkStruct_203F3CC
-{
-    /*0000*/ struct MEWonderNewsData unk_0000;
-    /*01bc*/ const struct UnkStruct_8467FB8 * unk_01BC;
-    /*01c0*/ u8 unk_01C0_0:1;
-             u8 unk_01C0_1:7;
-    /*01c1*/ u8 unk_01C1;
-    /*01c2*/ u8 unk_01C2_0:1;
-             u8 unk_01C2_1:7;
-    /*01c3*/ u8 unk_01C3_0:1;
-             u8 unk_01C3_1:7;
-    /*01c4*/ u16 unk_01C4;
-    /*01c6*/ u16 unk_01C6;
-    /*01c8*/ u16 unk_01C8[2];
-    /*01cc*/ u8 filler_01CC[2];
-    /*01ce*/ u8 unk_01CE[41];
-    /*01f7*/ u8 unk_01F7[10][41];
-    /*0394*/ struct ScrollArrowsTemplate unk_0394;
-    /*03a4*/ u8 buffer_03A4[0x1000];
-};
-
-EWRAM_DATA struct UnkStruct_203F3CC * gUnknown_203F3CC = NULL;
-
-void sub_8146980(void);
-void sub_8146A30(void);
-void sub_8146B58(void);
-
-const u8 gUnknown_8468038[][3] = {
-    {0, 2, 3},
-    {0, 1, 2}
-};
-const struct WindowTemplate gUnknown_8468040[] = {
-    {0, 1, 0, 28,  3, 15, 0x000},
-    {2, 1, 3, 28, 20, 15, 0x000}
-};
-const struct ScrollArrowsTemplate gUnknown_8468050 = {
-    0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98,
-    0x0000, 0x0002, 0x1000, 0x1000, 0x0,
-};
-
-const u16 gUnknown_8468060[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
-const u16 gUnknown_8468080[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
-const u16 gUnknown_84680A0[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
-const u8 gUnknown_84680C0[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
-const u8 gUnknown_8468140[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
-const u8 gUnknown_846821C[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
-const u8 gUnknown_846824C[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
-const u8 gUnknown_846830C[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
-const u8 gUnknown_846837C[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
-const u8 gUnknown_8468448[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
-const u8 gUnknown_84684D8[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
-const u8 gUnknown_84685B4[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
-const u8 gUnknown_8468644[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");
-
-const struct UnkStruct_8467FB8 gUnknown_8468720[] = {
-    {1, 0, 0, 0, gUnknown_84680C0, gUnknown_8468140, gUnknown_8468060},
-    {1, 0, 0, 0, gUnknown_846821C, gUnknown_846824C, gUnknown_84670AC},
-    {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_84670CC},
-    {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_84670EC},
-    {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_846710C},
-    {1, 0, 0, 0, gUnknown_846830C, gUnknown_846837C, gUnknown_846712C},
-    {1, 0, 0, 0, gUnknown_8468448, gUnknown_84684D8, gUnknown_8468080},
-    {1, 0, 0, 0, gUnknown_84685B4, gUnknown_8468644, gUnknown_84680A0}
-};
-
-bool32 InitWonderNewsResources(const struct MEWonderNewsData * a0)
-{
-    if (a0 == NULL)
-        return FALSE;
-    gUnknown_203F3CC = AllocZeroed(sizeof(struct UnkStruct_203F3CC));
-    if (gUnknown_203F3CC == NULL)
-        return FALSE;
-    gUnknown_203F3CC->unk_0000 = *a0;
-    if (gUnknown_203F3CC->unk_0000.unk_03 >= NELEMS(gUnknown_8468720))
-        gUnknown_203F3CC->unk_0000.unk_03 = 0;
-    gUnknown_203F3CC->unk_01BC = &gUnknown_8468720[gUnknown_203F3CC->unk_0000.unk_03];
-    gUnknown_203F3CC->unk_01C1 = 0xFF;
-    return TRUE;
-}
-
-void DestroyWonderNewsResources(void)
-{
-    if (gUnknown_203F3CC != NULL)
-    {
-        *gUnknown_203F3CC = (struct UnkStruct_203F3CC){};
-        Free(gUnknown_203F3CC);
-        gUnknown_203F3CC = NULL;
-    }
-}
-
-s32 FadeToWonderNewsMenu(void)
-{
-    if (gUnknown_203F3CC == NULL)
-        return -1;
-
-    switch (gUnknown_203F3CC->unk_01C0_1)
-    {
-        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-            break;
-        case 1:
-            if (UpdatePaletteFade())
-                return 0;
-            ChangeBgY(0, 0, 0);
-            ChangeBgY(1, 0, 0);
-            ChangeBgY(2, 0, 0);
-            ChangeBgY(3, 0, 0);
-            SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
-            SetGpuReg(REG_OFFSET_WIN0V, 0x1A98);
-            SetGpuReg(REG_OFFSET_WININ, 0x1F);
-            SetGpuReg(REG_OFFSET_WINOUT, 0x1B);
-            SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
-            break;
-        case 2:
-            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 20);
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(1);
-            CopyBgTilemapBufferToVram(2);
-            CopyBgTilemapBufferToVram(3);
-            DecompressAndCopyTileDataToVram(3, gUnknown_203F3CC->unk_01BC->tiles, 0, 8, 0);
-            gUnknown_203F3CC->unk_01C8[0] = AddWindow(&gUnknown_8468040[0]);
-            gUnknown_203F3CC->unk_01C8[1] = AddWindow(&gUnknown_8468040[1]);
-            break;
-        case 3:
-            if (FreeTempTileDataBuffersIfPossible())
-                return 0;
-            gPaletteFade.bufferTransferDisabled = TRUE;
-            LoadPalette(gUnknown_203F3CC->unk_01BC->pal, 0x10, 0x20);
-            LZ77UnCompWram(gUnknown_203F3CC->unk_01BC->map, gUnknown_203F3CC->buffer_03A4);
-            CopyRectToBgTilemapBufferRect(1, gUnknown_203F3CC->buffer_03A4, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0);
-            CopyRectToBgTilemapBufferRect(3, gUnknown_203F3CC->buffer_03A4, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0);
-            CopyBgTilemapBufferToVram(1);
-            CopyBgTilemapBufferToVram(3);
-            break;
-        case 4:
-            sub_8146980();
-            break;
-        case 5:
-            sub_8146A30();
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(2);
-            break;
-        case 6:
-            ShowBg(1);
-            ShowBg(2);
-            ShowBg(3);
-            gPaletteFade.bufferTransferDisabled = FALSE;
-            gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-            UpdatePaletteFade();
-            break;
-        default:
-            if (UpdatePaletteFade())
-                return 0;
-            gUnknown_203F3CC->unk_01C0_1 = 0;
-            return 1;
-    }
-
-    ++gUnknown_203F3CC->unk_01C0_1;
-    return 0;
-}
-
-s32 FadeOutFromWonderNews(bool32 flag)
-{
-    if (gUnknown_203F3CC == NULL)
-        return -1;
-    switch (gUnknown_203F3CC->unk_01C0_1)
-    {
-        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-            break;
-        case 1:
-            if (UpdatePaletteFade())
-                return 0;
-            ChangeBgY(2, 0, 0);
-            SetGpuReg(REG_OFFSET_WIN0H, 0);
-            SetGpuReg(REG_OFFSET_WIN0V, 0);
-            SetGpuReg(REG_OFFSET_WININ, 0);
-            SetGpuReg(REG_OFFSET_WINOUT, 0);
-            ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
-            break;
-        case 2:
-            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
-            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 24);
-            FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 24);
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(1);
-            CopyBgTilemapBufferToVram(2);
-            CopyBgTilemapBufferToVram(3);
-            break;
-        case 3:
-            HideBg(1);
-            HideBg(2);
-            RemoveWindow(gUnknown_203F3CC->unk_01C8[1]);
-            RemoveWindow(gUnknown_203F3CC->unk_01C8[0]);
-            break;
-        case 4:
-            ChangeBgY(2, 0, 0);
-            ChangeBgY(3, 0, 0);
-            if (gUnknown_203F3CC->unk_01C1 != 0xFF)
-            {
-                RemoveScrollIndicatorArrowPair(gUnknown_203F3CC->unk_01C1);
-                gUnknown_203F3CC->unk_01C1 = 0xFF;
-            }
-            break;
-        case 5:
-            PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag);
-            break;
-        case 6:
-            MG_DrawCheckerboardPattern();
-            CopyBgTilemapBufferToVram(0);
-            CopyBgTilemapBufferToVram(3);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-            break;
-        default:
-            if (UpdatePaletteFade())
-                return 0;
-            gUnknown_203F3CC->unk_01C0_1 = 0;
-            return 1;
-    }
-    ++gUnknown_203F3CC->unk_01C0_1;
-    return 0;
-}
-
-void MENews_RemoveScrollIndicatorArrowPair(void)
-{
-    if (!gUnknown_203F3CC->unk_01C0_0 && gUnknown_203F3CC->unk_01C1 != 0xFF)
-    {
-        RemoveScrollIndicatorArrowPair(gUnknown_203F3CC->unk_01C1);
-        gUnknown_203F3CC->unk_01C1 = 0xFF;
-        gUnknown_203F3CC->unk_01C0_0 = TRUE;
-    }
-}
-
-
-void MENews_AddScrollIndicatorArrowPair(void)
-{
-    if (gUnknown_203F3CC->unk_01C0_0)
-    {
-        gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6);
-        gUnknown_203F3CC->unk_01C0_0 = FALSE;
-    }
-}
-
-u32 MENews_GetInput(u16 input)
-{
-    if (gUnknown_203F3CC->unk_01C2_0)
-    {
-        sub_8146B58();
-        return 0xFF;
-    }
-    switch (input)
-    {
-        case A_BUTTON:
-            return 0;
-        case B_BUTTON:
-            return 1;
-        case DPAD_UP:
-            if (gUnknown_203F3CC->unk_01C6 == 0)
-                return 0xFF;
-            if (gUnknown_203F3CC->unk_01C0_0)
-                return 0xFF;
-            gUnknown_203F3CC->unk_01C3_0 = FALSE;
-            break;
-        case DPAD_DOWN:
-            if (gUnknown_203F3CC->unk_01C6 == gUnknown_203F3CC->unk_01C4)
-                return 0xFF;
-            if (gUnknown_203F3CC->unk_01C0_0)
-                return 0xFF;
-            gUnknown_203F3CC->unk_01C3_0 = TRUE;
-            break;
-        default:
-            return 0xFF;
-    }
-    gUnknown_203F3CC->unk_01C2_0 = TRUE;
-    gUnknown_203F3CC->unk_01C2_1 = 2;
-    gUnknown_203F3CC->unk_01C3_1 = 0;
-    if (gUnknown_203F3CC->unk_01C3_0 == FALSE)
-        return 2;
-    else
-        return 3;
-}
-
-void sub_8146980(void)
-{
-    u8 i = 0;
-    memcpy(gUnknown_203F3CC->unk_01CE, gUnknown_203F3CC->unk_0000.unk_04, 40);
-    gUnknown_203F3CC->unk_01CE[40] = EOS;
-    for (; i < 10; ++i)
-    {
-        memcpy(gUnknown_203F3CC->unk_01F7[i], gUnknown_203F3CC->unk_0000.unk_2C[i], 40);
-        gUnknown_203F3CC->unk_01F7[i][40] = EOS;
-        if (i > 7 && gUnknown_203F3CC->unk_01F7[i][0] != EOS)
-            ++gUnknown_203F3CC->unk_01C4;
-    }
-    gUnknown_203F3CC->unk_0394 = gUnknown_8468050;
-    gUnknown_203F3CC->unk_0394.fullyDownThreshold = gUnknown_203F3CC->unk_01C4;
-}
-
-void sub_8146A30(void)
-{
-    u8 i = 0;
-    s32 x;
-    PutWindowTilemap(gUnknown_203F3CC->unk_01C8[0]);
-    PutWindowTilemap(gUnknown_203F3CC->unk_01C8[1]);
-    FillWindowPixelBuffer(gUnknown_203F3CC->unk_01C8[0], 0);
-    FillWindowPixelBuffer(gUnknown_203F3CC->unk_01C8[1], 0);
-    x = (0xe0 - GetStringWidth(3, gUnknown_203F3CC->unk_01CE, GetFontAttribute(3, 2))) / 2;
-    if (x < 0)
-        x = 0;
-    AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE);
-    for (; i < 10; ++i)
-    {
-        AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]);
-    }
-    CopyWindowToVram(gUnknown_203F3CC->unk_01C8[0], 3);
-    CopyWindowToVram(gUnknown_203F3CC->unk_01C8[1], 3);
-}
-
-void sub_8146B58(void)
-{
-    u16 r4 = gUnknown_203F3CC->unk_01C2_1;
-    r4 <<= 8;
-    if (gUnknown_203F3CC->unk_01C3_0)
-    {
-        ChangeBgY(2, r4, 1);
-        ChangeBgY(3, r4, 1);
-    }
-    else
-    {
-        ChangeBgY(2, r4, 2);
-        ChangeBgY(3, r4, 2);
-    }
-    gUnknown_203F3CC->unk_01C3_1 += gUnknown_203F3CC->unk_01C2_1;
-    if (gUnknown_203F3CC->unk_01C3_1 > 15)
-    {
-        if (gUnknown_203F3CC->unk_01C3_0)
-            ++gUnknown_203F3CC->unk_01C6;
-        else
-            --gUnknown_203F3CC->unk_01C6;
-        gUnknown_203F3CC->unk_01C2_0 = FALSE;
-        gUnknown_203F3CC->unk_01C3_1 = 0;
-    }
-}
diff --git a/src/mevent_client.c b/src/mevent_client.c
index 4da0b4bc1..d7eff1ec6 100644
--- a/src/mevent_client.c
+++ b/src/mevent_client.c
@@ -195,15 +195,16 @@ static u32 client_mainseq_4(struct mevent_client * svr)
         mevent_client_send_word(svr, 0x13, svr->param);
         break;
     case 10:
-        sub_8143F68(svr->recvBuffer);
+        OverwriteSavedWonderCardWithReceivedCard(svr->recvBuffer);
         break;
     case 9:
-        if (!sub_8143EF4(svr->recvBuffer))
+        if (!MEvent_HaveAlreadyReceivedWonderNews(svr->recvBuffer))
         {
-            sub_8143DC8(svr->recvBuffer);
+            OverwriteSavedWonderNewsWithReceivedNews(svr->recvBuffer);
             mevent_client_send_word(svr, 0x13, 0);
         }
         else
+            // Other trainer already has news
             mevent_client_send_word(svr, 0x13, 1);
         break;
     case 15:
@@ -211,7 +212,7 @@ static u32 client_mainseq_4(struct mevent_client * svr)
         svr->flag = 0;
         break;
     case 16:
-        sub_8144254(svr->recvBuffer);
+        MEvent_ReceiveDistributionMon(svr->recvBuffer);
         break;
     case 17:
         MEventSetRamScript(svr->recvBuffer, 1000);
diff --git a/src/mevent_server.c b/src/mevent_server.c
index bebd69fe3..3b1762540 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -176,7 +176,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
         case 9:
             AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 408);
             ptr = mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord);
-            svr->param = sub_8144434(ptr, svr->mevent_unk1442cc, ptr);
+            svr->param = MEvent_CanPlayerReceiveDistributionMon(ptr, svr->mevent_unk1442cc, ptr);
             break;
         case 10:
             AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 415);
@@ -247,7 +247,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
         case 26:
             AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 506);
             memcpy(svr->card, GetSavedWonderCard(), 332);
-            sub_814410C(svr->card);
+            MEvent_WonderCardResetUnk08_6(svr->card);
             break;
         case 27:
             AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 512);
diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c
new file mode 100644
index 000000000..3eeafa4b5
--- /dev/null
+++ b/src/mevent_show_card.c
@@ -0,0 +1,459 @@
+#include "global.h"
+#include "constants/species.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "palette.h"
+#include "decompress.h"
+#include "malloc.h"
+#include "menu.h"
+#include "new_menu_helpers.h"
+#include "pokemon_icon.h"
+#include "mystery_gift_menu.h"
+#include "menu_indicators.h"
+#include "string_util.h"
+#include "link_rfu.h"
+#include "mevent.h"
+#include "battle_anim.h"
+
+struct MEventScreenMgr_02DC
+{
+    u8 nDigits;
+    u8 nameTxt[41];
+    u8 numberTxt[4];
+};
+
+struct MEventScreenMgr
+{
+    /*0000*/ struct MEWonderCardData wonderCard;
+    /*014c*/ struct MEventBuffer_3430_Sub buff3430Sub;
+    /*0170*/ const struct UnkStruct_8467FB8 * bgSpec;
+    /*0174*/ u8 state;
+    /*0175*/ u8 recordIdx;
+    /*0176*/ u16 windowIds[3];
+    /*017C*/ u8 monIconId;
+    /*017D*/ u8 cardIconAndShadowSprites[7][2];
+    /*018B*/ u8 title[41];
+    /*01B4*/ u8 subtitle[41];
+    /*01DD*/ u8 unk_01DD[7];
+    /*01E4*/ u8 mainMessageLines[4][41];
+    /*0288*/ u8 instructionsLine1[41];
+    /*02B1*/ u8 instructionsLine2[41];
+    /*02DC*/ struct MEventScreenMgr_02DC recordStrings[8];
+    /*045C*/ u8 buffer_045C[0x1000];
+};
+
+static EWRAM_DATA struct MEventScreenMgr * sMEventScreenData = NULL;
+
+static void sub_8145A98(void);
+static void sub_8145D18(u8 whichWindow);
+static void sub_8146060(void);
+static void sub_81461D8(void);
+
+static const u8 gUnknown_8467068[][3] = {
+    {0, 2, 3},
+    {0, 1, 2}
+};
+
+static const u8 ALIGNED(4) sTextYCoords[3] = {7, 4, 7};
+
+static const struct WindowTemplate sWindowTemplates[] = {
+    {
+        .bg = 1,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 25,
+        .height = 4,
+        .paletteNum = 15, 
+        .baseBlock = 0x29c},
+    {
+        .bg = 1,
+        .tilemapLeft = 1,
+        .tilemapTop = 6,
+        .width = 28,
+        .height = 8,
+        .paletteNum = 15, 
+        .baseBlock = 0x1bc},
+    {
+        .bg = 1,
+        .tilemapLeft = 1,
+        .tilemapTop = 14,
+        .width = 28,
+        .height = 5,
+        .paletteNum = 15, 
+        .baseBlock = 0x130}
+};
+
+static const u16 gCard0Pal[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
+const u16 gCard1Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal");
+const u16 gCard2Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal");
+const u16 gCard3Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal");
+const u16 gCard4Pal[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal");
+const u16 gCard5Pal[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal");
+static const u16 gCard6Pal[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
+static const u16 gCard7Pal[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
+static const u8 sCard0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
+static const u8 sCard0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
+static const u8 sCard1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
+static const u8 sCard1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
+static const u8 sCard2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
+static const u8 sCard2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
+static const u8 sCard6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
+static const u8 sCard6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
+static const u8 sCard7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
+static const u8 sCard7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
+static const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
+static const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
+static const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
+static const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
+static const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
+static const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
+static const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
+static const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
+static const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");
+
+static const struct CompressedSpriteSheet sShadowSpriteSheet = {
+    gUnknown_8467EF4, 0x100, 0x8000
+};
+
+static const struct SpritePalette sShadowSpritePalettes[] = {
+    {gUnknown_8467DF4, 0x8000},
+    {gUnknown_8467E14, 0x8000},
+    {gUnknown_8467E34, 0x8000},
+    {gUnknown_8467E54, 0x8000},
+    {gUnknown_8467E74, 0x8000},
+    {gUnknown_8467E94, 0x8000},
+    {gUnknown_8467EB4, 0x8000},
+    {gUnknown_8467ED4, 0x8000}
+};
+
+static const struct SpriteTemplate sShadowSpriteTemplate = {
+    0x8000, 0x8000, &gOamData_AffineOff_ObjNormal_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+};
+
+static const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = {
+    {1, 0, 0, 0, sCard0Gfx, sCard0Map, gCard0Pal},
+    {1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal},
+    {1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal},
+    {1, 0, 0, 3, sCard2Gfx, sCard2Map, gCard3Pal},
+    {1, 0, 0, 4, sCard2Gfx, sCard2Map, gCard4Pal},
+    {1, 0, 0, 5, sCard2Gfx, sCard2Map, gCard5Pal},
+    {1, 0, 0, 6, sCard6Gfx, sCard6Map, gCard6Pal},
+    {1, 0, 0, 7, sCard7Gfx, sCard7Map, gCard7Pal}
+};
+
+bool32 InitWonderCardResources(struct MEWonderCardData * card, struct MEventBuffer_3430_Sub * b3430sub)
+{
+    if (card == NULL || b3430sub == NULL)
+        return FALSE;
+    sMEventScreenData = AllocZeroed(sizeof(struct MEventScreenMgr));
+    if (sMEventScreenData == NULL)
+        return FALSE;
+    sMEventScreenData->wonderCard = *card;
+    sMEventScreenData->buff3430Sub = *b3430sub;
+    if (sMEventScreenData->wonderCard.unk_08_2 >= NELEMS(sCardGfxPtrs))
+        sMEventScreenData->wonderCard.unk_08_2 = 0;
+    if (sMEventScreenData->wonderCard.unk_08_0 >= NELEMS(sTextYCoords))
+        sMEventScreenData->wonderCard.unk_08_0 = 0;
+    if (sMEventScreenData->wonderCard.recvMonCapacity > NELEMS(sMEventScreenData->cardIconAndShadowSprites))
+        sMEventScreenData->wonderCard.recvMonCapacity = 0;
+    sMEventScreenData->bgSpec = &sCardGfxPtrs[sMEventScreenData->wonderCard.unk_08_2];
+    return TRUE;
+}
+
+void DestroyWonderCardResources(void)
+{
+    if (sMEventScreenData != NULL)
+    {
+        *sMEventScreenData = (struct MEventScreenMgr){};
+        Free(sMEventScreenData);
+        sMEventScreenData = NULL;
+    }
+}
+
+s32 FadeToWonderCardMenu(void)
+{
+    if (sMEventScreenData == NULL)
+        return -1;
+    switch(sMEventScreenData->state)
+    {
+        case 0:
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+            break;
+        case 1:
+            if (UpdatePaletteFade())
+                return 0;
+            break;
+        case 2:
+            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
+            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
+            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
+            CopyBgTilemapBufferToVram(0);
+            CopyBgTilemapBufferToVram(1);
+            CopyBgTilemapBufferToVram(2);
+            DecompressAndCopyTileDataToVram(2, sMEventScreenData->bgSpec->tiles, 0, 0x008, 0);
+            sMEventScreenData->windowIds[0] = AddWindow(&sWindowTemplates[0]);
+            sMEventScreenData->windowIds[1] = AddWindow(&sWindowTemplates[1]);
+            sMEventScreenData->windowIds[2] = AddWindow(&sWindowTemplates[2]);
+            break;
+        case 3:
+            if (FreeTempTileDataBuffersIfPossible())
+                return 0;
+            gPaletteFade.bufferTransferDisabled = TRUE;
+            LoadPalette(sMEventScreenData->bgSpec->pal, 0x10, 0x20);
+            LZ77UnCompWram(sMEventScreenData->bgSpec->map, sMEventScreenData->buffer_045C);
+            CopyRectToBgTilemapBufferRect(2, sMEventScreenData->buffer_045C, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0);
+            CopyBgTilemapBufferToVram(2);
+            break;
+        case 4:
+            sub_8145A98();
+            break;
+        case 5:
+            sub_8145D18(0);
+            sub_8145D18(1);
+            sub_8145D18(2);
+            CopyBgTilemapBufferToVram(1);
+            break;
+        case 6:
+            LoadMonIconPalettes();
+            break;
+        case 7:
+            ShowBg(1);
+            ShowBg(2);
+            gPaletteFade.bufferTransferDisabled = FALSE;
+            sub_8146060();
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+            UpdatePaletteFade();
+            break;
+        default:
+            if (UpdatePaletteFade())
+                return 0;
+            sMEventScreenData->state = 0;
+            return 1;
+    }
+    ++sMEventScreenData->state;
+    return 0;
+}
+
+s32 FadeOutFromWonderCard(bool32 flag)
+{
+    if (sMEventScreenData == NULL)
+        return -1;
+    switch (sMEventScreenData->state)
+    {
+        case 0:
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+            break;
+        case 1:
+            if (UpdatePaletteFade())
+                return 0;
+            break;
+        case 2:
+            FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
+            FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
+            FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
+            CopyBgTilemapBufferToVram(0);
+            CopyBgTilemapBufferToVram(1);
+            CopyBgTilemapBufferToVram(2);
+            break;
+        case 3:
+            HideBg(1);
+            HideBg(2);
+            RemoveWindow(sMEventScreenData->windowIds[2]);
+            RemoveWindow(sMEventScreenData->windowIds[1]);
+            RemoveWindow(sMEventScreenData->windowIds[0]);
+            break;
+        case 4:
+            sub_81461D8();
+            FreeMonIconPalettes();
+            break;
+        case 5:
+            PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag);
+            break;
+        case 6:
+            CopyBgTilemapBufferToVram(0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+            break;
+        default:
+            if (UpdatePaletteFade())
+                return 0;
+            sMEventScreenData->state = 0;
+            return 1;
+    }
+    ++sMEventScreenData->state;
+    return 0;
+}
+
+static void sub_8145A98(void)
+{
+    u16 i = 0;
+    u16 r6;
+    u16 sp0[3] = {0, 0, 0};
+
+    memcpy(sMEventScreenData->title, sMEventScreenData->wonderCard.unk_0A, 40);
+    sMEventScreenData->title[40] = EOS;
+    memcpy(sMEventScreenData->subtitle, sMEventScreenData->wonderCard.unk_32, 40);
+    sMEventScreenData->subtitle[40] = EOS;
+    if (sMEventScreenData->wonderCard.unk_04 > 999999)
+        sMEventScreenData->wonderCard.unk_04 = 999999;
+    ConvertIntToDecimalStringN(sMEventScreenData->unk_01DD, sMEventScreenData->wonderCard.unk_04, STR_CONV_MODE_LEFT_ALIGN, 6);
+    for (i = 0; i < 4; i++)
+    {
+        memcpy(sMEventScreenData->mainMessageLines[i], sMEventScreenData->wonderCard.unk_5A[i], 40);
+        sMEventScreenData->mainMessageLines[i][40] = EOS;
+    }
+    memcpy(sMEventScreenData->instructionsLine1, sMEventScreenData->wonderCard.unk_FA, 40);
+    sMEventScreenData->instructionsLine1[40] = EOS;
+    switch (sMEventScreenData->wonderCard.unk_08_0)
+    {
+        case 0:
+            memcpy(sMEventScreenData->instructionsLine2, sMEventScreenData->wonderCard.unk_122, 40);
+            sMEventScreenData->instructionsLine2[40] = EOS;
+            break;
+        case 1:
+            sMEventScreenData->instructionsLine2[00] = EOS;
+            break;
+        case 2:
+            sMEventScreenData->instructionsLine2[00] = EOS;
+            sp0[0] = sMEventScreenData->buff3430Sub.linkWins < 999 ? sMEventScreenData->buff3430Sub.linkWins : 999;
+            sp0[1] = sMEventScreenData->buff3430Sub.linkLosses < 999 ? sMEventScreenData->buff3430Sub.linkLosses : 999;
+            sp0[2] = sMEventScreenData->buff3430Sub.linkTrades < 999 ? sMEventScreenData->buff3430Sub.linkTrades : 999;
+            for (i = 0; i < 8; i++)
+            {
+                memset(sMEventScreenData->recordStrings[i].numberTxt, EOS, 4);
+                memset(sMEventScreenData->recordStrings[i].nameTxt, EOS, 41);
+            }
+            for (i = 0, r6 = 0; i < 40; i++)
+            {
+                if (sMEventScreenData->wonderCard.unk_122[i] != CHAR_SPECIAL_F7)
+                {
+                    sMEventScreenData->recordStrings[sMEventScreenData->recordIdx].nameTxt[r6] = sMEventScreenData->wonderCard.unk_122[i];
+                    r6++;
+                }
+                else
+                {
+                    u8 r3 = sMEventScreenData->wonderCard.unk_122[i + 1];
+                    if (r3 > 2)
+                    {
+                        i += 2;
+                    }
+                    else
+                    {
+                        ConvertIntToDecimalStringN(sMEventScreenData->recordStrings[sMEventScreenData->recordIdx].numberTxt, sp0[r3], STR_CONV_MODE_LEADING_ZEROS, 3);
+                        sMEventScreenData->recordStrings[sMEventScreenData->recordIdx].nDigits = sMEventScreenData->wonderCard.unk_122[i + 2];
+                        sMEventScreenData->recordIdx++;
+                        if (sMEventScreenData->recordIdx > 7)
+                            break;
+                        r6 = 0;
+                        i += 2;
+                    }
+                }
+            }
+    }
+}
+
+static void sub_8145D18(u8 whichWindow)
+{
+    s8 sp0C = 0;
+    s32 windowId = sMEventScreenData->windowIds[whichWindow];
+    PutWindowTilemap(windowId);
+    FillWindowPixelBuffer(windowId, 0);
+    switch (whichWindow)
+    {
+        case 0:
+        {
+            s32 x;
+            AddTextPrinterParameterized3(windowId, 3, 0, 1, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->title);
+            x = 160 - GetStringWidth(3, sMEventScreenData->subtitle, GetFontAttribute(3, 2));
+            if (x < 0)
+                x = 0;
+            AddTextPrinterParameterized3(windowId, 3, x, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->subtitle);
+            if (sMEventScreenData->wonderCard.unk_04 != 0)
+            {
+                AddTextPrinterParameterized3(windowId, 2, 166, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->unk_01DD);
+            }
+            break;
+        }
+        case 1:
+            for (; sp0C < 4; sp0C++)
+            {
+                AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, gUnknown_8467068[sMEventScreenData->bgSpec->textPal2], 0, sMEventScreenData->mainMessageLines[sp0C]);
+            }
+            break;
+        case 2:
+            AddTextPrinterParameterized3(windowId, 3, 0, sTextYCoords[sMEventScreenData->wonderCard.unk_08_0], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine1);
+            if (sMEventScreenData->wonderCard.unk_08_0 != 2)
+            {
+                AddTextPrinterParameterized3(windowId, 3, 0, 16 + sTextYCoords[sMEventScreenData->wonderCard.unk_08_0], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine2);
+            }
+            else
+            {
+                s32 x = 0;
+                s32 y = sTextYCoords[sMEventScreenData->wonderCard.unk_08_0] + 16;
+                s32 spacing = GetFontAttribute(3, 2);
+                for (; sp0C < sMEventScreenData->recordIdx; sp0C++)
+                {
+                    AddTextPrinterParameterized3(windowId, 3, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].nameTxt);
+                    if (sMEventScreenData->recordStrings[sp0C].numberTxt[0] != EOS)
+                    {
+                        x += GetStringWidth(3, sMEventScreenData->recordStrings[sp0C].nameTxt, spacing);
+                        AddTextPrinterParameterized3(windowId, 2, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].numberTxt);
+                        x += GetStringWidth(3, sMEventScreenData->recordStrings[sp0C].numberTxt, spacing) + sMEventScreenData->recordStrings[sp0C].nDigits;
+                    }
+                }
+            }
+            break;
+    }
+    CopyWindowToVram(windowId, 3);
+}
+
+static void sub_8146060(void)
+{
+    u8 r7 = 0;
+    sMEventScreenData->monIconId = 0xFF;
+    if (sMEventScreenData->buff3430Sub.unk_06 != SPECIES_NONE)
+    {
+        sMEventScreenData->monIconId = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(sMEventScreenData->buff3430Sub.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
+        gSprites[sMEventScreenData->monIconId].oam.priority = 2;
+    }
+    if (sMEventScreenData->wonderCard.recvMonCapacity != 0 && sMEventScreenData->wonderCard.unk_08_0 == 1)
+    {
+        LoadCompressedSpriteSheetUsingHeap(&sShadowSpriteSheet);
+        LoadSpritePalette(&sShadowSpritePalettes[sMEventScreenData->bgSpec->index]);
+        for (; r7 < sMEventScreenData->wonderCard.recvMonCapacity; r7++)
+        {
+            sMEventScreenData->cardIconAndShadowSprites[r7][0] = 0xFF;
+            sMEventScreenData->cardIconAndShadowSprites[r7][1] = 0xFF;
+            sMEventScreenData->cardIconAndShadowSprites[r7][0] = CreateSprite(&sShadowSpriteTemplate, 0xd8 - 32 * r7, 0x90, 8);
+            if (sMEventScreenData->buff3430Sub.distributedMons[0][r7] != 0)
+            {
+                sMEventScreenData->cardIconAndShadowSprites[r7][1] = CreateMonIcon_HandleDeoxys(MailSpeciesToIconSpecies(sMEventScreenData->buff3430Sub.distributedMons[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
+                gSprites[sMEventScreenData->cardIconAndShadowSprites[r7][1]].oam.priority = 2;
+            }
+        }
+    }
+}
+
+static void sub_81461D8(void)
+{
+    u8 r6 = 0;
+    if (sMEventScreenData->monIconId != 0xFF)
+        DestroyMonIcon(&gSprites[sMEventScreenData->monIconId]);
+    if (sMEventScreenData->wonderCard.recvMonCapacity != 0 && sMEventScreenData->wonderCard.unk_08_0 == 1)
+    {
+        for (; r6 < sMEventScreenData->wonderCard.recvMonCapacity; r6++)
+        {
+            if (sMEventScreenData->cardIconAndShadowSprites[r6][0] != 0xFF)
+            {
+                DestroySprite(&gSprites[sMEventScreenData->cardIconAndShadowSprites[r6][0]]);
+                // This might be a typo.  Uncomment the next line, and comment the one that follows, to get the presumed intended behavior.
+                // if (sMEventScreenData->cardIconAndShadowSprites[r6][1] != 0xFF)
+                if (sMEventScreenData->cardIconAndShadowSprites[r6][0] != 0xFF)
+                {
+                    DestroyMonIcon(&gSprites[sMEventScreenData->cardIconAndShadowSprites[r6][1]]);
+                }
+            }
+        }
+        FreeSpriteTilesByTag(0x8000);
+        FreeSpritePaletteByTag(0x8000);
+    }
+}
diff --git a/src/mevent_show_news.c b/src/mevent_show_news.c
new file mode 100644
index 000000000..44b19b130
--- /dev/null
+++ b/src/mevent_show_news.c
@@ -0,0 +1,357 @@
+#include "global.h"
+#include "gflib.h"
+#include "menu_indicators.h"
+#include "new_menu_helpers.h"
+#include "mevent.h"
+#include "mystery_gift_menu.h"
+#include "menu.h"
+#include "link_rfu.h"
+
+struct UnkStruct_203F3CC
+{
+    /*0000*/ struct MEWonderNewsData wonderNews;
+    /*01bc*/ const struct UnkStruct_8467FB8 * bgSpec;
+    /*01c0*/ u8 verticalScrollDisabled:1;
+    u8 state:7;
+    /*01c1*/ u8 menuIndicatorsId;
+    /*01c2*/ u8 unk_01C2_0:1;
+    u8 unk_01C2_1:7;
+    /*01c3*/ u8 scrollDirection:1;
+    u8 unk_01C3_1:7;
+    /*01c4*/ u16 numMails;
+    /*01c6*/ u16 scrollOffset;
+    /*01c8*/ u16 windowIds[2];
+    /*01cc*/ u8 filler_01CC[2];
+    /*01ce*/ u8 title[41];
+    /*01f7*/ u8 messages[10][41];
+    /*0394*/ struct ScrollArrowsTemplate scrollArrowsTemplate;
+    /*03a4*/ u8 buffer_03A4[0x1000];
+};
+
+static EWRAM_DATA struct UnkStruct_203F3CC * sWork = NULL;
+
+static void sub_8146980(void);
+static void sub_8146A30(void);
+static void sub_8146B58(void);
+
+static const u8 sTextPals[][3] = {
+    {0, 2, 3},
+    {0, 1, 2}
+};
+static const struct WindowTemplate gUnknown_8468040[] = {
+    {0, 1, 0, 28,  3, 15, 0x000},
+    {2, 1, 3, 28, 20, 15, 0x000}
+};
+static const struct ScrollArrowsTemplate sScrollArrowsTemplate = {
+    0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98,
+    0x0000, 0x0002, 0x1000, 0x1000, 0x0,
+};
+
+static const u16 sNews1Pal[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
+static const u16 sNews6Pal[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
+static const u16 sNews7Pal[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
+static const u8 sNews0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
+static const u8 sNews0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
+static const u8 sNews1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
+static const u8 sNews1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
+static const u8 sNews2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
+static const u8 sNews2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
+static const u8 sNews6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
+static const u8 sNews6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
+static const u8 sNews7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
+static const u8 sNews7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");
+
+static const struct UnkStruct_8467FB8 sBgSpecs[] = {
+    {1, 0, 0, 0, sNews0Gfx, sNews0Map, sNews1Pal},
+    {1, 0, 0, 0, sNews1Gfx, sNews1Map, gCard1Pal},
+    {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard2Pal},
+    {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard3Pal},
+    {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard4Pal},
+    {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard5Pal},
+    {1, 0, 0, 0, sNews6Gfx, sNews6Map, sNews6Pal},
+    {1, 0, 0, 0, sNews7Gfx, sNews7Map, sNews7Pal}
+};
+
+bool32 InitWonderNewsResources(const struct MEWonderNewsData * news)
+{
+    if (news == NULL)
+        return FALSE;
+    sWork = AllocZeroed(sizeof(struct UnkStruct_203F3CC));
+    if (sWork == NULL)
+        return FALSE;
+    sWork->wonderNews = *news;
+    if (sWork->wonderNews.unk_03 >= NELEMS(sBgSpecs))
+        sWork->wonderNews.unk_03 = 0;
+    sWork->bgSpec = &sBgSpecs[sWork->wonderNews.unk_03];
+    sWork->menuIndicatorsId = 0xFF;
+    return TRUE;
+}
+
+void DestroyWonderNewsResources(void)
+{
+    if (sWork != NULL)
+    {
+        *sWork = (struct UnkStruct_203F3CC){};
+        Free(sWork);
+        sWork = NULL;
+    }
+}
+
+s32 FadeToWonderNewsMenu(void)
+{
+    if (sWork == NULL)
+        return -1;
+
+    switch (sWork->state)
+    {
+    case 0:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+        break;
+    case 1:
+        if (UpdatePaletteFade())
+            return 0;
+        ChangeBgY(0, 0, 0);
+        ChangeBgY(1, 0, 0);
+        ChangeBgY(2, 0, 0);
+        ChangeBgY(3, 0, 0);
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(26, 152));
+        SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ);
+        SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ);
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
+        break;
+    case 2:
+        FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
+        FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
+        FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
+        FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 20);
+        CopyBgTilemapBufferToVram(0);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(2);
+        CopyBgTilemapBufferToVram(3);
+        DecompressAndCopyTileDataToVram(3, sWork->bgSpec->tiles, 0, 8, 0);
+        sWork->windowIds[0] = AddWindow(&gUnknown_8468040[0]);
+        sWork->windowIds[1] = AddWindow(&gUnknown_8468040[1]);
+        break;
+    case 3:
+        if (FreeTempTileDataBuffersIfPossible())
+            return 0;
+        gPaletteFade.bufferTransferDisabled = TRUE;
+        LoadPalette(sWork->bgSpec->pal, 0x10, 0x20);
+        LZ77UnCompWram(sWork->bgSpec->map, sWork->buffer_03A4);
+        CopyRectToBgTilemapBufferRect(1, sWork->buffer_03A4, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0);
+        CopyRectToBgTilemapBufferRect(3, sWork->buffer_03A4, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(3);
+        break;
+    case 4:
+        sub_8146980();
+        break;
+    case 5:
+        sub_8146A30();
+        CopyBgTilemapBufferToVram(0);
+        CopyBgTilemapBufferToVram(2);
+        break;
+    case 6:
+        ShowBg(1);
+        ShowBg(2);
+        ShowBg(3);
+        gPaletteFade.bufferTransferDisabled = FALSE;
+        sWork->menuIndicatorsId = AddScrollIndicatorArrowPair(&sWork->scrollArrowsTemplate, &sWork->scrollOffset);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+        UpdatePaletteFade();
+        break;
+    default:
+        if (UpdatePaletteFade())
+            return 0;
+        sWork->state = 0;
+        return 1;
+    }
+
+    ++sWork->state;
+    return 0;
+}
+
+s32 FadeOutFromWonderNews(bool32 flag)
+{
+    if (sWork == NULL)
+        return -1;
+    switch (sWork->state)
+    {
+    case 0:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+        break;
+    case 1:
+        if (UpdatePaletteFade())
+            return 0;
+        ChangeBgY(2, 0, 0);
+        SetGpuReg(REG_OFFSET_WIN0H, 0);
+        SetGpuReg(REG_OFFSET_WIN0V, 0);
+        SetGpuReg(REG_OFFSET_WININ, 0);
+        SetGpuReg(REG_OFFSET_WINOUT, 0);
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
+        break;
+    case 2:
+        FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
+        FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
+        FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 24);
+        FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 24);
+        CopyBgTilemapBufferToVram(0);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(2);
+        CopyBgTilemapBufferToVram(3);
+        break;
+    case 3:
+        HideBg(1);
+        HideBg(2);
+        RemoveWindow(sWork->windowIds[1]);
+        RemoveWindow(sWork->windowIds[0]);
+        break;
+    case 4:
+        ChangeBgY(2, 0, 0);
+        ChangeBgY(3, 0, 0);
+        if (sWork->menuIndicatorsId != 0xFF)
+        {
+            RemoveScrollIndicatorArrowPair(sWork->menuIndicatorsId);
+            sWork->menuIndicatorsId = 0xFF;
+        }
+        break;
+    case 5:
+        PrintMysteryGiftOrEReaderTopMenu(gGiftIsFromEReader, flag);
+        break;
+    case 6:
+        MG_DrawCheckerboardPattern();
+        CopyBgTilemapBufferToVram(0);
+        CopyBgTilemapBufferToVram(3);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+        break;
+    default:
+        if (UpdatePaletteFade())
+            return 0;
+        sWork->state = 0;
+        return 1;
+    }
+    ++sWork->state;
+    return 0;
+}
+
+void MENews_RemoveScrollIndicatorArrowPair(void)
+{
+    if (!sWork->verticalScrollDisabled && sWork->menuIndicatorsId != 0xFF)
+    {
+        RemoveScrollIndicatorArrowPair(sWork->menuIndicatorsId);
+        sWork->menuIndicatorsId = 0xFF;
+        sWork->verticalScrollDisabled = TRUE;
+    }
+}
+
+
+void MENews_AddScrollIndicatorArrowPair(void)
+{
+    if (sWork->verticalScrollDisabled)
+    {
+        sWork->menuIndicatorsId = AddScrollIndicatorArrowPair(&sWork->scrollArrowsTemplate, &sWork->scrollOffset);
+        sWork->verticalScrollDisabled = FALSE;
+    }
+}
+
+u32 MENews_GetInput(u16 input)
+{
+    if (sWork->unk_01C2_0)
+    {
+        sub_8146B58();
+        return 0xFF;
+    }
+    switch (input)
+    {
+    case A_BUTTON:
+        return 0;
+    case B_BUTTON:
+        return 1;
+    case DPAD_UP:
+        if (sWork->scrollOffset == 0)
+            return 0xFF;
+        if (sWork->verticalScrollDisabled)
+            return 0xFF;
+        sWork->scrollDirection = FALSE;
+        break;
+    case DPAD_DOWN:
+        if (sWork->scrollOffset == sWork->numMails)
+            return 0xFF;
+        if (sWork->verticalScrollDisabled)
+            return 0xFF;
+        sWork->scrollDirection = TRUE;
+        break;
+    default:
+        return 0xFF;
+    }
+    sWork->unk_01C2_0 = TRUE;
+    sWork->unk_01C2_1 = 2;
+    sWork->unk_01C3_1 = 0;
+    if (sWork->scrollDirection == FALSE)
+        return 2;
+    else
+        return 3;
+}
+
+static void sub_8146980(void)
+{
+    u8 i = 0;
+    memcpy(sWork->title, sWork->wonderNews.unk_04, 40);
+    sWork->title[40] = EOS;
+    for (; i < 10; ++i)
+    {
+        memcpy(sWork->messages[i], sWork->wonderNews.unk_2C[i], 40);
+        sWork->messages[i][40] = EOS;
+        if (i > 7 && sWork->messages[i][0] != EOS)
+            ++sWork->numMails;
+    }
+    sWork->scrollArrowsTemplate = sScrollArrowsTemplate;
+    sWork->scrollArrowsTemplate.fullyDownThreshold = sWork->numMails;
+}
+
+static void sub_8146A30(void)
+{
+    u8 i = 0;
+    s32 x;
+    PutWindowTilemap(sWork->windowIds[0]);
+    PutWindowTilemap(sWork->windowIds[1]);
+    FillWindowPixelBuffer(sWork->windowIds[0], 0);
+    FillWindowPixelBuffer(sWork->windowIds[1], 0);
+    x = (0xe0 - GetStringWidth(3, sWork->title, GetFontAttribute(3, 2))) / 2;
+    if (x < 0)
+        x = 0;
+    AddTextPrinterParameterized3(sWork->windowIds[0], 3, x, 6, sTextPals[sWork->bgSpec->textPal1], 0, sWork->title);
+    for (; i < 10; ++i)
+    {
+        AddTextPrinterParameterized3(sWork->windowIds[1], 3, 0, 16 * i + 2, sTextPals[sWork->bgSpec->textPal2], 0, sWork->messages[i]);
+    }
+    CopyWindowToVram(sWork->windowIds[0], 3);
+    CopyWindowToVram(sWork->windowIds[1], 3);
+}
+
+static void sub_8146B58(void)
+{
+    u16 r4 = sWork->unk_01C2_1;
+    r4 <<= 8;
+    if (sWork->scrollDirection)
+    {
+        ChangeBgY(2, r4, 1);
+        ChangeBgY(3, r4, 1);
+    }
+    else
+    {
+        ChangeBgY(2, r4, 2);
+        ChangeBgY(3, r4, 2);
+    }
+    sWork->unk_01C3_1 += sWork->unk_01C2_1;
+    if (sWork->unk_01C3_1 > 15)
+    {
+        if (sWork->scrollDirection)
+            ++sWork->scrollOffset;
+        else
+            --sWork->scrollOffset;
+        sWork->unk_01C2_0 = FALSE;
+        sWork->unk_01C3_1 = 0;
+    }
+}
diff --git a/src/unk_815F138.c b/src/minigame_countdown.c
index 8aa776bc9..d100caea1 100644
--- a/src/unk_815F138.c
+++ b/src/minigame_countdown.c
@@ -5,72 +5,83 @@
 #include "trig.h"
 #include "constants/songs.h"
 
-void sub_815F1AC(u8 taskId);
-bool32 sub_815F2AC(u8 spriteId);
-void sub_815F3E0(u8 spriteId1, u8 spriteId2, u8 spriteId3);
-bool32 sub_815F444(u8 spriteId);
-void sub_815F470(struct Sprite * sprite);
-void sub_815F564(u16 tilesTag, u16 palTag);
-u8 sub_815F5BC(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority);
-void sub_815F610(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 * spriteId2_p, s16 * spriteId3_p);
+static void Task_MinigameCountdown(u8 taskId);
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId);
+static void StartStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3);
+static bool32 IsStartGraphicAnimRunning(u8 spriteId);
+static void SpriteCB_Start(struct Sprite * sprite);
+static void Load321StartGfx(u16 tilesTag, u16 palTag);
+static u8 CreateNumberSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority);
+static void CreateStartSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 * spriteId2_p, s16 * spriteId3_p);
 
-void sub_815F138(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority)
+#define tState       data[0]
+#define tTilesTag    data[2]
+#define tPalTag      data[3]
+#define tX           data[4]
+#define tY           data[5]
+#define tSubpriority data[6]
+#define tSpriteId1   data[7]
+#define tSpriteId2   data[8]
+#define tSpriteId3   data[9]
+
+void StartMinigameCountdown(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority)
 {
-    u8 taskId = CreateTask(sub_815F1AC, 80);
-    gTasks[taskId].data[2] = tilesTag;
-    gTasks[taskId].data[3] = palTag;
-    gTasks[taskId].data[4] = x;
-    gTasks[taskId].data[5] = y;
-    gTasks[taskId].data[6] = subpriority;
+    u8 taskId = CreateTask(Task_MinigameCountdown, 80);
+    gTasks[taskId].tTilesTag = tilesTag;
+    gTasks[taskId].tPalTag = palTag;
+    gTasks[taskId].tX = x;
+    gTasks[taskId].tY = y;
+    gTasks[taskId].tSubpriority = subpriority;
 }
 
-bool8 sub_815F198(void)
+bool8 IsMinigameCountdownRunning(void)
 {
-    return FuncIsActiveTask(sub_815F1AC);
+    return FuncIsActiveTask(Task_MinigameCountdown);
 }
 
-void sub_815F1AC(u8 taskId)
+static void Task_MinigameCountdown(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
 
-    switch (data[0])
+    switch (tState)
     {
     case 0:
-        sub_815F564(data[2], data[3]);
-        data[7] = sub_815F5BC(data[2], data[3], data[4], data[5], data[6]);
-        sub_815F610(data[2], data[3], data[4], data[5], data[6], &data[8], &data[9]);
-        data[0]++;
+        Load321StartGfx(tTilesTag, tPalTag);
+        tSpriteId1 = CreateNumberSprite(tTilesTag, tPalTag, tX, tY, tSubpriority);
+        CreateStartSprite(tTilesTag, tPalTag, tX, tY, tSubpriority, &tSpriteId2, &tSpriteId3);
+        tState++;
         break;
     case 1:
-        if (!sub_815F2AC(data[7]))
+        if (!RunMinigameCountdownDigitsAnim(tSpriteId1))
         {
-            sub_815F3E0(data[7], data[8], data[9]);
-            FreeSpriteOamMatrix(&gSprites[data[7]]);
-            DestroySprite(&gSprites[data[7]]);
-            data[0]++;
+            StartStartGraphic(tSpriteId1, tSpriteId2, tSpriteId3);
+            FreeSpriteOamMatrix(&gSprites[tSpriteId1]);
+            DestroySprite(&gSprites[tSpriteId1]);
+            tState++;
         }
         break;
     case 2:
-        if (!sub_815F444(data[8]))
+        if (!IsStartGraphicAnimRunning(tSpriteId2))
         {
-            DestroySprite(&gSprites[data[8]]);
-            DestroySprite(&gSprites[data[9]]);
-            FreeSpriteTilesByTag(data[2]);
-            FreeSpritePaletteByTag(data[3]);
+            DestroySprite(&gSprites[tSpriteId2]);
+            DestroySprite(&gSprites[tSpriteId3]);
+            FreeSpriteTilesByTag(tTilesTag);
+            FreeSpritePaletteByTag(tPalTag);
             DestroyTask(taskId);
         }
         break;
     }
 }
 
-bool32 sub_815F2AC(u8 spriteId)
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
 {
     struct Sprite * sprite = &gSprites[spriteId];
 
     switch (sprite->data[0])
     {
     case 0:
-        sub_8007FFC(sprite, 0x800, 0x1A);
+        // some sort of affine transform; x transform disabled
+        obj_pos2_update_enable(sprite, 0x800, 0x1A);
         sprite->data[0]++;
         // fallthrough
     case 1:
@@ -134,22 +145,22 @@ bool32 sub_815F2AC(u8 spriteId)
     return TRUE;
 }
 
-void sub_815F3E0(u8 spriteId1, u8 spriteId2, u8 spriteId3)
+static void StartStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3)
 {
     gSprites[spriteId2].pos2.y = -40;
     gSprites[spriteId3].pos2.y = -40;
     gSprites[spriteId2].invisible = FALSE;
     gSprites[spriteId3].invisible = FALSE;
-    gSprites[spriteId2].callback = sub_815F470;
-    gSprites[spriteId3].callback = sub_815F470;
+    gSprites[spriteId2].callback = SpriteCB_Start;
+    gSprites[spriteId3].callback = SpriteCB_Start;
 }
 
-bool32 sub_815F444(u8 spriteId)
+static bool32 IsStartGraphicAnimRunning(u8 spriteId)
 {
-    return gSprites[spriteId].callback == sub_815F470;
+    return gSprites[spriteId].callback == SpriteCB_Start;
 }
 
-void sub_815F470(struct Sprite * sprite)
+static void SpriteCB_Start(struct Sprite * sprite)
 {
     s16 * data = sprite->data;
     s32 y;
@@ -200,103 +211,103 @@ void sub_815F470(struct Sprite * sprite)
     }
 }
 
-const u16 gUnknown_847A328[] = INCBIN_U16("data/graphics/unk_847a348.gbapal");
-const u16 gUnknown_847A348[] = INCBIN_U16("data/graphics/unk_847a348.4bpp.lz");
+static const u16 sSpritePal_321Start[] = INCBIN_U16("data/graphics/unk_847a348.gbapal");
+static const u16 sSpriteSheet_321Start[] = INCBIN_U16("data/graphics/unk_847a348.4bpp.lz");
 
-void sub_815F564(u16 tilesTag, u16 palTag)
+static void Load321StartGfx(u16 tilesTag, u16 palTag)
 {
-    struct CompressedSpriteSheet spriteSheet = {(const void *)gUnknown_847A348, 0xE00};
-    struct SpritePalette spritePalette = {gUnknown_847A328};
+    struct CompressedSpriteSheet spriteSheet = {(const void *)sSpriteSheet_321Start, 0xE00};
+    struct SpritePalette spritePalette = {sSpritePal_321Start};
     spriteSheet.tag = tilesTag;
     spritePalette.tag = palTag;
     LoadCompressedSpriteSheet(&spriteSheet);
     LoadSpritePalette(&spritePalette);
 }
 
-const struct OamData gOamData_847A7AC = {
+static const struct OamData sOamData_Numbers = {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .shape = ST_OAM_SQUARE,
-    .size = 2
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32)
 };
 
-const struct OamData gOamData_847A7B4 = {
+static const struct OamData sOamData_Start = {
     .affineMode = ST_OAM_AFFINE_OFF,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32)
 };
 
-const union AnimCmd gUnknown_847A7BC[] = {
+static const union AnimCmd sAnim_Numbers_Three[] = {
     ANIMCMD_FRAME( 0, 1),
 	ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_847A7C4[] = {
+static const union AnimCmd sAnim_Numbers_Two[] = {
     ANIMCMD_FRAME(16, 1),
 	ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_847A7CC[] = {
+static const union AnimCmd sAnim_Numbers_One[] = {
     ANIMCMD_FRAME(32, 1),
 	ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_847A7D4[] = {
-    gUnknown_847A7BC,
-    gUnknown_847A7C4,
-    gUnknown_847A7CC
+static const union AnimCmd *const sAnimTable_Numbers[] = {
+    sAnim_Numbers_Three,
+    sAnim_Numbers_Two,
+    sAnim_Numbers_One
 };
 
-const union AnimCmd gUnknown_847A7E0[] = {
+static const union AnimCmd sAnim_StartLeft[] = {
     ANIMCMD_FRAME(48, 1),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_847A7E8[] = {
+static const union AnimCmd sAnim_StartRight[] = {
     ANIMCMD_FRAME(80, 1),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_847A7F0[] = {
-    gUnknown_847A7E0,
-    gUnknown_847A7E8
+static const union AnimCmd *const sAnimTable_Start[] = {
+    sAnim_StartLeft,
+    sAnim_StartRight
 };
 
-const union AffineAnimCmd gUnknown_847A7F8[] = {
+static const union AffineAnimCmd sAffineAnim_Numbers_0[] = {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
 	AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_847A808[] = {
+static const union AffineAnimCmd sAffineAnim_Numbers_1[] = {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
 	AFFINEANIMCMD_FRAME( 0x10, -0x10, 0, 8),
 	AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_847A820[] = {
+static const union AffineAnimCmd sAffineAnim_Numbers_2[] = {
     AFFINEANIMCMD_FRAME(-0x12,  0x12, 0, 8),
 	AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_847A830[] = {
+static const union AffineAnimCmd sAffineAnim_Numbers_3[] = {
     AFFINEANIMCMD_FRAME(  0x6,  -0x6, 0, 8),
 	AFFINEANIMCMD_FRAME( -0x4,   0x4, 0, 8),
 	AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
 	AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const gUnknown_847A850[] = {
-    gUnknown_847A7F8,
-    gUnknown_847A808,
-    gUnknown_847A820,
-    gUnknown_847A830
+static const union AffineAnimCmd *const sAffineAnimTable_Numbers[] = {
+    sAffineAnim_Numbers_0,
+    sAffineAnim_Numbers_1,
+    sAffineAnim_Numbers_2,
+    sAffineAnim_Numbers_3
 };
 
-u8 sub_815F5BC(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority)
+static u8 CreateNumberSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority)
 {
     struct SpriteTemplate spriteTemplate = {
-        .oam = &gOamData_847A7AC,
-        .anims = gUnknown_847A7D4,
-        .affineAnims = gUnknown_847A850,
+        .oam = &sOamData_Numbers,
+        .anims = sAnimTable_Numbers,
+        .affineAnims = sAffineAnimTable_Numbers,
         .callback = SpriteCallbackDummy
     };
     spriteTemplate.tileTag = tilesTag;
@@ -304,11 +315,11 @@ u8 sub_815F5BC(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority)
     return CreateSprite(&spriteTemplate, x, y, subpriority);
 }
 
-void sub_815F610(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 * spriteId2_p, s16 * spriteId3_p)
+static void CreateStartSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 * spriteId2_p, s16 * spriteId3_p)
 {
     struct SpriteTemplate spriteTemplate = {
-        .oam = &gOamData_847A7B4,
-        .anims = gUnknown_847A7F0,
+        .oam = &sOamData_Start,
+        .anims = sAnimTable_Start,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy
     };
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index 8384d211d..cdfd62624 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -25,6 +25,7 @@
 #include "help_system.h"
 #include "strings.h"
 #include "constants/songs.h"
+#include "constants/union_room.h"
 
 EWRAM_DATA u8 sDownArrowCounterAndYCoordIdx[8] = {};
 EWRAM_DATA bool8 gGiftIsFromEReader = FALSE;
@@ -1237,21 +1238,21 @@ void task00_mystery_gift(u8 taskId)
         case 0:
             if (data->source == 1)
             {
-                MEvent_CreateTask_CardOrNewsWithFriend(0x15);
+                MEvent_CreateTask_CardOrNewsWithFriend(ACTIVITY_WCARD2);
             }
             else if (data->source == 0)
             {
-                MEvent_CreateTask_CardOrNewsOverWireless(0x15);
+                MEvent_CreateTask_CardOrNewsOverWireless(ACTIVITY_WCARD2);
             }
             break;
         case 1:
             if (data->source == 1)
             {
-                MEvent_CreateTask_CardOrNewsWithFriend(0x16);
+                MEvent_CreateTask_CardOrNewsWithFriend(ACTIVITY_WNEWS2);
             }
             else if (data->source == 0)
             {
-                MEvent_CreateTask_CardOrNewsOverWireless(0x16);
+                MEvent_CreateTask_CardOrNewsOverWireless(ACTIVITY_WNEWS2);
             }
             break;
         }
@@ -1278,7 +1279,7 @@ void task00_mystery_gift(u8 taskId)
         switch (mevent_client_do_exec(&data->curPromptWindowId))
         {
         case 6: // done
-            task_add_05_task_del_08FA224_when_no_RfuFunc();
+            Rfu_BeginBuildAndSendCommand5F();
             data->prevPromptWindowId = data->curPromptWindowId;
             data->state = 13;
             break;
@@ -1595,10 +1596,10 @@ void task00_mystery_gift(u8 taskId)
             switch (data->IsCardOrNews)
             {
             case 0:
-                MEvent_CreateTask_Leader(21);
+                MEvent_CreateTask_Leader(ACTIVITY_WCARD2);
                 break;
             case 1:
-                MEvent_CreateTask_Leader(22);
+                MEvent_CreateTask_Leader(ACTIVITY_WNEWS2);
                 break;
             }
             data->source = 1;
@@ -1644,7 +1645,7 @@ void task00_mystery_gift(u8 taskId)
         }
         break;
     case 33:
-        task_add_05_task_del_08FA224_when_no_RfuFunc();
+        Rfu_BeginBuildAndSendCommand5F();
         StringCopy(gStringVar1, gLinkPlayers[1].name);
         data->state = 34;
         break;
diff --git a/src/new_game.c b/src/new_game.c
index 05fb9c83e..9aea0b3aa 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -145,7 +145,7 @@ void NewGameInitData(void)
     ResetTrainerFanClub();
     UnionRoomChat_InitializeRegisteredTexts();
     ResetMiniGamesResults();
-    sub_8143D24();
+    InitMEventData();
     SetAllRenewableItemFlags();
     WarpToPlayersRoom();
     ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
diff --git a/src/party_menu.c b/src/party_menu.c
index df0e70b37..600350ca9 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3881,7 +3881,7 @@ static void CursorCB_Register(u8 taskId)
     u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
     u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
 
-    switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)sub_80F9800(), species2, species, obedience))
+    switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, obedience))
     {
     case CANT_REGISTER_MON:
         StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow);
@@ -3907,7 +3907,7 @@ static void CursorCB_Trade1(u8 taskId)
     u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
     u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
     u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
-    u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)sub_80F9800(), gUnknown_203B064, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience);
+    u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience);
 
     if (stringId != UR_TRADE_MSG_NONE)
     {
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c
index 2ccec7a3f..cd201a884 100644
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c
@@ -562,8 +562,8 @@ void sub_8102F80(u8 taskId)
     switch (gUnknown_203ACF0->field_01)
     {
     case 0:
-        sub_8107D38(0x10, 0);
-        sub_8107D38(0x20, 1);
+        ListMenuLoadStdPalAt(0x10, 0);
+        ListMenuLoadStdPalAt(0x20, 1);
         gUnknown_203ACF0->field_48 = sub_8103518(gUnknown_203ACF0->field_42);
         gUnknown_203ACF0->field_01 = 2;
         break;
@@ -648,8 +648,8 @@ void sub_8103238(u8 taskId)
     switch (gUnknown_203ACF0->field_01)
     {
     case 0:
-        sub_8107D38(0x10, 0);
-        sub_8107D38(0x20, 1);
+        ListMenuLoadStdPalAt(0x10, 0);
+        ListMenuLoadStdPalAt(0x20, 1);
         gUnknown_203ACF0->field_48 = sub_8103518(gUnknown_203ACF0->field_42);
         gUnknown_203ACF0->field_01 = 2;
         break;
diff --git a/src/pokemon.c b/src/pokemon.c
index 09e2ed998..f1f7834b1 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -90,7 +90,20 @@ static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
 
 #include "data/battle_moves.h"
 
-static const u8 sUnreferencedData[] = { 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 };
+// Used in an unreferenced function in RS.
+// Unreferenced here and in Emerald.
+struct CombinedMove
+{
+    u16 move1;
+    u16 move2;
+    u16 newMove;
+};
+
+static const struct CombinedMove sCombinedMoves[2] =
+{
+    {MOVE_EMBER, MOVE_GUST, MOVE_HEAT_WAVE},
+    {0xFFFF, 0xFFFF, 0xFFFF}
+};
 
 static const u16 sSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex)
 {
diff --git a/src/quest_log.c b/src/quest_log.c
index a02aea302..2ae5e9cfe 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -2602,18 +2602,18 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
 static bool8 InQuestLogDisabledLocation(void)
 {
     // In Trainer Tower
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F)
-        && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F)
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F)
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) 
-         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR)))
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)
+        && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_1F)
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_2F)
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_3F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_4F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_5F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_6F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_7F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_8F) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ROOF) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY) 
+         || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR)))
         return TRUE;
 
     // In pokemon trainer fan club
@@ -2629,7 +2629,7 @@ static bool8 InQuestLogDisabledLocation(void)
     // In elevator
     if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROCKET_HIDEOUT_ELEVATOR)) 
      || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SILPH_CO_ELEVATOR)) 
-     || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR)) 
+     || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR)) 
      || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR)))
         return TRUE;
 
diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c
index 7917d03e9..aecc5fd68 100644
--- a/src/quest_log_objects.c
+++ b/src/quest_log_objects.c
@@ -14,22 +14,22 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
     for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
         questLog->unk_008[i].active = gObjectEvents[i].active;
-        questLog->unk_008[i].mapobj_bit_3 = gObjectEvents[i].mapobj_bit_3;
-        questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].mapobj_bit_4;
-        questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].mapobj_bit_5;
-        questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].mapobj_bit_8;
-        questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].mapobj_bit_9;
-        questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].mapobj_bit_10;
-        questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].mapobj_bit_11;
-        questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].mapobj_bit_12;
-        questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].mapobj_bit_13;
-        questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].mapobj_bit_14;
-        questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].mapobj_bit_15;
-        questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].mapobj_bit_16;
-        questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].mapobj_bit_23;
-        questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].mapobj_bit_24;
-        questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].mapobj_bit_25;
-        questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].mapobj_bit_26;
+        questLog->unk_008[i].triggerGroundEffectsOnStop = gObjectEvents[i].triggerGroundEffectsOnStop;
+        questLog->unk_008[i].disableCoveringGroundEffects = gObjectEvents[i].disableCoveringGroundEffects;
+        questLog->unk_008[i].landingJump = gObjectEvents[i].landingJump;
+        questLog->unk_008[i].frozen = gObjectEvents[i].frozen;
+        questLog->unk_008[i].facingDirectionLocked = gObjectEvents[i].facingDirectionLocked;
+        questLog->unk_008[i].disableAnim = gObjectEvents[i].disableAnim;
+        questLog->unk_008[i].enableAnim = gObjectEvents[i].enableAnim;
+        questLog->unk_008[i].inanimate = gObjectEvents[i].inanimate;
+        questLog->unk_008[i].invisible = gObjectEvents[i].invisible;
+        questLog->unk_008[i].offScreen = gObjectEvents[i].offScreen;
+        questLog->unk_008[i].trackedByCamera = gObjectEvents[i].trackedByCamera;
+        questLog->unk_008[i].isPlayer = gObjectEvents[i].isPlayer;
+        questLog->unk_008[i].spriteAnimPausedBackup = gObjectEvents[i].spriteAnimPausedBackup;
+        questLog->unk_008[i].spriteAffineAnimPausedBackup = gObjectEvents[i].spriteAffineAnimPausedBackup;
+        questLog->unk_008[i].disableJumpLandingGroundEffect = gObjectEvents[i].disableJumpLandingGroundEffect;
+        questLog->unk_008[i].fixedPriority = gObjectEvents[i].fixedPriority;
         questLog->unk_008[i].mapobj_unk_18 = gObjectEvents[i].facingDirection;
         questLog->unk_008[i].mapobj_unk_0B_0 = gObjectEvents[i].mapobj_unk_0B_0;
         questLog->unk_008[i].elevation = gObjectEvents[i].elevation;
@@ -58,22 +58,22 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
     for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
         gObjectEvents[i].active = questLogObjectEvents[i].active;
-        gObjectEvents[i].mapobj_bit_3 = questLogObjectEvents[i].mapobj_bit_3;
-        gObjectEvents[i].mapobj_bit_4 = questLogObjectEvents[i].mapobj_bit_4;
-        gObjectEvents[i].mapobj_bit_5 = questLogObjectEvents[i].mapobj_bit_5;
-        gObjectEvents[i].mapobj_bit_8 = questLogObjectEvents[i].mapobj_bit_8;
-        gObjectEvents[i].mapobj_bit_9 = questLogObjectEvents[i].mapobj_bit_9;
-        gObjectEvents[i].mapobj_bit_10 = questLogObjectEvents[i].mapobj_bit_10;
-        gObjectEvents[i].mapobj_bit_11 = questLogObjectEvents[i].mapobj_bit_11;
-        gObjectEvents[i].mapobj_bit_12 = questLogObjectEvents[i].mapobj_bit_12;
-        gObjectEvents[i].mapobj_bit_13 = questLogObjectEvents[i].mapobj_bit_13;
-        gObjectEvents[i].mapobj_bit_14 = questLogObjectEvents[i].mapobj_bit_14;
-        gObjectEvents[i].mapobj_bit_15 = questLogObjectEvents[i].mapobj_bit_15;
-        gObjectEvents[i].mapobj_bit_16 = questLogObjectEvents[i].mapobj_bit_16;
-        gObjectEvents[i].mapobj_bit_23 = questLogObjectEvents[i].mapobj_bit_23;
-        gObjectEvents[i].mapobj_bit_24 = questLogObjectEvents[i].mapobj_bit_24;
-        gObjectEvents[i].mapobj_bit_25 = questLogObjectEvents[i].mapobj_bit_25;
-        gObjectEvents[i].mapobj_bit_26 = questLogObjectEvents[i].mapobj_bit_26;
+        gObjectEvents[i].triggerGroundEffectsOnStop = questLogObjectEvents[i].triggerGroundEffectsOnStop;
+        gObjectEvents[i].disableCoveringGroundEffects = questLogObjectEvents[i].disableCoveringGroundEffects;
+        gObjectEvents[i].landingJump = questLogObjectEvents[i].landingJump;
+        gObjectEvents[i].frozen = questLogObjectEvents[i].frozen;
+        gObjectEvents[i].facingDirectionLocked = questLogObjectEvents[i].facingDirectionLocked;
+        gObjectEvents[i].disableAnim = questLogObjectEvents[i].disableAnim;
+        gObjectEvents[i].enableAnim = questLogObjectEvents[i].enableAnim;
+        gObjectEvents[i].inanimate = questLogObjectEvents[i].inanimate;
+        gObjectEvents[i].invisible = questLogObjectEvents[i].invisible;
+        gObjectEvents[i].offScreen = questLogObjectEvents[i].offScreen;
+        gObjectEvents[i].trackedByCamera = questLogObjectEvents[i].trackedByCamera;
+        gObjectEvents[i].isPlayer = questLogObjectEvents[i].isPlayer;
+        gObjectEvents[i].spriteAnimPausedBackup = questLogObjectEvents[i].spriteAnimPausedBackup;
+        gObjectEvents[i].spriteAffineAnimPausedBackup = questLogObjectEvents[i].spriteAffineAnimPausedBackup;
+        gObjectEvents[i].disableJumpLandingGroundEffect = questLogObjectEvents[i].disableJumpLandingGroundEffect;
+        gObjectEvents[i].fixedPriority = questLogObjectEvents[i].fixedPriority;
         gObjectEvents[i].facingDirection = questLogObjectEvents[i].mapobj_unk_18;
         gObjectEvents[i].mapobj_unk_0B_0 = questLogObjectEvents[i].mapobj_unk_0B_0;
         gObjectEvents[i].elevation = questLogObjectEvents[i].elevation;
diff --git a/src/quest_log_player.c b/src/quest_log_player.c
index 7665a8a92..0d7a2bb50 100644
--- a/src/quest_log_player.c
+++ b/src/quest_log_player.c
@@ -100,7 +100,7 @@ static void sub_81505C4(u8 taskId)
     {
         case 0:
             ObjectEventClearAnimIfSpecialAnimActive(objectEvent);
-            objectEvent->mapobj_bit_11 = TRUE;
+            objectEvent->enableAnim = TRUE;
             sub_81507BC(objectEvent, sub_805C808(4));
             StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
             gTasks[taskId].data[0]++;
diff --git a/src/region_map.c b/src/region_map.c
index d526f9aaa..4335b7d96 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1269,10 +1269,10 @@ static const u8 sMapsecToSpawn[][3] = {
     [MAPSEC_CAPE_BRINK         - MAPSECS_KANTO] = {MAP_GROUP(TWO_ISLAND_CAPE_BRINK), MAP_NUM(TWO_ISLAND_CAPE_BRINK), 0},
     [MAPSEC_BOND_BRIDGE        - MAPSECS_KANTO] = {MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), MAP_NUM(THREE_ISLAND_BOND_BRIDGE), 0},
     [MAPSEC_THREE_ISLE_PORT    - MAPSECS_KANTO] = {MAP_GROUP(THREE_ISLAND_PORT), MAP_NUM(THREE_ISLAND_PORT), 0},
-    [MAPSEC_SEVII_ISLE_6       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_50), MAP_NUM(UNKNOWN_MAP_03_50), 0},
-    [MAPSEC_SEVII_ISLE_7       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_51), MAP_NUM(UNKNOWN_MAP_03_51), 0},
-    [MAPSEC_SEVII_ISLE_8       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_52), MAP_NUM(UNKNOWN_MAP_03_52), 0},
-    [MAPSEC_SEVII_ISLE_9       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_53), MAP_NUM(UNKNOWN_MAP_03_53), 0},
+    [MAPSEC_SEVII_ISLE_6       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_6), MAP_NUM(PROTOTYPE_SEVII_ISLE_6), 0},
+    [MAPSEC_SEVII_ISLE_7       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_7), MAP_NUM(PROTOTYPE_SEVII_ISLE_7), 0},
+    [MAPSEC_SEVII_ISLE_8       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_8), MAP_NUM(PROTOTYPE_SEVII_ISLE_8), 0},
+    [MAPSEC_SEVII_ISLE_9       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_9), MAP_NUM(PROTOTYPE_SEVII_ISLE_9), 0},
     [MAPSEC_RESORT_GORGEOUS    - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), 0},
     [MAPSEC_WATER_LABYRINTH    - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_WATER_LABYRINTH), MAP_NUM(FIVE_ISLAND_WATER_LABYRINTH), 0},
     [MAPSEC_FIVE_ISLE_MEADOW   - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_MEADOW), MAP_NUM(FIVE_ISLAND_MEADOW), 0},
@@ -3420,7 +3420,7 @@ static u8 sub_80C3878(u8 mapsec)
     case MAPSEC_ROCKET_WAREHOUSE:
         return FlagGet(FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE) ? 2 : 3;
     case MAPSEC_TRAINER_TOWER_2:
-        return FlagGet(FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY) ? 2 : 3;
+        return FlagGet(FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY) ? 2 : 3;
     case MAPSEC_DOTTED_HOLE:
         return FlagGet(FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F) ? 2 : 3;
     case MAPSEC_LOST_CAVE:
diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c
index cbaa780e6..c0406fe94 100644
--- a/src/renewable_hidden_items.c
+++ b/src/renewable_hidden_items.c
@@ -529,12 +529,6 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
     },
 };
 
-bool32 sub_815D834(void)
-{
-    // Stubbed out?
-    return FALSE;
-}
-
 void SetAllRenewableItemFlags(void)
 {
     u8 i, j;
diff --git a/src/rfu_union_tool.c b/src/rfu_union_tool.c
index 20b29de9b..1d33fb7d1 100644
--- a/src/rfu_union_tool.c
+++ b/src/rfu_union_tool.c
@@ -10,14 +10,15 @@
 #include "task.h"
 #include "constants/flags.h"
 #include "constants/event_object_movement.h"
+#include "constants/union_room.h"
 #include "constants/object_events.h"
 
 static EWRAM_DATA struct UnionObj * UnionObjWork = NULL;
 static EWRAM_DATA u32 sUnionObjRefreshTimer = 0;
 
 static u8 StartUnionObjAnimTask(void);
-static u32 sub_811BBC8(u32 playerIdx, u32 arg1);
-static void sub_811C008(s32 arg0, s32 arg1, u8 arg2);
+static u32 RfuUnionGroupMemberIsInvisible(u32 group, u32 member);
+static void UnionPartnerObjectSetFacing(s32 member, s32 group, u8 direction);
 
 static const u8 sUnionObjectEventGfxIds[][10] = {
     [MALE]   = {
@@ -69,12 +70,12 @@ static const u8 sOppositeFacingDirection[] = {
     [DIR_EAST]  = DIR_WEST
 };
 
-static const u8 gUnknown_845711B[] = {
-    1,
-    3,
-    1,
-    4, 
-    2
+static const u8 sUnionGroupMemberFacings[] = {
+    DIR_SOUTH,
+    DIR_WEST,
+    DIR_SOUTH,
+    DIR_EAST,
+    DIR_NORTH
 };
 
 static const u8 sUnionRoomLocalIds[] = {
@@ -116,19 +117,19 @@ static u8 GetUnionRoomPlayerGraphicsId(u32 gender, u32 id)
     return sUnionObjectEventGfxIds[gender][id % 8];
 }
 
-static void GetUnionRoomPlayerFacingCoords(u32 id, u32 dirn, s32 * xp, s32 * yp)
+static void GetUnionRoomPlayerFacingCoords(u32 group, u32 member, s32 * xp, s32 * yp)
 {
-    *xp = sUnionPartnerCoords[id][0] + sFacingDirectionOffsets[dirn][0] + 7;
-    *yp = sUnionPartnerCoords[id][1] + sFacingDirectionOffsets[dirn][1] + 7;
+    *xp = sUnionPartnerCoords[group][0] + sFacingDirectionOffsets[member][0] + 7;
+    *yp = sUnionPartnerCoords[group][1] + sFacingDirectionOffsets[member][1] + 7;
 }
 
-static bool32 sub_811B58C(u32 id, u32 dirn, s32 x, s32 y)
+static bool32 IsUnionRoomPlayerFacingTileAt(u32 group, u32 member, s32 x, s32 y)
 {
-    if (sUnionPartnerCoords[id][0] + sFacingDirectionOffsets[dirn][0] + 7 != x)
+    if (sUnionPartnerCoords[group][0] + sFacingDirectionOffsets[member][0] + 7 != x)
     {
         return FALSE;
     }
-    else if (sUnionPartnerCoords[id][1] + sFacingDirectionOffsets[dirn][1] + 7 != y)
+    else if (sUnionPartnerCoords[group][1] + sFacingDirectionOffsets[member][1] + 7 != y)
     {
         return FALSE;
     }
@@ -188,6 +189,7 @@ static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * move
     }
     return TRUE;
 }
+
 static bool32 TryReleaseUnionRoomPlayerObjectEvent(u32 playerIdx)
 {
     u8 objectId;
@@ -263,11 +265,11 @@ static const u8 sMovement_UnionPlayerEnter[2] = {
     MOVEMENT_ACTION_STEP_END
 };
 
-static bool32 AnimateUnionRoomPlayerSpawn(s8 * a0, u32 playerIdx, struct UnionObj * ptr)
+static bool32 AnimateUnionRoomPlayerSpawn(s8 * state_p, u32 playerIdx, struct UnionObj * ptr)
 {
     s16 x, y;
 
-    switch (*a0)
+    switch (*state_p)
     {
     case 0:
         if (!is_walking_or_running())
@@ -275,30 +277,30 @@ static bool32 AnimateUnionRoomPlayerSpawn(s8 * a0, u32 playerIdx, struct UnionOb
             break;
         }
         PlayerGetDestCoords(&x, &y);
-        if (sub_811B58C(playerIdx, 0, x, y) == TRUE)
+        if (IsUnionRoomPlayerFacingTileAt(playerIdx, 0, x, y) == TRUE)
         {
             break;
         }
         player_get_pos_including_state_based_drift(&x, &y);
-        if (sub_811B58C(playerIdx, 0, x, y) == TRUE)
+        if (IsUnionRoomPlayerFacingTileAt(playerIdx, 0, x, y) == TRUE)
         {
             break;
         }
         SetUnionRoomPlayerGfx(playerIdx, ptr->gfxId);
         CreateUnionRoomPlayerObjectEvent(playerIdx);
         ShowUnionRoomPlayer(playerIdx);
-        (*a0)++;
+        (*state_p)++;
         // fallthrough
     case 3: // incorrect?
         if (SetUnionRoomPlayerEnterExitMovement(playerIdx, sMovement_UnionPlayerEnter) == 1)
         {
-            (*a0)++;
+            (*state_p)++;
         }
         break;
     case 2:
         if (TryReleaseUnionRoomPlayerObjectEvent(playerIdx))
         {
-            *a0 = 0;
+            *state_p = 0;
             return TRUE;
         }
         break;
@@ -306,12 +308,12 @@ static bool32 AnimateUnionRoomPlayerSpawn(s8 * a0, u32 playerIdx, struct UnionOb
     return FALSE;
 }
 
-static bool32 sub_811B8BC(u32 playerIdx, u32 a1, u32 a2)
+static bool32 SpawnGroupLeader(u32 playerIdx, u32 gender, u32 idMod256)
 {
     struct UnionObj * ptr = &UnionObjWork[playerIdx];
     AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 561)
-    ptr->schedAnim = 1;
-    ptr->gfxId = GetUnionRoomPlayerGraphicsId(a1, a2);
+    ptr->schedAnim = UNION_ROOM_SPAWN_IN;
+    ptr->gfxId = GetUnionRoomPlayerGraphicsId(gender, idMod256);
     if (ptr->state == 0)
     {
         return TRUE;
@@ -322,11 +324,11 @@ static bool32 sub_811B8BC(u32 playerIdx, u32 a1, u32 a2)
     }
 }
 
-static bool32 sub_811B90C(u32 playerIdx)
+static bool32 DespawnGroupLeader(u32 playerIdx)
 {
     struct UnionObj * ptr = &UnionObjWork[playerIdx];
     AGB_ASSERT_EX(UnionObjWork != NULL, ABSPATH("rfu_union_tool.c"), 577)
-    ptr->schedAnim = 2;
+    ptr->schedAnim = UNION_ROOM_SPAWN_OUT;
     if (ptr->state == 1)
     {
         return TRUE;
@@ -342,7 +344,7 @@ static void AnimateUnionObj(u32 playerIdx, struct UnionObj * ptr)
     switch (ptr->state)
     {
     case 0:
-        if (ptr->schedAnim == 1)
+        if (ptr->schedAnim == UNION_ROOM_SPAWN_IN)
         {
             ptr->state = 2;
             ptr->animState = 0;
@@ -353,7 +355,7 @@ static void AnimateUnionObj(u32 playerIdx, struct UnionObj * ptr)
         }
         // fallthrough
     case 2:
-        if (!sub_811BBC8(playerIdx, 0) && ptr->schedAnim == 2)
+        if (!RfuUnionGroupMemberIsInvisible(playerIdx, 0) && ptr->schedAnim == 2)
         {
             ptr->state = 0;
             ptr->animState = 0;
@@ -366,7 +368,7 @@ static void AnimateUnionObj(u32 playerIdx, struct UnionObj * ptr)
         }
         break;
     case 1:
-        if (ptr->schedAnim == 2)
+        if (ptr->schedAnim == UNION_ROOM_SPAWN_OUT)
         {
             ptr->state = 3;
             ptr->animState = 0;
@@ -383,7 +385,7 @@ static void AnimateUnionObj(u32 playerIdx, struct UnionObj * ptr)
         }
         break;
     }
-    ptr->schedAnim = 0;
+    ptr->schedAnim = UNION_ROOM_SPAWN_NONE;
 }
 
 static void Task_AnimateUnionObjs(u8 taskId)
@@ -409,7 +411,7 @@ static u8 StartUnionObjAnimTask(void)
     }
 }
 
-static void sub_811BA5C(void)
+static void DestroyAnimateUnionObjsTask(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_AnimateUnionObjs);
     if (taskId < NUM_TASKS)
@@ -418,7 +420,7 @@ static void sub_811BA5C(void)
     }
 }
 
-void sub_811BA78(void)
+void DeleteUnionObjWorkAndStopTask(void)
 {
     s32 i;
     for (i = 0; i < 8; i++)
@@ -430,31 +432,31 @@ void sub_811BA78(void)
         }
     }
     UnionObjWork = NULL;
-    sub_811BA5C();
+    DestroyAnimateUnionObjsTask();
 }
 
-void sub_811BAAC(u8 * sp8, s32 r9)
+void CreateGroupMemberObjectsInvisible(u8 * sprite_ids, s32 group)
 {
-    s32 r7;
+    s32 i;
 
-    for (r7 = 0; r7 < 5; r7++)
+    for (i = 0; i < 5; i++)
     {
-        s32 r5 = 5 * r9 + r7;
-        sp8[r5] = sprite_new(OBJECT_EVENT_GFX_MAN, r5 - 0x38, sUnionPartnerCoords[r9][0] + sFacingDirectionOffsets[r7][0], sUnionPartnerCoords[r9][1] + sFacingDirectionOffsets[r7][1], 3, 1);
-        sub_8069124(r5 - 0x38, TRUE);
+        s32 obj_id = 5 * group + i;
+        sprite_ids[obj_id] = sprite_new(OBJECT_EVENT_GFX_MAN, obj_id - 0x38, sUnionPartnerCoords[group][0] + sFacingDirectionOffsets[i][0], sUnionPartnerCoords[group][1] + sFacingDirectionOffsets[i][1], 3, 1);
+        RfuUnionObjectToggleInvisibility(obj_id - 0x38, TRUE);
     }
 }
 
-void sub_811BB40(u8 * r5)
+void DestroyGroupMemberObjects(u8 *spriteIds)
 {
     s32 i;
     for (i = 0; i < 40; i++)
     {
-        DestroySprite(&gSprites[r5[i]]);
+        DestroySprite(&gSprites[spriteIds[i]]);
     }
 }
 
-void sub_811BB68(void)
+void MakeGroupAssemblyAreasPassable(void)
 {
     s32 i, j, x, y;
     for (i = 0; i < 8; i++)
@@ -462,94 +464,94 @@ void sub_811BB68(void)
         for (j = 0; j < 5; j++)
         {
             GetUnionRoomPlayerFacingCoords(i, j, &x, &y);
-            sub_8059024(x, y, 0);
+            MapGridSetMetatileImpassabilityAt(x, y, FALSE);
         }
     }
 }
 
-static u8 sub_811BBA0(u32 r1, u32 unused, struct GFtgtGname * r2)
+static u8 UnionPartnerObjectGetFacing(u32 member, u32 group, struct GFtgtGname * gname)
 {
-    if (r1 != 0)
+    if (member != 0)
     {
-        return gUnknown_845711B[r1];
+        return sUnionGroupMemberFacings[member];
     }
-    else if (r2->unk_0a_0 == 0x45)
+    else if (gname->activity == 0x45)
     {
-        return 1;
+        return DIR_SOUTH;
     }
     else
     {
-        return 4;
+        return DIR_EAST;
     }
 }
 
-static u32 sub_811BBC8(u32 a0, u32 a1)
+static u32 RfuUnionGroupMemberIsInvisible(u32 group, u32 member)
 {
-    return sub_806916C(5 * a0 + a1 - 0x38);
+    return RfuUnionObjectIsInvisible(5 * group + member - 0x38);
 }
 
-static void sub_811BBE0(u32 r5, u32 r6, u8 r8, struct GFtgtGname * r9)
+static void SpawnGroupMember(u32 groupNo, u32 memberNo, u8 direction, struct GFtgtGname * gname)
 {
     s32 x, y;
-    s32 r7 = 5 * r5 + r6;
-    if (sub_811BBC8(r5, r6) == 1)
+    s32 objId = 5 * groupNo + memberNo;
+    if (RfuUnionGroupMemberIsInvisible(groupNo, memberNo) == TRUE)
     {
-        sub_8069124(r7 - 0x38, FALSE);
-        sub_80691A4(r7 - 0x38, 1);
+        RfuUnionObjectToggleInvisibility(objId - 0x38, FALSE);
+        RfuUnionObjectStartWarp(objId - 0x38, UNION_ROOM_SPAWN_IN);
     }
-    sub_8069094(r7 - 0x38, r8);
-    sub_811C008(r6, r5, sub_811BBA0(r6, r5, r9));
-    GetUnionRoomPlayerFacingCoords(r5, r6, &x, &y);
-    sub_8059024(x, y, 1);
+    RfuUnionObjectSetFacingDirection(objId - 0x38, direction);
+    UnionPartnerObjectSetFacing(memberNo, groupNo, UnionPartnerObjectGetFacing(memberNo, groupNo, gname));
+    GetUnionRoomPlayerFacingCoords(groupNo, memberNo, &x, &y);
+    MapGridSetMetatileImpassabilityAt(x, y, TRUE);
 }
 
-static void sub_811BC68(u32 a0, u32 a1)
+static void DespawnGroupMember(u32 group, u32 member)
 {
     s32 x, y;
-    sub_80691A4(5 * a0 + a1 - 0x38, 2);
-    GetUnionRoomPlayerFacingCoords(a0, a1, &x, &y);
-    sub_8059024(x, y, 0);
+    RfuUnionObjectStartWarp(5 * group + member - 0x38, UNION_ROOM_SPAWN_OUT);
+    GetUnionRoomPlayerFacingCoords(group, member, &x, &y);
+    MapGridSetMetatileImpassabilityAt(x, y, FALSE);
 }
 
-static void sub_811BCA0(u32 r7, struct GFtgtGname * r8)
+static void AssembleGroup(u32 group, struct GFtgtGname * gname)
 {
     s16 x, y, x2, y2;
     s32 i;
 
     PlayerGetDestCoords(&x, &y);
     player_get_pos_including_state_based_drift(&x2, &y2);
-    if (sub_806916C(5 * r7 - 0x38) == 1)
+    if (RfuUnionObjectIsInvisible(5 * group - 0x38) == TRUE)
     {
-        if (sub_811B58C(r7, 0, x, y) == TRUE || sub_811B58C(r7, 0, x2, y2) == TRUE)
+        if (IsUnionRoomPlayerFacingTileAt(group, 0, x, y) == TRUE || IsUnionRoomPlayerFacingTileAt(group, 0, x2, y2) == TRUE)
         {
             return;
         }
-        sub_811BBE0(r7, 0, GetUnionRoomPlayerGraphicsId(r8->playerGender, r8->unk_00.playerTrainerId[0]), r8);
+        SpawnGroupMember(group, 0, GetUnionRoomPlayerGraphicsId(gname->playerGender, gname->unk_00.playerTrainerId[0]), gname);
     }
     for (i = 1; i < 5; i++)
     {
-        if (r8->unk_04[i - 1] == 0)
+        if (gname->child_sprite_gender[i - 1] == 0)
         {
-            sub_811BC68(r7, i);
+            DespawnGroupMember(group, i);
         }
-        else if (sub_811B58C(r7, i, x, y) == FALSE && sub_811B58C(r7, i, x2, y2) == FALSE)
+        else if (IsUnionRoomPlayerFacingTileAt(group, i, x, y) == FALSE && IsUnionRoomPlayerFacingTileAt(group, i, x2, y2) == FALSE)
         {
-            sub_811BBE0(r7, i, GetUnionRoomPlayerGraphicsId((r8->unk_04[i - 1] >> 3) & 1, r8->unk_04[i - 1] & 7), r8);
+            SpawnGroupMember(group, i, GetUnionRoomPlayerGraphicsId((gname->child_sprite_gender[i - 1] >> 3) & 1, gname->child_sprite_gender[i - 1] & 7), gname);
         }
     }
 }
 
-static void sub_811BDA8(u32 r5, struct GFtgtGname * r4)
+static void SpawnGroupLeaderAndMembers(u32 group, struct GFtgtGname * gname)
 {
     u32 i;
-    switch (r4->unk_0a_0)
+    switch (gname->activity)
     {
     case 0x40:
     case 0x54:
-        sub_811B8BC(r5, r4->playerGender, r4->unk_00.playerTrainerId[0]);
+        SpawnGroupLeader(group, gname->playerGender, gname->unk_00.playerTrainerId[0]);
         for (i = 0; i < 5; i++)
         {
-            sub_811BC68(r5, i);
+            DespawnGroupMember(group, i);
         }
         break;
     case 0x41:
@@ -559,70 +561,70 @@ static void sub_811BDA8(u32 r5, struct GFtgtGname * r4)
     case 0x51:
     case 0x52:
     case 0x53:
-        sub_811B90C(r5);
-        sub_811BCA0(r5, r4);
+        DespawnGroupLeader(group);
+        AssembleGroup(group, gname);
         break;
     default:
         AGB_ASSERT_EX(0, ABSPATH("rfu_union_tool.c"), 979)
     }
 }
 
-static void sub_811BE6C(u32 r5, struct GFtgtGname * unused)
+static void DespawnGroupLeaderAndMembers(u32 group, struct GFtgtGname * gname)
 {
     s32 i;
-    sub_811B90C(r5);
+    DespawnGroupLeader(group);
     for (i = 0; i < 5; i++)
     {
-        sub_811BC68(r5, i);
+        DespawnGroupMember(group, i);
     }
 }
 
-static void UpdateUnionRoomPlayerSprites(struct UnkStruct_URoom *r0)
+static void UpdateUnionRoomPlayerSprites(struct UnkStruct_URoom * groups)
 {
     s32 i;
-    struct UnkStruct_x20 * r4;
+    struct UnkStruct_x20 * x20_p;
     sUnionObjRefreshTimer = 0;
-    for (i = 0, r4 = r0->field_0->arr; i < 8; i++)
+    for (i = 0, x20_p = groups->field_0->arr; i < 8; i++)
     {
-        if (r4[i].field_1A_0 == 1)
+        if (x20_p[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
         {
-            sub_811BDA8(i, &r4[i].unk.gname);
+            SpawnGroupLeaderAndMembers(i, &x20_p[i].gname_uname.gname);
         }
-        else if (r4[i].field_1A_0 == 2)
+        else if (x20_p[i].groupScheduledAnim == UNION_ROOM_SPAWN_OUT)
         {
-            sub_811BE6C(i, &r4[i].unk.gname);
+            DespawnGroupLeaderAndMembers(i, &x20_p[i].gname_uname.gname);
         }
     }
 }
 
-void sub_811BECC(struct UnkStruct_URoom *unused)
+void ScheduleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p)
 {
     sUnionObjRefreshTimer = 300;
 }
 
-void sub_811BEDC(struct UnkStruct_URoom *r2)
+void HandleUnionRoomPlayerRefresh(struct UnkStruct_URoom *uroom_p)
 {
     if (++sUnionObjRefreshTimer > 300)
     {
-        UpdateUnionRoomPlayerSprites(r2);
+        UpdateUnionRoomPlayerSprites(uroom_p);
     }
 }
 
-bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3)
+bool32 RfuUnionTool_GetGroupAndMemberInFrontOfPlayer(struct UnkStruct_Main0 *main0_p, s16 *member_p, s16 *group_p, u8 *spriteIds)
 {
     s16 x, y;
     s32 i, j;
-    struct UnkStruct_x20 * r4;
+    struct UnkStruct_x20 * x20_p;
     if (!is_walking_or_running())
     {
         return FALSE;
     }
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-    for (i = 0, r4 = arg0->arr; i < 8; i++)
+    for (i = 0, x20_p = main0_p->arr; i < 8; i++)
     {
         for (j = 0; j < 5; j++)
         {
-            s32 r3 = 5 * i + j;
+            s32 objId = 5 * i + j;
             if (x != sUnionPartnerCoords[i][0] + sFacingDirectionOffsets[j][0] + 7)
             {
                 continue;
@@ -631,33 +633,33 @@ bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3)
             {
                 continue;
             }
-            if (sub_806916C(r3 - 0x38) != 0)
+            if (RfuUnionObjectIsInvisible(objId - 0x38) != 0)
             {
                 continue;
             }
-            if (sub_8069294(r3 - 0x38) != 0)
+            if (RfuUnionObjectIsWarping(objId - 0x38) != 0)
             {
                 continue;
             }
-            if (r4[i].field_1A_0 != 1)
+            if (x20_p[i].groupScheduledAnim != UNION_ROOM_SPAWN_IN)
             {
                 continue;
             }
-            sub_811C008(j, i, sOppositeFacingDirection[GetPlayerFacingDirection()]);
-            *arg1 = j;
-            *arg2 = i;
+            UnionPartnerObjectSetFacing(j, i, sOppositeFacingDirection[GetPlayerFacingDirection()]);
+            *member_p = j;
+            *group_p = i;
             return TRUE;
         }
     }
     return FALSE;
 }
 
-static void sub_811C008(s32 arg0, s32 arg1, u8 arg2)
+static void UnionPartnerObjectSetFacing(s32 member, s32 group, u8 direction)
 {
-    sub_8069058(5 * arg1 - 0x38 + arg0, arg2);
+    TurnObjectEvent(5 * group - 0x38 + member, direction);
 }
 
-void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2)
+void UpdateUnionGroupMemberFacing(u32 member, u32 group, struct UnkStruct_Main0 *main0_p)
 {
-    return sub_811C008(arg0, arg1, sub_811BBA0(arg0, arg1, &arg2->arr[arg1].unk.gname));
+    return UnionPartnerObjectSetFacing(member, group, UnionPartnerObjectGetFacing(member, group, &main0_p->arr[group].gname_uname.gname));
 }
diff --git a/src/save.c b/src/save.c
index a2d365886..3db8dcdbf 100644
--- a/src/save.c
+++ b/src/save.c
@@ -856,7 +856,7 @@ void sub_80DA634(u8 taskId)
         gTasks[taskId].data[0] = 1;
         break;
     case 1:
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         gTasks[taskId].data[0] = 2;
         break;
     case 2:
@@ -890,7 +890,7 @@ void sub_80DA634(u8 taskId)
         break;
     case 7:
         ClearContinueGameWarpStatus2();
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         gTasks[taskId].data[0] = 8;
         break;
     case 8:
@@ -901,7 +901,7 @@ void sub_80DA634(u8 taskId)
         }
         break;
     case 9:
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         gTasks[taskId].data[0] = 10;
         break;
     case 10:
diff --git a/src/scrcmd.c b/src/scrcmd.c
index c2c422a0a..1ff3eb954 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1193,7 +1193,7 @@ bool8 ScrCmd_turnvobject(struct ScriptContext *ctx)
     u8 v1 = ScriptReadByte(ctx);
     u8 direction = ScriptReadByte(ctx);
 
-    sub_8069058(v1, direction);
+    TurnObjectEvent(v1, direction);
     return FALSE;
 }
 
diff --git a/src/script.c b/src/script.c
index 0a4b69bac..4b8565589 100644
--- a/src/script.c
+++ b/src/script.c
@@ -406,7 +406,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
     }
 }
 
-void mapheader_run_script_with_tag_x1(void)
+void RunOnLoadMapScript(void)
 {
     mapheader_run_script_by_tag(1);
 }
@@ -506,7 +506,7 @@ u8 *GetRamScript(u8 objectId, u8 *script)
     }
 }
 
-bool32 sub_8069DFC(void)
+bool32 ValidateRamScript(void)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
     if (scriptData->magic != RAM_SCRIPT_MAGIC)
diff --git a/src/sprite.c b/src/sprite.c
index c1fc89777..fd824494b 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -94,17 +94,17 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
 #define DUMMY_OAM_DATA        \
 {                             \
     160, /* Y (off-screen) */ \
-    0,                        \
-    0,                        \
-    0,                        \
-    0,                        \
-    0,                        \
+    ST_OAM_AFFINE_OFF,        \
+    ST_OAM_OBJ_NORMAL,        \
+    FALSE,                    \
+    ST_OAM_4BPP,              \
+    ST_OAM_SQUARE,            \
     304, /* X */              \
     0,                        \
-    0,                        \
-    0,                        \
+    ST_OAM_SIZE_0,            \
+    0x000,                    \
     3, /* lowest priority */  \
-    0,                        \
+    0x0,                      \
     0                         \
 }
 
@@ -250,47 +250,47 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
     AffineAnimCmd_frame,
 };
 
-static const s32 sUnknown_082EC6F4[3][4][2] =
+static const s32 sOamDimensionsCopy[3][4][2] =
 {
-    {
-        {8, 8},
-        {0x10, 0x10},
-        {0x20, 0x20},
-        {0x40, 0x40},
+    [ST_OAM_SQUARE] = {
+        [ST_OAM_SIZE_0] = { 8,  8}, // SPRITE_SIZE_8x8
+        [ST_OAM_SIZE_1] = {16, 16}, // SPRITE_SIZE_16x16
+        [ST_OAM_SIZE_2] = {32, 32}, // SPRITE_SIZE_32x32
+        [ST_OAM_SIZE_3] = {64, 64}, // SPRITE_SIZE_64x64
     },
-    {
-        {0x10, 8},
-        {0x20, 8},
-        {0x20, 0x10},
-        {0x40, 0x20},
+    [ST_OAM_H_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = {16,  8}, // SPRITE_SIZE_16x8
+        [ST_OAM_SIZE_1] = {32,  8}, // SPRITE_SIZE_32x8
+        [ST_OAM_SIZE_2] = {32, 16}, // SPRITE_SIZE_32x16
+        [ST_OAM_SIZE_3] = {64, 32}, // SPRITE_SIZE_64x32
     },
-    {
-        {8, 0x10},
-        {8, 0x20},
-        {0x10, 0x20},
-        {0x20, 0x40},
+    [ST_OAM_V_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = { 8, 16}, // SPRITE_SIZE_8x16
+        [ST_OAM_SIZE_1] = { 8, 32}, // SPRITE_SIZE_8x32
+        [ST_OAM_SIZE_2] = {16, 32}, // SPRITE_SIZE_16x32
+        [ST_OAM_SIZE_3] = {32, 64}, // SPRITE_SIZE_32x64
     },
 };
 
 static const struct OamDimensions sOamDimensions[3][4] =
 {
-    {   // square
-        {  8,  8 },
-        { 16, 16 },
-        { 32, 32 },
-        { 64, 64 },
+    [ST_OAM_SQUARE] = {
+        [ST_OAM_SIZE_0] = { 8,  8}, // SPRITE_SIZE_8x8
+        [ST_OAM_SIZE_1] = {16, 16}, // SPRITE_SIZE_16x16
+        [ST_OAM_SIZE_2] = {32, 32}, // SPRITE_SIZE_32x32
+        [ST_OAM_SIZE_3] = {64, 64}, // SPRITE_SIZE_64x64
     },
-    {   // horizontal rectangle
-        { 16,  8 },
-        { 32,  8 },
-        { 32, 16 },
-        { 64, 32 },
+    [ST_OAM_H_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = {16,  8}, // SPRITE_SIZE_16x8
+        [ST_OAM_SIZE_1] = {32,  8}, // SPRITE_SIZE_32x8
+        [ST_OAM_SIZE_2] = {32, 16}, // SPRITE_SIZE_32x16
+        [ST_OAM_SIZE_3] = {64, 32}, // SPRITE_SIZE_64x32
     },
-    {   // vertical rectangle
-        {  8, 16 },
-        {  8, 32 },
-        { 16, 32 },
-        { 32, 64 },
+    [ST_OAM_V_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = { 8, 16}, // SPRITE_SIZE_8x16
+        [ST_OAM_SIZE_1] = { 8, 32}, // SPRITE_SIZE_8x32
+        [ST_OAM_SIZE_2] = {16, 32}, // SPRITE_SIZE_16x32
+        [ST_OAM_SIZE_3] = {32, 64}, // SPRITE_SIZE_32x64
     },
 };
 
@@ -1222,43 +1222,43 @@ u8 GetSpriteMatrixNum(struct Sprite *sprite)
     return matrixNum;
 }
 
-void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3)
+void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod)
 {
-    sprite->data[6] = a2;
-    sprite->data[7] = a3;
+    sprite->data[6] = xmod;
+    sprite->data[7] = ymod;
     sprite->flags_f = 1;
 }
 
-s32 sub_800800C(s32 a0, s32 a1, s32 a2)
+static s32 affine_get_new_pos2(s32 baseDim, s32 xformed, s32 modifier)
 {
-    s32 subResult, var1;
+    s32 subResult, shiftResult;
 
-    subResult = a1 - a0;
+    subResult = xformed - baseDim;
     if (subResult < 0)
-        var1 = -(subResult) >> 9;
+        shiftResult = -(subResult) >> 9;
     else
-        var1 = -(subResult >> 9);
-    return a2 - ((u32)(a2 * a1) / (u32)(a0) + var1);
+        shiftResult = -(subResult >> 9);
+    return modifier - ((u32)(modifier * xformed) / (u32)(baseDim) + shiftResult);
 }
 
-void obj_update_pos2(struct Sprite *sprite, s32 a1, s32 a2)
+static void obj_update_pos2(struct Sprite *sprite, s32 xmod, s32 ymod)
 {
-    s32 var0, var1, var2;
+    s32 dim, baseDim, xFormed;
 
     u32 matrixNum = sprite->oam.matrixNum;
-    if (a1 != 0x800)
+    if (xmod != 0x800)
     {
-        var0 = sUnknown_082EC6F4[sprite->oam.shape][sprite->oam.size][0];
-        var1 = var0 << 8;
-        var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
-        sprite->pos2.x = sub_800800C(var1, var2, a1);
+        dim = sOamDimensionsCopy[sprite->oam.shape][sprite->oam.size][0];
+        baseDim = dim << 8;
+        xFormed = (dim << 16) / gOamMatrices[matrixNum].a;
+        sprite->pos2.x = affine_get_new_pos2(baseDim, xFormed, xmod);
     }
-    if (a2 != 0x800)
+    if (ymod != 0x800)
     {
-        var0 = sUnknown_082EC6F4[sprite->oam.shape][sprite->oam.size][1];
-        var1 = var0 << 8;
-        var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
-        sprite->pos2.y = sub_800800C(var1, var2, a2);
+        dim = sOamDimensionsCopy[sprite->oam.shape][sprite->oam.size][1];
+        baseDim = dim << 8;
+        xFormed = (dim << 16) / gOamMatrices[matrixNum].d;
+        sprite->pos2.y = affine_get_new_pos2(baseDim, xFormed, ymod);
     }
 }
 
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 44e86448f..dd0fe453d 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -232,7 +232,7 @@ static void sub_8070120(u16 timer)
         sub_80700A4(timer >> 4);
 }
 
-void sub_8070154(void)
+void InitTilesetAnim_General(void)
 {
     sPrimaryTilesetAnimCounter = 0;
     sPrimaryTilesetAnimCounterMax = 640;
@@ -250,7 +250,7 @@ static void sub_80701AC(u16 timer)
         sub_807017C(timer / 12);
 }
 
-void sub_80701D8(void)
+void InitTilesetAnim_CeladonCity(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 120;
@@ -268,7 +268,7 @@ static void sub_8070224(u16 timer)
         sub_80701FC(timer / 10);
 }
 
-void sub_8070250(void)
+void InitTilesetAnim_SilphCo(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 160;
@@ -286,7 +286,7 @@ static void sub_807029C(u16 timer)
         sub_8070274(timer >> 4);
 }
 
-void sub_80702B4(void)
+void InitTilesetAnim_MtEmber(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 256;
@@ -306,7 +306,7 @@ static void sub_8070304(u16 timer)
         sub_80702DC(timer >> 1);
 }
 
-void sub_807031C(void)
+void InitTilesetAnim_VermilionGym(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 240;
@@ -326,7 +326,7 @@ static void sub_8070368(u16 timer)
         sub_8070340(timer >> 4);
 }
 
-void sub_8070380(void)
+void InitTilesetAnim_CeladonGym(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 256;
diff --git a/src/tm_case.c b/src/tm_case.c
index d45061bde..ac4134029 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -1304,7 +1304,7 @@ static void InitWindowTemplatesAndPals(void)
     LoadPalette(gTMCaseMainWindowPalette, 0xA0, 0x20);
     LoadPalette(sPal3Override, 0xF6, 0x04);
     LoadPalette(sPal3Override, 0xD6, 0x04);
-    sub_8107D38(0xc0, 0x01);
+    ListMenuLoadStdPalAt(0xc0, 0x01);
     for (i = 0; i < 9; i++)
         FillWindowPixelBuffer(i, 0x00);
     PutWindowTilemap(0);
diff --git a/src/trade.c b/src/trade.c
index fe5f53be9..1872e98ee 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -765,9 +765,9 @@ static void sub_804C728(void)
 
             if (gWirelessCommType)
             {
-                sub_800B1F4();
+                SetWirelessCommType1();
                 OpenLink();
-                sub_80FBB20();
+                LinkRfu_CreateIdleTask();
             }
             else
             {
@@ -810,14 +810,14 @@ static void sub_804C728(void)
     case 4:
         if (gReceivedRemoteLinkPlayers == TRUE && IsLinkPlayerDataExchangeComplete() == TRUE)
         {
-            sub_80FBB4C();
+            LinkRfu_DestroyIdleTask();
             CalculatePlayerPartyCount();
             gMain.state++;
             sTradeMenuResourcesPtr->unk_A8 = 0;
             if (gWirelessCommType)
             {
                 sub_80FA484(TRUE);
-                sub_800AB9C();
+                PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             }
         }
         break;
@@ -1213,7 +1213,7 @@ static void sub_804D548(void)
         }
         else
         {
-            sub_800AA80(32);
+            Link_StartSend5FFFwithParam(32);
             sTradeMenuResourcesPtr->unk_6F = 13;
         }
     }
@@ -2004,11 +2004,11 @@ static void sub_804E908(void)
     {
         if (gWirelessCommType)
         {
-            sub_800AB9C();
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         }
         else
         {
-            sub_800AA80(12);
+            Link_StartSend5FFFwithParam(12);
         }
 
         sTradeMenuResourcesPtr->unk_6F = 12;
@@ -2044,7 +2044,7 @@ static void sub_804E9C0(void)
 {
     if (!sub_80FA484(FALSE))
     {
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         sTradeMenuResourcesPtr->unk_6F = 13;
     }
 }
@@ -2740,30 +2740,30 @@ static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet)
     return FALSE;
 }
 
-int GetUnionRoomTradeMessageId(struct GFtgtGnameSub a0, struct GFtgtGnameSub a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet)
+int GetUnionRoomTradeMessageId(struct GFtgtGnameSub playerSub, struct GFtgtGnameSub partnerSub, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet)
 {
-    u8 r9 = a0.hasNationalDex;
-    u8 r4 = a0.isChampion;
-    u8 r10 = a1.hasNationalDex;
-    u8 r0 = a1.isChampion;
-    u8 r1 = a1.unk_01_2;
-    u8 r2;
+    u8 playerHasNationalDex = playerSub.hasNationalDex;
+    u8 playerIsChampion = playerSub.isChampion;
+    u8 partnerHasNationalDex = partnerSub.hasNationalDex;
+    u8 partnerIsChampion = partnerSub.isChampion;
+    u8 partnerVersion = partnerSub.version;
+    bool8 isNotFRLG;
 
-    if (r1 == VERSION_FIRE_RED || r1 == VERSION_LEAF_GREEN)
+    if (partnerVersion == VERSION_FIRE_RED || partnerVersion == VERSION_LEAF_GREEN)
     {
-        r2 = 0;
+        isNotFRLG = FALSE;
     }
     else
     {
-        r2 = 1;
+        isNotFRLG = TRUE;
     }
-    if (r2)
+    if (isNotFRLG)
     {
-        if (!r4)
+        if (!playerIsChampion)
         {
             return 8;
         }
-        else if (!r0)
+        else if (!partnerIsChampion)
         {
             return 9;
         }
@@ -2794,7 +2794,7 @@ int GetUnionRoomTradeMessageId(struct GFtgtGnameSub a0, struct GFtgtGnameSub a1,
         return 3;
     }
 
-    if (!r9)
+    if (!playerHasNationalDex)
     {
         if (species1 == SPECIES_EGG)
         {
@@ -2812,7 +2812,7 @@ int GetUnionRoomTradeMessageId(struct GFtgtGnameSub a0, struct GFtgtGnameSub a1,
         }
     }
 
-    if (!r10 && species1 > SPECIES_MEW)
+    if (!partnerHasNationalDex && species1 > SPECIES_MEW)
     {
         return 7;
     }
@@ -2820,11 +2820,11 @@ int GetUnionRoomTradeMessageId(struct GFtgtGnameSub a0, struct GFtgtGnameSub a1,
     return 0;
 }
 
-int CanRegisterMonForTradingBoard(struct GFtgtGnameSub a0, u16 species, u16 a2, u8 a3)
+int CanRegisterMonForTradingBoard(struct GFtgtGnameSub playerSub, u16 species2, u16 species, u8 obedience)
 {
-    u8 canTradeEggAndNational = a0.hasNationalDex;
+    u8 canTradeEggAndNational = playerSub.hasNationalDex;
 
-    if (IsDeoxysOrMewUntradable(a2, a3))
+    if (IsDeoxysOrMewUntradable(species, obedience))
     {
         return 1;
     }
@@ -2834,12 +2834,12 @@ int CanRegisterMonForTradingBoard(struct GFtgtGnameSub a0, u16 species, u16 a2,
         return 0;
     }
 
-    if (species == SPECIES_EGG)
+    if (species2 == SPECIES_EGG)
     {
         return 2;
     }
 
-    if (species > SPECIES_MEW && species != SPECIES_EGG)
+    if (species2 > SPECIES_MEW && species2 != SPECIES_EGG)
     {
         return 1;
     }
diff --git a/src/trade_scene.c b/src/trade_scene.c
index b420cb196..601d7ae2b 100644
--- a/src/trade_scene.c
+++ b/src/trade_scene.c
@@ -2556,7 +2556,7 @@ static void sub_8053E8C(void)
         DrawTextOnTradeWindow(0, gStringVar4, 0);
         break;
     case 1:
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         gMain.state = 100;
         sTradeData->timer = 0;
         break;
@@ -2594,7 +2594,7 @@ static void sub_8053E8C(void)
         }
         if (gWirelessCommType)
         {
-            sub_8144714(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
+            MEvent_RecordIdOfWonderCardSenderByEventType(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
         }
         SetContinueGameWarpStatusToDynamicWarp();
         sub_80DA3AC();
@@ -2641,7 +2641,7 @@ static void sub_8053E8C(void)
     case 41:
         if (sTradeData->timer == 0)
         {
-            sub_800AB9C();
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             gMain.state = 42;
         }
         else
@@ -2660,7 +2660,7 @@ static void sub_8053E8C(void)
         if (++sTradeData->timer > 60)
         {
             gMain.state++;
-            sub_800AB9C();
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         }
         break;
     case 6:
@@ -2682,11 +2682,11 @@ static void sub_8053E8C(void)
         {
             if (gWirelessCommType && gMain.savedCallback == CB2_ReturnFromLinkTrade)
             {
-                sub_800AB9C();
+                PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             }
             else
             {
-                sub_800AAC0();
+                Link_TryStartSend5FFF();
             }
             gMain.state++;
         }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index e4778f5ed..f29c9c71c 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -590,7 +590,7 @@ static void Task_TrainerCard(u8 taskId)
         }
         break;
     case 15:
-        sub_800AAC0();
+        Link_TryStartSend5FFF();
         DrawDialogueFrame(0, 1);
         AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SPEED_FF, 0);
         CopyWindowToVram(0, 3);
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 60c6fd93d..0f9907e2d 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -20,7 +20,6 @@
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "sound.h"
-#include "renewable_hidden_items.h"
 #include "constants/flags.h"
 #include "constants/vars.h"
 #include "constants/items.h"
@@ -31,14 +30,18 @@
 #include "constants/trainers.h"
 #include "constants/facility_trainer_classes.h"
 #include "constants/object_events.h"
+#include "constants/trainer_tower.h"
+
+#define CURR_FLOOR sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx]
+#define TRAINER_TOWER gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId]
 
 struct UnkStruct_203F458
 {
     /* 0x0000 */ u8 floorIdx;
-    /* 0x0004 */ struct EReaderTrainerHillSet unk_0004;
+    /* 0x0004 */ struct EReaderTrainerTowerSet unk_0004;
 };
 
-struct UnkStruct_203F45C
+struct TrainerTowerOpponent
 {
     /* 0x00 */ u8 name[11];
     /* 0x0C */ u16 speechWin[6];
@@ -52,15 +55,15 @@ struct UnkStruct_203F45C
 
 struct SinglesTrainerInfo
 {
-    u8 mapObjGfx;
+    u8 objGfx;
     u8 facilityClass;
     bool8 gender;
 };
 
 struct DoublesTrainerInfo
 {
-    u8 mapObjGfx1;
-    u8 mapObjGfx2;
+    u8 objGfx1;
+    u8 objGfx2;
     u8 facilityClass;
     bool8 gender1;
     bool8 gender2;
@@ -68,49 +71,49 @@ struct DoublesTrainerInfo
 
 struct TrainerEncounterMusicPairs
 {
-    u8 unk0;
-    u8 unk1;
+    u8 facilityClass;
+    u8 musicId;
 };
 
 static EWRAM_DATA struct UnkStruct_203F458 * sTrainerTowerState = NULL;
-static EWRAM_DATA struct UnkStruct_203F45C * sTrainerTowerOpponent = NULL;
+static EWRAM_DATA struct TrainerTowerOpponent * sTrainerTowerOpponent = NULL;
 static EWRAM_DATA u8 sUnused_203F460 = 0;
 
-static void sub_815DC8C(void);  // setup
-static void sub_815DD2C(void);  // teardown
-static void sub_815DD44(void);
+static void SetUpTrainerTowerDataStruct(void);
+static void FreeTrainerTowerDataStruct(void);
+static void InitTrainerTowerFloor(void);
 static void SetTrainerTowerNPCGraphics(void);
 static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest);
-static void sub_815DF54(void);
+static void BufferTowerOpponentSpeech(void);
 static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass);
-static void sub_815E160(void);
-static void sub_815E1C0(void);
-static void sub_815E1F0(void);
-static void TTSpecial_HasReachedTheRoof(void);
-static void sub_815E28C(void);
-static void sub_815E394(void);
-static void sub_815E408(void);
-static void sub_815E4B0(void);
-static void TTSpecial_StartTimer(void);
-static void sub_815E5C4(void);
-static void sub_815E5F0(void);
-static void sub_815E658(void);
-static void sub_815E720(void);
-static void sub_815E88C(void);
-static void sub_815E8B4(void);
-static void sub_815E8CC(void);
-static void sub_815E908(void);
-static void sub_815E948(void);
-static void sub_815E9C8(void);
+static void DoTrainerTowerBattle(void);
+static void TrainerTowerGetChallengeType(void);
+static void TrainerTowerAddFloorCleared(void);
+static void GetFloorAlreadyCleared(void);
+static void StartTrainerTowerChallenge(void);
+static void GetOwnerState(void);
+static void GiveChallengePrize(void);
+static void CheckFinalTime(void);
+static void TrainerTowerResumeTimer(void);
+static void TrainerTowerSetPlayerLost(void);
+static void GetTrainerTowerChallengeStatus(void);
+static void GetCurrentTime(void);
+static void ShowResultsBoard(void);
+static void CloseResultsBoard(void);
+static void TrainerTowerGetDoublesEligiblity(void);
+static void TrainerTowerGetNumFloors(void);
+static void ShouldWarpToCounter(void);
+static void PlayTrainerTowerEncounterMusic(void);
+static void HasSpokenToOwner(void);
 static void BuildEnemyParty(void);
 static s32 GetPartyMaxLevel(void);
 static void ValidateOrResetCurTrainerTowerRecord(void);
 static u32 GetTrainerTowerRecordTime(u32 *);
 static void SetTrainerTowerRecordTime(u32 *, u32);
 
-extern const u8 gUnknown_83FE982[];
-extern const u8 gUnknown_83FE998[];
-extern const u8 *const gUnknown_83FE9C4[];
+extern const u8 gText_TimeBoard[];
+extern const u8 gText_XMinYZSec[];
+extern const u8 *const gTrainerTowerChallengeTypeTexts[];
 
 static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
     {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
@@ -319,51 +322,52 @@ static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] =
     {FACILITY_CLASS_ELITE_FOUR_2,     TRAINER_ENCOUNTER_MUSIC_MALE}
 };
 
-static const struct WindowTemplate gUnknown_847A218[] = {
+static const struct WindowTemplate sTimeBoardWindowTemplate[] = {
     {0, 3, 1, 27, 18, 15, 0x001},
     DUMMY_WIN_TEMPLATE
 };
 
-static const u32 gUnknown_847A228 = 0x70;  // unused
-
-static const u8 gUnknown_847A22C[3] = {0, 2, 3};
-
-static void (*const gUnknown_847A230[])(void) = {
-    sub_815DD44,
-    sub_815DF54,
-    sub_815E160,
-    sub_815E1C0,
-    sub_815E1F0,
-    TTSpecial_HasReachedTheRoof,
-    sub_815E28C,
-    sub_815E394,
-    sub_815E408,
-    sub_815E4B0,
-    TTSpecial_StartTimer,
-    sub_815E5C4,
-    sub_815E5F0,
-    sub_815E658,
-    sub_815E720,
-    sub_815E88C,
-    sub_815E8B4,
-    sub_815E8CC,
-    sub_815E908,
-    sub_815E948,
-    sub_815E9C8
+static const u32 sUnused_847A228 = 0x70;
+
+static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
+
+static void (*const sTrainerTowerFunctions[])(void) = {
+    [TRAINER_TOWER_FUNC_INIT_FLOOR]             = InitTrainerTowerFloor,
+    [TRAINER_TOWER_FUNC_GET_SPEECH]             = BufferTowerOpponentSpeech,
+    [TRAINER_TOWER_FUNC_DO_BATTLE]              = DoTrainerTowerBattle,
+    [TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE]     = TrainerTowerGetChallengeType,
+    [TRAINER_TOWER_FUNC_CLEARED_FLOOR]          = TrainerTowerAddFloorCleared,
+    [TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED]      = GetFloorAlreadyCleared,
+    [TRAINER_TOWER_FUNC_START_CHALLENGE]        = StartTrainerTowerChallenge,
+    [TRAINER_TOWER_FUNC_GET_OWNER_STATE]        = GetOwnerState,
+    [TRAINER_TOWER_FUNC_GIVE_PRIZE]             = GiveChallengePrize,
+    [TRAINER_TOWER_FUNC_CHECK_FINAL_TIME]       = CheckFinalTime,
+    [TRAINER_TOWER_FUNC_RESUME_TIMER]           = TrainerTowerResumeTimer,
+    [TRAINER_TOWER_FUNC_SET_LOST]               = TrainerTowerSetPlayerLost,
+    [TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS]   = GetTrainerTowerChallengeStatus,
+    [TRAINER_TOWER_FUNC_GET_TIME]               = GetCurrentTime,
+    [TRAINER_TOWER_FUNC_SHOW_RESULTS]           = ShowResultsBoard,
+    [TRAINER_TOWER_FUNC_CLOSE_RESULTS]          = CloseResultsBoard,
+    [TRAINER_TOWER_FUNC_CHECK_DOUBLES]          = TrainerTowerGetDoublesEligiblity,
+    [TRAINER_TOWER_FUNC_GET_NUM_FLOORS]         = TrainerTowerGetNumFloors,
+    [TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER] = ShouldWarpToCounter,
+    [TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC]        = PlayTrainerTowerEncounterMusic,
+    [TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE]     = HasSpokenToOwner
 };
 
-static const u16 sFloorLayouts[8][3] = {
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F, LAYOUT_UNUSED_LAYOUT_834BC2C, LAYOUT_UNUSED_LAYOUT_834D06C},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F, LAYOUT_UNUSED_LAYOUT_834BEB4, LAYOUT_UNUSED_LAYOUT_834D2F4},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F, LAYOUT_UNUSED_LAYOUT_834C13C, LAYOUT_UNUSED_LAYOUT_834D57C},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F, LAYOUT_UNUSED_LAYOUT_834C3C4, LAYOUT_UNUSED_LAYOUT_834D804},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F, LAYOUT_UNUSED_LAYOUT_834C64C, LAYOUT_UNUSED_LAYOUT_834DA8C},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F, LAYOUT_UNUSED_LAYOUT_834C8D4, LAYOUT_UNUSED_LAYOUT_834DD14},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F, LAYOUT_UNUSED_LAYOUT_834CB5C, LAYOUT_UNUSED_LAYOUT_834DF9C},
-    {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F, LAYOUT_UNUSED_LAYOUT_834CDE4, LAYOUT_UNUSED_LAYOUT_834E224}
+// - 1 excludes Mixed challenge, which just uses one of the 3 other types
+static const u16 sFloorLayouts[MAX_TRAINER_TOWER_FLOORS][NUM_TOWER_CHALLENGE_TYPES - 1] = {
+    {LAYOUT_TRAINER_TOWER_1F, LAYOUT_TRAINER_TOWER_1F_DOUBLES, LAYOUT_TRAINER_TOWER_1F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_2F, LAYOUT_TRAINER_TOWER_2F_DOUBLES, LAYOUT_TRAINER_TOWER_2F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_3F, LAYOUT_TRAINER_TOWER_3F_DOUBLES, LAYOUT_TRAINER_TOWER_3F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_4F, LAYOUT_TRAINER_TOWER_4F_DOUBLES, LAYOUT_TRAINER_TOWER_4F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_5F, LAYOUT_TRAINER_TOWER_5F_DOUBLES, LAYOUT_TRAINER_TOWER_5F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_6F, LAYOUT_TRAINER_TOWER_6F_DOUBLES, LAYOUT_TRAINER_TOWER_6F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_7F, LAYOUT_TRAINER_TOWER_7F_DOUBLES, LAYOUT_TRAINER_TOWER_7F_KNOCKOUT},
+    {LAYOUT_TRAINER_TOWER_8F, LAYOUT_TRAINER_TOWER_8F_DOUBLES, LAYOUT_TRAINER_TOWER_8F_KNOCKOUT}
 };
 
-static const u16 gUnknown_847A2B4[] = {
+static const u16 sPrizeList[] = {
     ITEM_HP_UP,
     ITEM_PROTEIN,
     ITEM_IRON,
@@ -381,21 +385,21 @@ static const u16 gUnknown_847A2B4[] = {
     ITEM_UP_GRADE
 };
 
-static const u16 gUnknown_847A2D2[] = {
-    MUS_SHOUNEN,
-    MUS_SHOUJO,
-    MUS_SHOUJO,
-    MUS_ROCKET,
-    MUS_SHOUNEN,
-    MUS_SHOUNEN,
-    MUS_ROCKET,
-    MUS_ROCKET,
-    MUS_SHOUNEN,
-    MUS_SHOUJO,
-    MUS_SHOUNEN,
-    MUS_SHOUNEN,
-    MUS_SHOUNEN,
-    MUS_SHOUNEN
+static const u16 sTrainerTowerEncounterMusic[] = {
+    [TRAINER_ENCOUNTER_MUSIC_MALE]        = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_FEMALE]      = MUS_SHOUJO,
+    [TRAINER_ENCOUNTER_MUSIC_GIRL]        = MUS_SHOUJO,
+    [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS]  = MUS_ROCKET,
+    [TRAINER_ENCOUNTER_MUSIC_INTENSE]     = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_COOL]        = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_AQUA]        = MUS_ROCKET,
+    [TRAINER_ENCOUNTER_MUSIC_MAGMA]       = MUS_ROCKET,
+    [TRAINER_ENCOUNTER_MUSIC_SWIMMER]     = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_TWINS]       = MUS_SHOUJO,
+    [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR]  = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_HIKER]       = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_SHOUNEN,
+    [TRAINER_ENCOUNTER_MUSIC_RICH]        = MUS_SHOUNEN
 };
 
 static const u8 sSingleBattleChallengeMonIdxs[][2] = {
@@ -431,22 +435,22 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = {
     {0x01, 0x04, 0x05}
 };
 
-extern const struct EReaderTrainerHillSetSubstruct gUnknown_84827AC;
-extern const struct TrainerTowerFloor *const gUnknown_84827B4[][8];
+extern const struct EReaderTrainerTowerSetSubstruct gUnknown_84827AC;
+extern const struct TrainerTowerFloor *const gUnknown_84827B4[][MAX_TRAINER_TOWER_FLOORS];
 
-void sub_815D9E8(void)
+void CallTrainerTowerFunc(void)
 {
-    sub_815DC8C();
-    gUnknown_847A230[gSpecialVar_0x8004]();
-    sub_815DD2C();
+    SetUpTrainerTowerDataStruct();
+    sTrainerTowerFunctions[gSpecialVar_0x8004]();
+    FreeTrainerTowerDataStruct();
 }
 
-u8 sub_815DA10(void)
+u8 GetTrainerTowerOpponentClass(void)
 {
     return gFacilityClassToTrainerClass[sTrainerTowerOpponent->facilityClass];
 }
 
-void sub_815DA28(u8 *dest)
+void GetTrainerTowerOpponentName(u8 *dest)
 {
     StringCopyN(dest, sTrainerTowerOpponent->name, 11);
 }
@@ -458,41 +462,39 @@ u8 GetTrainerTowerTrainerFrontSpriteId(void)
 
 void InitTrainerTowerBattleStruct(void)
 {
-    u16 r10;
-    s32 r9;
+    u16 trainerId;
+    int i;
 
-    sub_815DC8C();
+    SetUpTrainerTowerDataStruct();
     sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent));
-    r10 = VarGet(VAR_TEMP_1);
-    StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11);
+    trainerId = VarGet(VAR_TEMP_1);
+    StringCopyN(sTrainerTowerOpponent->name, CURR_FLOOR.trainers[trainerId].name, 11);
 
-    for (r9 = 0; r9 < 6; r9++)
+    for (i = 0; i < 6; i++)
     {
-        sTrainerTowerOpponent->speechWin[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechWin[r9];
-        sTrainerTowerOpponent->speechLose[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechLose[r9];
+        sTrainerTowerOpponent->speechWin[i] = CURR_FLOOR.trainers[trainerId].speechWin[i];
+        sTrainerTowerOpponent->speechLose[i] = CURR_FLOOR.trainers[trainerId].speechLose[i];
 
-        if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1)
+        if (CURR_FLOOR.challengeType == CHALLENGE_TYPE_DOUBLE)
         {
-            sTrainerTowerOpponent->speechWin2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechWin[r9];
-            sTrainerTowerOpponent->speechLose2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechLose[r9];
+            sTrainerTowerOpponent->speechWin2[i] = CURR_FLOOR.trainers[trainerId + 1].speechWin[i];
+            sTrainerTowerOpponent->speechLose2[i] = CURR_FLOOR.trainers[trainerId + 1].speechLose[i];
         }
     }
 
-    sTrainerTowerOpponent->battleType = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType;
-    sTrainerTowerOpponent->facilityClass = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].facilityClass;
-    sTrainerTowerOpponent->gender = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].gender;
-    SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
-    sub_815DD2C();
+    sTrainerTowerOpponent->battleType = CURR_FLOOR.challengeType;
+    sTrainerTowerOpponent->facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass;
+    sTrainerTowerOpponent->gender = CURR_FLOOR.trainers[trainerId].gender;
+    SetVBlankCounter1Ptr(&TRAINER_TOWER.timer);
+    FreeTrainerTowerDataStruct();
 }
 
 void FreeTrainerTowerBattleStruct(void)
 {
-    Free(sTrainerTowerOpponent);
-    sTrainerTowerOpponent = NULL;
+    FREE_AND_SET_NULL(sTrainerTowerOpponent);
 }
 
-void sub_815DBF4(u8 *dest, u8 opponentIdx)
-// TTower_GetBeforeBattleMessage?
+void GetTrainerTowerOpponentWinText(u8 *dest, u8 opponentIdx)
 {
     VarSet(VAR_TEMP_3, opponentIdx);
     TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass);
@@ -502,8 +504,7 @@ void sub_815DBF4(u8 *dest, u8 opponentIdx)
         TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin2, dest);
 }
 
-void sub_815DC40(u8 *dest, u8 opponentIdx)
-// TTower_GetAfterBattleMessage?
+void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx)
 {
     VarSet(VAR_TEMP_3, opponentIdx);
     TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass);
@@ -513,23 +514,23 @@ void sub_815DC40(u8 *dest, u8 opponentIdx)
         TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest);
 }
 
-static void sub_815DC8C(void) // fakematching
+static void SetUpTrainerTowerDataStruct(void) // fakematching
 {
-    u32 whichTimer = gSaveBlock1Ptr->unkArrayIdx;
+    u32 challengeType = gSaveBlock1Ptr->towerChallengeId;
     s32 r4;
     const struct TrainerTowerFloor *const * r7;
 
     sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState));
     sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42;
-    if (sub_815D834() == TRUE)
+    if (ReadTrainerTowerAndValidate() == TRUE)
         CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004);
     else
     {
         struct UnkStruct_203F458 * r0_ = sTrainerTowerState;
-        const struct EReaderTrainerHillSetSubstruct * r1 = &gUnknown_84827AC;
-        memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerHillSetSubstruct));
-        r7 = gUnknown_84827B4[whichTimer];
-        for (r4 = 0; r4 < 8; r4++)
+        const struct EReaderTrainerTowerSetSubstruct * r1 = &gUnknown_84827AC;
+        memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerTowerSetSubstruct));
+        r7 = gUnknown_84827B4[challengeType];
+        for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
         {
         #ifndef NONMATCHING
             void * r5;
@@ -547,22 +548,21 @@ static void sub_815DC8C(void) // fakematching
     }
 }
 
-static void sub_815DD2C(void)
+static void FreeTrainerTowerDataStruct(void)
 {
-    Free(sTrainerTowerState);
-    sTrainerTowerState = NULL;
+    FREE_AND_SET_NULL(sTrainerTowerState);
 }
 
-static void sub_815DD44(void)
+static void InitTrainerTowerFloor(void)
 {
-    if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
+    if (gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.numFloors)
     {
-        gSpecialVar_Result = 3;
-        SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF);
+        gSpecialVar_Result = 3; // Skip past usable challenge types
+        SetCurrentMapLayout(LAYOUT_TRAINER_TOWER_ROOF);
     }
     else
     {
-        gSpecialVar_Result = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType;
+        gSpecialVar_Result = CURR_FLOOR.challengeType;
         SetCurrentMapLayout(sFloorLayouts[sTrainerTowerState->floorIdx][gSpecialVar_Result]);
         SetTrainerTowerNPCGraphics();
     }
@@ -570,66 +570,70 @@ static void sub_815DD44(void)
 
 static void SetTrainerTowerNPCGraphics(void)
 {
-    s32 r3, r4;
-    u8 r1, r2, r4_;
-    switch (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType)
+    s32 i, j;
+    u8 trainerGfx1, trainerGfx2, facilityClass;
+    switch (CURR_FLOOR.challengeType)
     {
-    case 0:
-        r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass;
-        for (r3 = 0; r3 < NELEMS(sSingleBattleTrainerInfo); r3++)
+    case CHALLENGE_TYPE_SINGLE:
+        facilityClass = CURR_FLOOR.trainers[0].facilityClass;
+        for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++)
         {
-            if (sSingleBattleTrainerInfo[r3].facilityClass == r2)
+            if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass)
                 break;
         }
-        if (r3 != NELEMS(sSingleBattleTrainerInfo))
-            r1 = sSingleBattleTrainerInfo[r3].mapObjGfx;
+
+        if (i != NELEMS(sSingleBattleTrainerInfo))
+            trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx;
         else
-            r1 = 18;
-        VarSet(VAR_OBJ_GFX_ID_1, r1);
+            trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER;
+
+        VarSet(VAR_OBJ_GFX_ID_1, trainerGfx1);
         break;
-    case 1:
-        r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass;
-        for (r3 = 0; r3 < NELEMS(sDoubleBattleTrainerInfo); r3++)
+    case CHALLENGE_TYPE_DOUBLE:
+        facilityClass = CURR_FLOOR.trainers[0].facilityClass;
+        for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++)
         {
-            if (sDoubleBattleTrainerInfo[r3].facilityClass == r2)
+            if (sDoubleBattleTrainerInfo[i].facilityClass == facilityClass)
                 break;
         }
-        if (r3 != NELEMS(sDoubleBattleTrainerInfo))
+        if (i != NELEMS(sDoubleBattleTrainerInfo))
         {
-            r1  = sDoubleBattleTrainerInfo[r3].mapObjGfx1;
-            r4_ = sDoubleBattleTrainerInfo[r3].mapObjGfx2;
+            trainerGfx1  = sDoubleBattleTrainerInfo[i].objGfx1;
+            trainerGfx2 = sDoubleBattleTrainerInfo[i].objGfx2;
         }
         else
         {
-            r1  = OBJECT_EVENT_GFX_YOUNGSTER;
-            r4_ = OBJECT_EVENT_GFX_YOUNGSTER;
+            trainerGfx1  = OBJECT_EVENT_GFX_YOUNGSTER;
+            trainerGfx2 = OBJECT_EVENT_GFX_YOUNGSTER;
         }
-        VarSet(VAR_OBJ_GFX_ID_0, r1);
-        VarSet(VAR_OBJ_GFX_ID_3, r4_);
+        VarSet(VAR_OBJ_GFX_ID_0, trainerGfx1);
+        VarSet(VAR_OBJ_GFX_ID_3, trainerGfx2);
         break;
-    case 2:
-        for (r4 = 0; r4 < 3; r4++)
+    case CHALLENGE_TYPE_KNOCKOUT:
+        for (j = 0; j < MAX_TRAINERS_PER_FLOOR; j++)
         {
-            r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].facilityClass;
-            for (r3 = 0; r3 < NELEMS(sSingleBattleTrainerInfo); r3++)
+            facilityClass = CURR_FLOOR.trainers[j].facilityClass;
+            for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++)
             {
-                if (sSingleBattleTrainerInfo[r3].facilityClass == r2)
+                if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass)
                     break;
             }
-            if (r3 != NELEMS(sSingleBattleTrainerInfo))
-                r1 = sSingleBattleTrainerInfo[r3].mapObjGfx;
+
+            if (i != NELEMS(sSingleBattleTrainerInfo))
+                trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx;
             else
-                r1 = OBJECT_EVENT_GFX_YOUNGSTER;
-            switch (r4)
+                trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER;
+
+            switch (j)
             {
             case 0:
-                VarSet(VAR_OBJ_GFX_ID_2, r1);
+                VarSet(VAR_OBJ_GFX_ID_2, trainerGfx1);
                 break;
             case 1:
-                VarSet(VAR_OBJ_GFX_ID_0, r1);
+                VarSet(VAR_OBJ_GFX_ID_0, trainerGfx1);
                 break;
             case 2:
-                VarSet(VAR_OBJ_GFX_ID_1, r1);
+                VarSet(VAR_OBJ_GFX_ID_1, trainerGfx1);
                 break;
             }
         }
@@ -652,207 +656,224 @@ static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest)
     }
 }
 
-static void sub_815DF54(void)
+static void BufferTowerOpponentSpeech(void)
 {
-    u16 r4 = gSpecialVar_0x8006;
-    u8 r1;
-    u8 r5 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType;
+    u16 trainerId = gSpecialVar_0x8006;
+    u8 facilityClass;
+    u8 challengeType = CURR_FLOOR.challengeType;
     
-    if (r5 != 1)
-        r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].facilityClass;
+    if (challengeType != CHALLENGE_TYPE_DOUBLE)
+        facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass;
     else
-        r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass;
+        facilityClass = CURR_FLOOR.trainers[0].facilityClass;
+
     switch (gSpecialVar_0x8005)
     {
-    case 2:
-        TrainerTowerGetOpponentTextColor(r5, r1);
-        TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechBefore, gStringVar4);
+    case TRAINER_TOWER_TEXT_INTRO:
+        TrainerTowerGetOpponentTextColor(challengeType, facilityClass);
+        TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechBefore, gStringVar4);
         break;
-    case 3:
-        TrainerTowerGetOpponentTextColor(r5, r1);
-        TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechWin, gStringVar4);
+    case TRAINER_TOWER_TEXT_PLAYER_LOST:
+        TrainerTowerGetOpponentTextColor(challengeType, facilityClass);
+        TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechWin, gStringVar4);
         break;
-    case 4:
-        TrainerTowerGetOpponentTextColor(r5, r1);
-        TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechLose, gStringVar4);
+    case TRAINER_TOWER_TEXT_PLAYER_WON:
+        TrainerTowerGetOpponentTextColor(challengeType, facilityClass);
+        TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechLose, gStringVar4);
         break;
-    case 5:
-        TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechAfter, gStringVar4);
+    case TRAINER_TOWER_TEXT_AFTER:
+        TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechAfter, gStringVar4);
         break;
     }
 }
 
-static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass)
+static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass)
 {
-    u16 r5 = FALSE;
-    s32 r4;
-    switch (battleType)
+    u16 gender = MALE;
+    int i;
+    switch (challengeType)
     {
-    case 0:
-    case 2:
-        for (r4 = 0; r4 < NELEMS(sSingleBattleTrainerInfo); r4++)
+    case CHALLENGE_TYPE_SINGLE:
+    case CHALLENGE_TYPE_KNOCKOUT:
+        for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++)
         {
-            if (sSingleBattleTrainerInfo[r4].facilityClass == facilityClass)
+            if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass)
                 break;
         }
-        if (r4 != NELEMS(sSingleBattleTrainerInfo))
-            r5 = sSingleBattleTrainerInfo[r4].gender;
+        if (i != NELEMS(sSingleBattleTrainerInfo))
+            gender = sSingleBattleTrainerInfo[i].gender;
         break;
-    case 1:
-        for (r4 = 0; r4 < NELEMS(sDoubleBattleTrainerInfo); r4++)
+    case CHALLENGE_TYPE_DOUBLE:
+        for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++)
         {
-            if (sDoubleBattleTrainerInfo[r4].facilityClass == facilityClass)
+            if (sDoubleBattleTrainerInfo[i].facilityClass == facilityClass)
                 break;
         }
-        if (r4 != NELEMS(sDoubleBattleTrainerInfo))
+        if (i != NELEMS(sDoubleBattleTrainerInfo))
         {
             if (VarGet(VAR_TEMP_3))
-                r5 = sDoubleBattleTrainerInfo[r4].gender2;
+                gender = sDoubleBattleTrainerInfo[i].gender2;
             else
-                r5 = sDoubleBattleTrainerInfo[r4].gender1;
+                gender = sDoubleBattleTrainerInfo[i].gender1;
         }
         break;
     }
     gSpecialVar_PrevTextColor = gSpecialVar_TextColor;
-    gSpecialVar_TextColor = r5;
+    gSpecialVar_TextColor = gender;
 }
 
-static void sub_815E114(void)
+static void CB2_EndTrainerTowerBattle(void)
 {
     SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
-static void sub_815E124(u8 taskId)
+static void Task_DoTrainerTowerBattle(u8 taskId)
 {
     if (BT_IsDone() == TRUE)
     {
-        gMain.savedCallback = sub_815E114;
+        gMain.savedCallback = CB2_EndTrainerTowerBattle;
         CleanupOverworldWindowsAndTilemaps();
         SetMainCallback2(CB2_InitBattle);
         DestroyTask(taskId);
     }
 }
 
-static void sub_815E160(void)
+static void DoTrainerTowerBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_TRAINER_TOWER;
-    if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1)
+
+    if (CURR_FLOOR.challengeType == CHALLENGE_TYPE_DOUBLE)
         gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
+
     gTrainerBattleOpponent_A = 0;
     BuildEnemyParty();
-    CreateTask(sub_815E124, 1);
+    CreateTask(Task_DoTrainerTowerBattle, 1);
     PlayMapChosenOrBattleBGM(0);
     BT_StartOnField(BattleSetup_GetBattleTowerBattleTransition());
 }
 
-static void sub_815E1C0(void)
+static void TrainerTowerGetChallengeType(void)
 {
     if (!gSpecialVar_0x8005)
-        gSpecialVar_Result = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType;
+        gSpecialVar_Result = CURR_FLOOR.challengeType;
 }
 
-static void sub_815E1F0(void)
+static void TrainerTowerAddFloorCleared(void)
 {
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8++;
+    TRAINER_TOWER.floorsCleared++;
 }
 
-static void TTSpecial_HasReachedTheRoof(void)
+// So the player can safely go back through defeated floors to use the Poke Center (or exit challenge)
+static void GetFloorAlreadyCleared(void)
 {
     u16 mapLayoutId = gMapHeader.mapLayoutId;
-    if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
+    if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared 
+     && mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY <= CURR_FLOOR.floorIdx)
         gSpecialVar_Result = FALSE;
     else
         gSpecialVar_Result = TRUE;
 }
 
-static void sub_815E28C(void)
+static void StartTrainerTowerChallenge(void)
 {
-    gSaveBlock1Ptr->unkArrayIdx = gSpecialVar_0x8005;
-    if (gSaveBlock1Ptr->unkArrayIdx >= NELEMS(gSaveBlock1Ptr->unkArray))
-        gSaveBlock1Ptr->unkArrayIdx = 0;
+    gSaveBlock1Ptr->towerChallengeId = gSpecialVar_0x8005;
+    if (gSaveBlock1Ptr->towerChallengeId >= NUM_TOWER_CHALLENGE_TYPES)
+        gSaveBlock1Ptr->towerChallengeId = 0;
     ValidateOrResetCurTrainerTowerRecord();
-    if (!sub_815D834())
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = TRUE;
+    if (!ReadTrainerTowerAndValidate())
+        TRAINER_TOWER.validated = TRUE;
     else
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = FALSE;
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 = 0;
-    SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 0;
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = FALSE;
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = FALSE;
+        TRAINER_TOWER.validated = FALSE;
+    TRAINER_TOWER.floorsCleared = 0;
+    SetVBlankCounter1Ptr(&TRAINER_TOWER.timer);
+    TRAINER_TOWER.timer = 0;
+    TRAINER_TOWER.spokeToOwner = FALSE;
+    TRAINER_TOWER.checkedFinalTime = FALSE;
 }
 
-static void sub_815E394(void)
+static void GetOwnerState(void)
 {
     DisableVBlankCounter1();
     gSpecialVar_Result = 0;
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
+
+    if (TRAINER_TOWER.spokeToOwner)
         gSpecialVar_Result++;
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 && gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1)
+    if (TRAINER_TOWER.receivedPrize && TRAINER_TOWER.checkedFinalTime)
         gSpecialVar_Result++;
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = TRUE;
+
+    TRAINER_TOWER.spokeToOwner = TRUE;
 }
 
-static void sub_815E408(void)
+static void GiveChallengePrize(void)
 {
-    u16 itemId = gUnknown_847A2B4[sTrainerTowerState->unk_0004.floors->prize];
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0)
+    u16 itemId = sPrizeList[sTrainerTowerState->unk_0004.floors->prize];
+
+    if (TRAINER_TOWER.receivedPrize)
+    {
         gSpecialVar_Result = 2;
-    else if (AddBagItem(itemId, 1) == 1)
+    }
+    else if (AddBagItem(itemId, 1) == TRUE)
     {
         CopyItemName(itemId, gStringVar2);
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = TRUE;
+        TRAINER_TOWER.receivedPrize = TRUE;
         gSpecialVar_Result = 0;
     }
     else
+    {
         gSpecialVar_Result = 1;
+    }
 }
 
-static void sub_815E4B0(void)
+static void CheckFinalTime(void)
 {
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1)
+    if (TRAINER_TOWER.checkedFinalTime)
+    {
         gSpecialVar_Result = 2;
-    else if (GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4) > gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0)
+    }
+    else if (GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime) > TRAINER_TOWER.timer)
     {
-        SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4, gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+        SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER.timer);
         gSpecialVar_Result = 0;
     }
     else
+    {
         gSpecialVar_Result = 1;
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = TRUE;
+    }
+
+    TRAINER_TOWER.checkedFinalTime = TRUE;
 }
 
-static void TTSpecial_StartTimer(void)
+static void TrainerTowerResumeTimer(void)
 {
-    if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
+    if (!TRAINER_TOWER.spokeToOwner)
     {
-        if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 >= 215999)
-            gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 215999;
+        if (TRAINER_TOWER.timer >= TRAINER_TOWER_MAX_TIME)
+            TRAINER_TOWER.timer = TRAINER_TOWER_MAX_TIME;
         else
-            SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+            SetVBlankCounter1Ptr(&TRAINER_TOWER.timer);
     }
 }
 
-static void sub_815E5C4(void)
+static void TrainerTowerSetPlayerLost(void)
 {
-    gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3 = 1;
+    TRAINER_TOWER.hasLost = TRUE;
 }
 
-static void sub_815E5F0(void)
+static void GetTrainerTowerChallengeStatus(void)
 {
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3)
+    if (TRAINER_TOWER.hasLost)
     {
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3 = FALSE;
-        gSpecialVar_Result = 0;
+        TRAINER_TOWER.hasLost = FALSE;
+        gSpecialVar_Result = CHALLENGE_STATUS_LOST;
     }
-    else if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_4)
+    else if (TRAINER_TOWER.unkA_4)
     {
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_4 = FALSE;
-        gSpecialVar_Result = 1;
+        TRAINER_TOWER.unkA_4 = FALSE;
+        gSpecialVar_Result = CHALLENGE_STATUS_UNK;
     }
     else
     {
-        gSpecialVar_Result = 2;
+        gSpecialVar_Result = CHALLENGE_STATUS_NORMAL;
     }
 }
 
@@ -861,8 +882,8 @@ static void sub_815E5F0(void)
                                                                                            \
     frames = (src);                                                                        \
                                                                                            \
-    minutes = frames / 3600;                                                               \
-    frames %= 3600;                                                                        \
+    minutes = frames / (60 * 60);                                                          \
+    frames %= (60 * 60);                                                                   \
     seconds = frames / 60;                                                                 \
     frames %= 60;                                                                          \
     centiseconds = frames * 168 / 100;                                                     \
@@ -872,34 +893,34 @@ static void sub_815E5F0(void)
     ConvertIntToDecimalStringN(gStringVar3, centiseconds, STR_CONV_MODE_LEADING_ZEROS, 2); \
 })
 
-static void sub_815E658(void)
+static void GetCurrentTime(void)
 {
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 >= 215999)
+    if (TRAINER_TOWER.timer >= TRAINER_TOWER_MAX_TIME)
     {
         DisableVBlankCounter1();
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 215999;
+        TRAINER_TOWER.timer = TRAINER_TOWER_MAX_TIME;
     }
 
-    PRINT_TOWER_TIME(gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
+    PRINT_TOWER_TIME(TRAINER_TOWER.timer);
 }
 
-static void sub_815E720(void)
+static void ShowResultsBoard(void)
 {
     u8 windowId;
     s32 i;
 
     ValidateOrResetCurTrainerTowerRecord();
-    windowId = AddWindow(gUnknown_847A218);
+    windowId = AddWindow(sTimeBoardWindowTemplate);
     LoadStdWindowFrameGfx();
     DrawStdWindowFrame(windowId, FALSE);
-    AddTextPrinterParameterized(windowId, 2, gUnknown_83FE982, 0x4A, 0, 0xFF, NULL);
+    AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 0x4A, 0, 0xFF, NULL);
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
     {
-        PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4));
+        PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime));
 
-        StringExpandPlaceholders(gStringVar4, gUnknown_83FE998);
-        AddTextPrinterParameterized(windowId, 2, gUnknown_83FE9C4[i - 1], 0x18, 0x24 + 0x14 * i, 0xFF, NULL);
+        StringExpandPlaceholders(gStringVar4, gText_XMinYZSec);
+        AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 0x18, 0x24 + 0x14 * i, 0xFF, NULL);
         AddTextPrinterParameterized(windowId, 2, gStringVar4, 0x60, 0x2E + 0x14 * i, 0xFF, NULL);
     }
 
@@ -908,23 +929,24 @@ static void sub_815E720(void)
     VarSet(VAR_TEMP_1, windowId);
 }
 
-static void sub_815E88C(void)
+static void CloseResultsBoard(void)
 {
     u8 windowId = VarGet(VAR_TEMP_1);
     ClearStdWindowAndFrameToTransparent(windowId, TRUE);
     RemoveWindow(windowId);
 }
 
-static void sub_815E8B4(void)
+static void TrainerTowerGetDoublesEligiblity(void)
 {
     gSpecialVar_Result = GetMonsStateToDoubles();
 }
 
-static void sub_815E8CC(void)
+
+static void TrainerTowerGetNumFloors(void)
 {
-    if (sTrainerTowerState->unk_0004.count != sTrainerTowerState->unk_0004.floors[0].floorIdx)
+    if (sTrainerTowerState->unk_0004.numFloors != sTrainerTowerState->unk_0004.floors[0].floorIdx)
     {
-        ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->unk_0004.count, STR_CONV_MODE_LEFT_ALIGN, 1);
+        ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->unk_0004.numFloors, STR_CONV_MODE_LEFT_ALIGN, 1);
         gSpecialVar_Result = TRUE;
     }
     else
@@ -933,79 +955,78 @@ static void sub_815E8CC(void)
     }
 }
 
-static void sub_815E908(void)
+// Dummied? equivalent to gSpecialVar_Result = FALSE
+// If it were to return TRUE the player would be warped back to the lobby
+static void ShouldWarpToCounter(void)
 {
-    if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
-    {
+    if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
         gSpecialVar_Result = FALSE;
-    }
     else
-    {
         gSpecialVar_Result = FALSE;
-    }
 }
 
-static void sub_815E948(void)
+static void PlayTrainerTowerEncounterMusic(void)
 {
     s32 i;
-    u16 var_4001 = VarGet(VAR_TEMP_1);
-    u8 r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[var_4001].facilityClass;
+    u16 idx = VarGet(VAR_TEMP_1);
+    u8 facilityClass = CURR_FLOOR.trainers[idx].facilityClass;
 
     for (i = 0; i < NELEMS(sTrainerEncounterMusicLUT); i++)
     {
-        if (sTrainerEncounterMusicLUT[i].unk0 == gFacilityClassToTrainerClass[r1])
+        if (sTrainerEncounterMusicLUT[i].facilityClass == gFacilityClassToTrainerClass[facilityClass])
             break;
     }
+
     if (i != NELEMS(sTrainerEncounterMusicLUT))
     {
-        var_4001 = sTrainerEncounterMusicLUT[i].unk1;
+        idx = sTrainerEncounterMusicLUT[i].musicId;
     }
     else
     {
-        var_4001 = 0;
+        idx = 0;
     }
-    PlayNewMapMusic(gUnknown_847A2D2[var_4001]);
+    PlayNewMapMusic(sTrainerTowerEncounterMusic[idx]);
 }
 
-static void sub_815E9C8(void)
+static void HasSpokenToOwner(void)
 {
-    gSpecialVar_Result = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2;
+    gSpecialVar_Result = TRAINER_TOWER.spokeToOwner;
 }
 
 static void BuildEnemyParty(void)
 {
     u16 trainerIdx = VarGet(VAR_TEMP_1);
     s32 level = GetPartyMaxLevel();
-    u8 floorIdx = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8;
+    u8 floorIdx = TRAINER_TOWER.floorsCleared;
     s32 i;
     u8 monIdx;
 
     ZeroEnemyPartyMons();
 
-    switch (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType)
+    switch (CURR_FLOOR.challengeType)
     {
-    case 0:
+    case CHALLENGE_TYPE_SINGLE:
     default:
         for (i = 0; i < 2; i++)
         {
             monIdx = sSingleBattleChallengeMonIdxs[floorIdx][i];
-            sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx].level = level;
-            CreateBattleTowerMon(&gEnemyParty[i], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx]);
+            CURR_FLOOR.trainers[trainerIdx].mons[monIdx].level = level;
+            CreateBattleTowerMon(&gEnemyParty[i], &CURR_FLOOR.trainers[trainerIdx].mons[monIdx]);
         }
         break;
-    case 1:
+    case CHALLENGE_TYPE_DOUBLE:
         monIdx = sDoubleBattleChallengeMonIdxs[floorIdx][0];
-        sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].mons[monIdx].level = level;
-        CreateBattleTowerMon(&gEnemyParty[0], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].mons[monIdx]);
+        CURR_FLOOR.trainers[0].mons[monIdx].level = level;
+        CreateBattleTowerMon(&gEnemyParty[0], &CURR_FLOOR.trainers[0].mons[monIdx]);
 
         monIdx = sDoubleBattleChallengeMonIdxs[floorIdx][1];
-        sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[1].mons[monIdx].level = level;
-        CreateBattleTowerMon(&gEnemyParty[1], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[1].mons[monIdx]);
+        CURR_FLOOR.trainers[1].mons[monIdx].level = level;
+        CreateBattleTowerMon(&gEnemyParty[1], &CURR_FLOOR.trainers[1].mons[monIdx]);
         break;
-    case 2:
+    case CHALLENGE_TYPE_KNOCKOUT:
         monIdx = sKnockoutChallengeMonIdxs[floorIdx][trainerIdx];
-        sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx].level = level;
-        CreateBattleTowerMon(&gEnemyParty[0], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx]);
+        CURR_FLOOR.trainers[trainerIdx].mons[monIdx].level = level;
+        CreateBattleTowerMon(&gEnemyParty[0], &CURR_FLOOR.trainers[trainerIdx].mons[monIdx]);
         break;
     }
 }
@@ -1030,11 +1051,11 @@ static s32 GetPartyMaxLevel(void)
 
 static void ValidateOrResetCurTrainerTowerRecord(void)
 {
-    if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk9 != sTrainerTowerState->unk_0004.id)
+    if (TRAINER_TOWER.unk9 != sTrainerTowerState->unk_0004.id)
     {
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk9 = sTrainerTowerState->unk_0004.id;
-        SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4, 215999);
-        gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = FALSE;
+        TRAINER_TOWER.unk9 = sTrainerTowerState->unk_0004.id;
+        SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER_MAX_TIME);
+        TRAINER_TOWER.receivedPrize = FALSE;
     }
 }
 
@@ -1043,22 +1064,22 @@ void PrintTrainerTowerRecords(void)
     s32 i;
     u8 windowId = 0;
 
-    sub_815DC8C();
+    SetUpTrainerTowerDataStruct();
     FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90);
     ValidateOrResetCurTrainerTowerRecord();
-    AddTextPrinterParameterized3(0, 2, 0x4a, 0, gUnknown_847A22C, 0, gUnknown_83FE982);
+    AddTextPrinterParameterized3(0, 2, 0x4a, 0, sTextColors, 0, gText_TimeBoard);
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
     {
-        PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[i].unk4));
-        StringExpandPlaceholders(gStringVar4, gUnknown_83FE998);
-        AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
-        AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gStringVar4);
+        PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime));
+        StringExpandPlaceholders(gStringVar4, gText_XMinYZSec);
+        AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]);
+        AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4);
     }
 
     PutWindowTilemap(windowId);
     CopyWindowToVram(windowId, 3);
-    sub_815DD2C();
+    FreeTrainerTowerDataStruct();
 }
 
 static u32 GetTrainerTowerRecordTime(u32 *counter)
@@ -1075,8 +1096,8 @@ void ResetTrainerTowerResults(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
     {
-        SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[i].unk4, 215999);
+        SetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime, TRAINER_TOWER_MAX_TIME);
     }
 }
diff --git a/src/union_room.c b/src/union_room.c
index f942fb7d3..f3aeeebc5 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -37,6 +37,7 @@
 #include "trade_scene.h"
 #include "trainer_card.h"
 #include "union_room.h"
+#include "union_room_battle.h"
 #include "union_room_chat.h"
 #include "rfu_union_tool.h"
 #include "union_room_message.h"
@@ -45,13 +46,14 @@
 #include "constants/cable_club.h"
 #include "constants/field_weather.h"
 #include "constants/species.h"
+#include "constants/union_room.h"
 
 static EWRAM_DATA u8 sUnionRoomPlayerName[12] = {};
-static EWRAM_DATA u8 gUnknown_203B058 = 0;
-static EWRAM_DATA u8 gUnknown_203B059 = 0;
+static EWRAM_DATA u8 sPlayerCurrActivity = 0;
+static EWRAM_DATA u8 sPlayerActivityGroupSize = 0;
 static EWRAM_DATA union UnkUnion_Main sUnionRoomMain = {};
 static EWRAM_DATA u32 sUnref_203B060 = 0;
-EWRAM_DATA struct GFtgtGnameSub gUnknown_203B064 = {};
+EWRAM_DATA struct GFtgtGnameSub gPartnerTgtGnameSub = {};
 EWRAM_DATA u16 gUnionRoomOfferedSpecies = SPECIES_NONE;
 EWRAM_DATA u8 gUnionRoomRequestedMonType = TYPE_NORMAL;
 static EWRAM_DATA struct UnionRoomTrade sUnionRoomTrade = {};
@@ -60,103 +62,103 @@ static struct UnkStruct_Leader * sLeader;
 static struct UnkStruct_Group * sGroup;
 static struct UnkStruct_URoom * sURoom;
 
-static void sub_8115A68(u8 taskId);
-static void sub_81161E4(struct UnkStruct_Leader * leader);
-static bool8 sub_8116444(struct UnkStruct_Leader * leader, u32 a1, u32 a2);
-static void sub_81164C8(u8 windowId, s32 itemId, u8 y);
-static u8 sub_8116524(struct UnkStruct_Main0 * a0);
-static u8 sub_81165E8(struct UnkStruct_Main0 * a0);
-static void sub_8116738(u8 taskId);
-static u32 sub_8116D10(struct UnkStruct_Group * group, s32 id);
-static void sub_8116D60(struct UnkStruct_Group * group, s32 id);
-static void sub_8116E1C(u8 taskId);
-static void sub_8116F94(u8 windowId, s32 itemId, u8 y);
-static u8 sub_8116FE4(void);
-static void sub_8117990(void);
-static void sub_81179A4(void);
-static void sub_8117A0C(u8 taskId);
-static void sub_8117F20(u8 taskId);
-static void sub_81182DC(u8 taskId);
-static void sub_81186E0(u8 taskId);
+static void Task_TryBecomeLinkLeader(u8 taskId);
+static void Leader_DestroyResources(struct UnkStruct_Leader * leader);
+static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * leader, u32 state1, u32 state2);
+static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, s32 itemId, u8 y);
+static u8 LeaderUpdateGroupMembership(struct UnkStruct_Main0 * main0);
+static u8 UnionRoomLeaderField0CompactionAndCount(struct UnkStruct_Main0 * main0);
+static void Task_TryJoinLinkGroup(u8 taskId);
+static u32 IsTryingToTradeWithHoennTooSoon(struct UnkStruct_Group * group, s32 id);
+static void AskToJoinRfuGroup(struct UnkStruct_Group * group, s32 id);
+static void Task_ListenToWireless(u8 taskId);
+static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, s32 itemId, u8 y);
+static u8 GetNewLeaderCandidate(void);
+static void CreateTask_RunScriptAndFadeToActivity(void);
+static void CreateTask_StartActivity(void);
+static void Task_MEvent_Leader(u8 taskId);
+static void Task_CardOrNewsWithFriend(u8 taskId);
+static void Task_CardOrNewsOverWireless(u8 taskId);
+static void Task_RunUnionRoom(u8 taskId);
 static u16 ReadAsU16(const u8 *data);
-static void sub_8119904(struct UnkStruct_URoom * uRoom);
-static bool32 sub_8119944(struct UnkStruct_URoom * uRoom);
-static void sub_81199FC(u8 taskId);
-static u8 sub_8119B94(void);
-static u8 sub_8119E84(struct UnkStruct_Main4 * arg0, struct UnkStruct_Main4 * arg1, u32 arg2);
-static bool32 sub_8119FB0(struct GFtgtGname * arg0, s16 arg1);
-static u8 sub_811A054(struct UnkStruct_Main4 * arg0, u32 arg1);
-static u8 sub_811A084(struct UnkStruct_Main4 * arg0, u32 arg1);
-static bool32 sub_811A0B4(const u8 * str);
-static bool32 sub_811A0E0(void);
+static void ReceiveUnionRoomActivityPacket(struct UnkStruct_URoom * uRoom);
+static bool32 UnionRoom_HandleContactFromOtherPlayer(struct UnkStruct_URoom * uRoom);
+static void Task_InitUnionRoom(u8 taskId);
+static u8 HandlePlayerListUpdate(void);
+static u8 CreateTask_SearchForChildOrParent(struct UnkStruct_Main4 * main4, struct UnkStruct_Main4 * arg1, u32 arg2);
+static bool32 GetGnameWonderFlagByLinkGroup(struct GFtgtGname * gname, s16 linkGroup);
+static u8 CreateTask_ListenForPartnersWithCompatibleSerialNos(struct UnkStruct_Main4 * main4, u32 linkGroup);
+static u8 CreateTask_ListenForPartnersWithSerial7F7D(struct UnkStruct_Main4 * main4, u32 linkGroup);
+static bool32 UR_PrintFieldMessage(const u8 * str);
+static bool32 UR_RunTextPrinters_CheckPrinter0Active(void);
 static bool8 PrintOnTextbox(u8 *textState, const u8 *str);
-static s8 sub_811A14C(u8 *dest, bool32 arg1);
-static s32 sub_811A218(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate);
-static s32 sub_811A2EC(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate, struct UnkStruct_Main0 * arg6);
-static void sub_811A3F8(void);
-static void sub_811A41C(void);
-static void sub_811A444(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx);
-static void sub_811A5E4(struct UnkStruct_x20 * arg0, u8 count);
-static void sub_811A650(struct UnkStruct_x1C * arg0, u8 count);
-static bool8 sub_811A694(struct UnkStruct_Shared * arg0, const struct UnkStruct_Shared * arg1);
-static bool32 sub_811A6DC(struct UnkStruct_Shared * arg0, struct UnkStruct_Shared * arg1);
-static u32 sub_811A748(struct UnkStruct_x20 * arg0, struct UnkStruct_x1C * arg1);
-static u8 sub_811A798(struct UnkStruct_x20 * arg0, struct UnkStruct_x1C * arg1, u8 arg2);
-static void sub_811A81C(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * arg3, u8 arg4, u8 id);
-static void sub_811A910(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 * arg3, u8 arg4, u8 id);
-static bool32 sub_811A9B8(void);
-static u32 sub_811A9FC(s32 a0);
-static u32 sub_811AA24(struct UnkStruct_x20 * unkX20);
-static s32 sub_811AA5C(struct UnkStruct_Main0 * arg0, u8 arg1, u8 arg2, u32 playerGender);
+static s8 UnionRoomHandleYesNo(u8 *state_p, bool32 no_draw);
+static s32 ListMenuHandler_AllItemsAvailable(u8 *state_p, u8 *win_id_p, u8 *list_menu_id_p, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate);
+static s32 TradeBoardMenuHandler(u8 *state_p, u8 *win_id_p, u8 *list_menu_id_p, u8 *trade_board_win_id_p, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate, struct UnkStruct_Main0 * traders);
+static void UR_BlankBg0(void);
+static void JoinGroup_BlankBg0AndEnableScriptContexts(void);
+static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx);
+static void BlankUnkStruct_x20Array(struct UnkStruct_x20 * x20, u8 count);
+static void BlankUnkStruct_x1CArray(struct UnkStruct_x1C * x1C, u8 count);
+static bool8 AreGnameUnameDifferent(struct UnionGnameUnamePair * arg0, const struct UnionGnameUnamePair * arg1);
+static bool32 AreUnionRoomPlayerGnamesDifferent(struct UnionGnameUnamePair * arg0, struct UnionGnameUnamePair * arg1);
+static u32 Findx20Inx1CArray(struct UnkStruct_x20 * x20, struct UnkStruct_x1C * x1Carr);
+static u8 Appendx1Ctox20(struct UnkStruct_x20 * x20arr, struct UnkStruct_x1C * x1C, u8 count);
+static void PrintUnionRoomGroupOnWindow(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * group, u8 colorIdx, u8 id);
+static void PrintGroupMemberCandidateOnWindowWithColor(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * group, u8 colorIdx, u8 id);
+static bool32 PlayerIsTalkingToUnionRoomAide(void);
+static u32 GetResponseIdx_InviteToURoomActivity(s32 activity);
+static u32 ConvPartnerUnameAndGetWhetherMetAlready(struct UnkStruct_x20 * unkX20);
+static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, u8 overrideGender, u8 playerIdx, u32 playerGender);
 static void nullsub_92(u8 windowId, s32 itemId, u8 y);
-static void sub_811ACA4(u8 windowId, s32 itemId, u8 y);
-static s32 sub_811AD7C(struct UnkStruct_x20 * arg, s32 arg1);
-static s32 GetUnionRoomPlayerGender(s32 a0, struct UnkStruct_Main0 * a1);
-static s32 sub_811ADD0(u32 type, u32 species);
-static void sub_811AE68(u8 *dst, s32 arg1, u32 playerGender);
-static void sub_811AECC(u8 *dst, u8 arg1);
-static s32 sub_811AF6C(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom * arg3);
-static bool32 sub_811B0A4(struct UnkStruct_URoom * arg0);
+static void TradeBoardListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y);
+static s32 GetIndexOfNthTradeBoardOffer(struct UnkStruct_x20 * x20, s32 n);
+static s32 GetUnionRoomPlayerGender(s32 playerIdx, struct UnkStruct_Main0 * main0);
+static s32 IsRequestedTypeAndSpeciesInPlayerParty(u32 type, u32 species);
+static void GetURoomActivityRejectMsg(u8 *dst, s32 activity, u32 playerGender);
+static void GetURoomActivityStartMsg(u8 *dst, u8 activity);
+static s32 GetChatLeaderActionRequestMessage(u8 *dst, u32 gender, u16 *activity_p, struct UnkStruct_URoom * uroom);
+static bool32 PollPartnerYesNoResponse(struct UnkStruct_URoom * uroom);
 static bool32 HasAtLeastTwoMonsOfLevel30OrLower(void);
 static void ResetUnionRoomTrade(struct UnionRoomTrade * trade);
 static bool32 RegisterTradeMonAndGetIsEgg(u32 monId, struct UnionRoomTrade * trade);
 static void RegisterTradeMon(u32 monId, struct UnionRoomTrade * trade);
 static u32 GetPartyPositionOfRegisteredMon(struct UnionRoomTrade * trade, u8 mpId);
-static void sub_811B258(bool32 a0);
-static void sub_811B298(void);
-static u8 sub_811B2A8(s32 a0);
-static u8 sub_811B2D8(struct UnkStruct_URoom * arg0);
-static void sub_811B31C(u8 *dest, struct UnkStruct_URoom * uRoom, bool8 gender);
+static void HandleCancelTrade(bool32 unlockObjs);
+static void UR_EnableScriptContext2AndFreezeObjectEvents(void);
+static u8 GetSinglePartnerSpriteGenderParam(s32 linkPlayer);
+static u8 GetActivePartnerSpriteGenderParam(struct UnkStruct_URoom * uroom);
+static void ViewURoomPartnerTrainerCard(u8 *dest, struct UnkStruct_URoom * uRoom, bool8 parent_child);
 
 #define _8456CD8(a, b) ((a) | ((b) << 8))
 
-static const u8 *const gUnknown_8456C74[] = {
-    gUnknown_84571AC,
-    gUnknown_8459394,
-    gUnknown_84593A4,
-    gUnknown_84593B4,
-    gUnknown_84593C4,
-    gUnknown_84593D4,
-    gUnknown_84593E4,
-    gUnknown_84593F4,
-    gUnknown_84593DC,
-    gUnknown_8459400,
-    gUnknown_8459410,
-    gUnknown_845941C,
-    gUnknown_845942C,
-    gUnknown_8459434,
-    gUnknown_8459440,
-    gUnknown_84571AC,
-    gUnknown_84571AC,
-    gUnknown_84571AC,
-    gUnknown_84571AC,
-    gUnknown_84571AC,
-    gUnknown_84571AC,
-    gUnknown_84593E4,
-    gUnknown_84593F4
+static const u8 *const sUnionRoomActivityStringPtrs[] = {
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_SingleBattle,
+    gUnionRoomActivity_DoubleBattle,
+    gUnionRoomActivity_MultiBattle,
+    gUnionRoomActivity_PokemonTrades,
+    gUnionRoomActivity_Chat,
+    gUnionRoomActivity_WonderCards,
+    gunionRoomActivity_WonderNews,
+    gUnionRoomActivity_Cards,
+    gUnionRoomActivity_PokemonJump,
+    gUnionRoomActivity_BerryCrush,
+    gUnionRoomActivity_BerryPicking,
+    gUnionRoomActivity_Search,
+    gUnionRoomActivity_SpinTradeJP,
+    gUnionRoomActivity_ItemTradeJP,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_Blank,
+    gUnionRoomActivity_WonderCards,
+    gunionRoomActivity_WonderNews
 };
 
-static const struct WindowTemplate gUnknown_8456CD0 = {
+static const struct WindowTemplate sWindowTemplate_BButtonCancel = {
     .bg = 0,
     .tilemapLeft = 0,
     .tilemapTop = 0,
@@ -166,19 +168,19 @@ static const struct WindowTemplate gUnknown_8456CD0 = {
     .baseBlock = 0x008
 };
 
-static const u32 gUnknown_8456CD8[] = {
-    _8456CD8( 1,  2),
-    _8456CD8( 2,  2),
-    _8456CD8( 3,  4),
-    _8456CD8( 4,  2),
-    _8456CD8( 9, 37),
-    _8456CD8(10, 37),
-    _8456CD8(11, 53),
-    _8456CD8(13, 53),
-    _8456CD8(14, 53)
+static const u32 sLinkGroupToActivityAndCapacity[] = {
+    [LINK_GROUP_SINGLE_BATTLE] = _8456CD8(ACTIVITY_BATTLE,    2),
+    [LINK_GROUP_DOUBLE_BATTLE] = _8456CD8(ACTIVITY_DBLBATTLE, 2),
+    [LINK_GROUP_MULTI_BATTLE]  = _8456CD8(ACTIVITY_MLTBATTLE, 4),
+    [LINK_GROUP_TRADE]         = _8456CD8(ACTIVITY_TRADE,     2),
+    [LINK_GROUP_POKEMON_JUMP]  = _8456CD8(ACTIVITY_PJUMP,     5 | 0x20),
+    [LINK_GROUP_BERRY_CRUSH]   = _8456CD8(ACTIVITY_BCRUSH,    5 | 0x20),
+    [LINK_GROUP_BERRY_PICKING] = _8456CD8(ACTIVITY_BPICK,     5 | 0x30),
+    [LINK_GROUP_WONDER_CARD]   = _8456CD8(ACTIVITY_SPINTRADE, 5 | 0x30),
+    [LINK_GROUP_WONDER_NEWS]   = _8456CD8(ACTIVITY_ITEMTRADE, 5 | 0x30)
 };
 
-static const struct WindowTemplate gUnknown_8456CFC = {
+static const struct WindowTemplate sWindowTemplate_List_PossibleGroupMembers = {
     .bg = 0,
     .tilemapLeft = 1,
     .tilemapTop = 3,
@@ -188,7 +190,7 @@ static const struct WindowTemplate gUnknown_8456CFC = {
     .baseBlock = 0x044
 };
 
-static const struct WindowTemplate gUnknown_8456D04 = {
+static const struct WindowTemplate sWindowTemplate_NumPlayerMode = {
     .bg = 0,
     .tilemapLeft = 16,
     .tilemapTop = 3,
@@ -198,18 +200,18 @@ static const struct WindowTemplate gUnknown_8456D04 = {
     .baseBlock = 0x0C6
 };
 
-const struct ListMenuItem gUnknown_8456D0C[] = {
-    {gUnknown_84571AC, 0},
-    {gUnknown_84571AC, 1},
-    {gUnknown_84571AC, 2},
-    {gUnknown_84571AC, 3},
-    {gUnknown_84571AC, 4}
+const struct ListMenuItem sListMenuItems_PossibleGroupMembers[] = {
+    {gUnionRoomActivity_Blank, 0},
+    {gUnionRoomActivity_Blank, 1},
+    {gUnionRoomActivity_Blank, 2},
+    {gUnionRoomActivity_Blank, 3},
+    {gUnionRoomActivity_Blank, 4}
 };
 
-static const struct ListMenuTemplate gUnknown_8456D34 = {
-    .items = gUnknown_8456D0C,
+static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = {
+    .items = sListMenuItems_PossibleGroupMembers,
     .moveCursorFunc = NULL,
-    .itemPrintFunc = sub_81164C8,
+    .itemPrintFunc = ItemPrintFunc_PossibleGroupMembers,
     .totalItems = 5,
     .maxShowed = 5,
     .windowId = 0,
@@ -227,7 +229,7 @@ static const struct ListMenuTemplate gUnknown_8456D34 = {
     .cursorKind = 1
 };
 
-static const struct WindowTemplate gUnknown_8456D4C = {
+static const struct WindowTemplate sWindowTemplate_MysteryGiftList = {
     .bg = 0,
     .tilemapLeft = 1,
     .tilemapTop = 3,
@@ -237,7 +239,7 @@ static const struct WindowTemplate gUnknown_8456D4C = {
     .baseBlock = 0x044
 };
 
-static const struct WindowTemplate gUnknown_8456D54 = {
+static const struct WindowTemplate sWindowTemplate_MysteryGiftPlayerNameAndId = {
     .bg = 0,
     .tilemapLeft = 20,
     .tilemapTop = 3,
@@ -247,29 +249,29 @@ static const struct WindowTemplate gUnknown_8456D54 = {
     .baseBlock = 0x0EE
 };
 
-static const struct ListMenuItem gUnknown_8456D5C[] = {
-    {gUnknown_84571AC,  0},
-    {gUnknown_84571AC,  1},
-    {gUnknown_84571AC,  2},
-    {gUnknown_84571AC,  3},
-    {gUnknown_84571AC,  4},
-    {gUnknown_84571AC,  5},
-    {gUnknown_84571AC,  6},
-    {gUnknown_84571AC,  7},
-    {gUnknown_84571AC,  8},
-    {gUnknown_84571AC,  9},
-    {gUnknown_84571AC, 10},
-    {gUnknown_84571AC, 11},
-    {gUnknown_84571AC, 12},
-    {gUnknown_84571AC, 13},
-    {gUnknown_84571AC, 14},
-    {gUnknown_84571AC, 15}
+static const struct ListMenuItem sListMenuItems_UnionRoomGroups[] = {
+    {gUnionRoomActivity_Blank,  0},
+    {gUnionRoomActivity_Blank,  1},
+    {gUnionRoomActivity_Blank,  2},
+    {gUnionRoomActivity_Blank,  3},
+    {gUnionRoomActivity_Blank,  4},
+    {gUnionRoomActivity_Blank,  5},
+    {gUnionRoomActivity_Blank,  6},
+    {gUnionRoomActivity_Blank,  7},
+    {gUnionRoomActivity_Blank,  8},
+    {gUnionRoomActivity_Blank,  9},
+    {gUnionRoomActivity_Blank, 10},
+    {gUnionRoomActivity_Blank, 11},
+    {gUnionRoomActivity_Blank, 12},
+    {gUnionRoomActivity_Blank, 13},
+    {gUnionRoomActivity_Blank, 14},
+    {gUnionRoomActivity_Blank, 15}
 };
 
-static const struct ListMenuTemplate gUnknown_8456DDC = {
-    .items = gUnknown_8456D5C,
+static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = {
+    .items = sListMenuItems_UnionRoomGroups,
     .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
-    .itemPrintFunc = sub_8116F94,
+    .itemPrintFunc = ListMenuItemPrintFunc_UnionRoomGroups,
     .totalItems = 16,
     .maxShowed = 5,
     .windowId = 0,
@@ -287,7 +289,7 @@ static const struct ListMenuTemplate gUnknown_8456DDC = {
     .cursorKind = 0
 };
 
-static const struct WindowTemplate gUnknown_8456DF4 = {
+static const struct WindowTemplate sWindowTemplate_InviteToActivity = {
     .bg = 0,
     .tilemapLeft = 20,
     .tilemapTop = 6,
@@ -297,15 +299,15 @@ static const struct WindowTemplate gUnknown_8456DF4 = {
     .baseBlock = 0x001
 };
 
-static const struct ListMenuItem gUnknown_8456DFC[] = {
-    {gUnknown_8459354,  _8456CD8( 8, 2)},
-    {gUnknown_8459344,  _8456CD8(65, 2)},
-    {gUnknown_845934C,  _8456CD8(69, 2)},
-    {gUnknown_8459360,  _8456CD8(64, 0)}
+static const struct ListMenuItem sListMenuItems_InviteToActivity[] = {
+    {gUnknown_8459354,  _8456CD8( ACTIVITY_CARD, 2)},
+    {gUnknown_8459344,  _8456CD8(ACTIVITY_BATTLE | IN_UNION_ROOM, 2)},
+    {gUnknown_845934C,  _8456CD8(ACTIVITY_CHAT | IN_UNION_ROOM, 2)},
+    {gUnknown_8459360,  _8456CD8(ACTIVITY_NONE | IN_UNION_ROOM, 0)}
 };
 
-static const struct ListMenuTemplate gUnknown_8456E1C = {
-    .items = gUnknown_8456DFC,
+static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = {
+    .items = sListMenuItems_InviteToActivity,
     .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
     .itemPrintFunc = NULL,
     .totalItems = 4,
@@ -325,7 +327,7 @@ static const struct ListMenuTemplate gUnknown_8456E1C = {
     .cursorKind = 0
 };
 
-static const struct WindowTemplate gUnknown_8456E34 = {
+static const struct WindowTemplate sWindowTemplate_TradeBoardRegisterInfoExit = {
     .bg = 0,
     .tilemapLeft = 18,
     .tilemapTop = 8,
@@ -341,7 +343,7 @@ static const struct ListMenuItem gUnknown_8456E3C[] = {
     {gUnknown_8459360, 3}
 };
 
-static const struct ListMenuTemplate gUnknown_8456E54 = {
+static const struct ListMenuTemplate sListMenuTemplate_TradeBoardRegisterInfoExit = {
     .items = gUnknown_8456E3C,
     .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
     .itemPrintFunc = NULL,
@@ -362,7 +364,7 @@ static const struct ListMenuTemplate gUnknown_8456E54 = {
     .cursorKind = 0
 };
 
-static const struct WindowTemplate gUnknown_8456E6C = {
+static const struct WindowTemplate sWindowTemplate_TypeNames = {
     .bg = 0,
     .tilemapLeft = 20,
     .tilemapTop = 2,
@@ -372,7 +374,7 @@ static const struct WindowTemplate gUnknown_8456E6C = {
     .baseBlock = 0x001
 };
 
-static const struct ListMenuItem gUnknown_8456E74[] = {
+static const struct ListMenuItem sListMenuItems_TypeNames[] = {
     {gTypeNames[TYPE_NORMAL],     TYPE_NORMAL},
     {gTypeNames[TYPE_FIRE],         TYPE_FIRE},
     {gTypeNames[TYPE_WATER],       TYPE_WATER},
@@ -393,8 +395,8 @@ static const struct ListMenuItem gUnknown_8456E74[] = {
     {gUnknown_8459360,           NUMBER_OF_MON_TYPES}
 };
 
-static const struct ListMenuTemplate gUnknown_8456F04 = {
-    .items = gUnknown_8456E74,
+static const struct ListMenuTemplate sListMenuTemplate_TypeNames = {
+    .items = sListMenuItems_TypeNames,
     .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
     .itemPrintFunc = NULL,
     .totalItems = NUMBER_OF_MON_TYPES,
@@ -414,7 +416,7 @@ static const struct ListMenuTemplate gUnknown_8456F04 = {
     .cursorKind = 0
 };
 
-static const struct WindowTemplate gUnknown_8456F1C = {
+static const struct WindowTemplate sTradeBoardWindowTemplate = {
     .bg = 0,
     .tilemapLeft = 1,
     .tilemapTop = 1,
@@ -434,23 +436,23 @@ static const struct WindowTemplate gUnknown_8456F24 = {
     .baseBlock = 0x039
 };
 
-static const struct ListMenuItem gUnknown_8456F2C[] = {
-    {gUnknown_84571AC, -3},
-    {gUnknown_84571AC, 0},
-    {gUnknown_84571AC, 1},
-    {gUnknown_84571AC, 2},
-    {gUnknown_84571AC, 3},
-    {gUnknown_84571AC, 4},
-    {gUnknown_84571AC, 5},
-    {gUnknown_84571AC, 6},
-    {gUnknown_84571AC, 7},
+static const struct ListMenuItem sTradeBoardListMenuItems[] = {
+    {gUnionRoomActivity_Blank, -3},
+    {gUnionRoomActivity_Blank, 0},
+    {gUnionRoomActivity_Blank, 1},
+    {gUnionRoomActivity_Blank, 2},
+    {gUnionRoomActivity_Blank, 3},
+    {gUnionRoomActivity_Blank, 4},
+    {gUnionRoomActivity_Blank, 5},
+    {gUnionRoomActivity_Blank, 6},
+    {gUnionRoomActivity_Blank, 7},
     {gUnknown_8459368, 8}
 };
 
-static const struct ListMenuTemplate gUnknown_8456F7C = {
-    .items = gUnknown_8456F2C,
+static const struct ListMenuTemplate sTradeBoardListMenuTemplate = {
+    .items = sTradeBoardListMenuItems,
     .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
-    .itemPrintFunc = sub_811ACA4,
+    .itemPrintFunc = TradeBoardListMenuItemPrintFunc,
     .totalItems = 10,
     .maxShowed = 5,
     .windowId = 0,
@@ -479,22 +481,22 @@ static const struct WindowTemplate gUnknown_8456F94 = {
 };
 
 static const struct ListMenuItem gUnknown_8456F9C[] = {
-    {gUnknown_84571AC,  0},
-    {gUnknown_84571AC,  1},
-    {gUnknown_84571AC,  2},
-    {gUnknown_84571AC,  3},
-    {gUnknown_84571AC,  4},
-    {gUnknown_84571AC,  5},
-    {gUnknown_84571AC,  6},
-    {gUnknown_84571AC,  7},
-    {gUnknown_84571AC,  8},
-    {gUnknown_84571AC,  9},
-    {gUnknown_84571AC, 10},
-    {gUnknown_84571AC, 11},
-    {gUnknown_84571AC, 12},
-    {gUnknown_84571AC, 13},
-    {gUnknown_84571AC, 14},
-    {gUnknown_84571AC, 15}
+    {gUnionRoomActivity_Blank,  0},
+    {gUnionRoomActivity_Blank,  1},
+    {gUnionRoomActivity_Blank,  2},
+    {gUnionRoomActivity_Blank,  3},
+    {gUnionRoomActivity_Blank,  4},
+    {gUnionRoomActivity_Blank,  5},
+    {gUnionRoomActivity_Blank,  6},
+    {gUnionRoomActivity_Blank,  7},
+    {gUnionRoomActivity_Blank,  8},
+    {gUnionRoomActivity_Blank,  9},
+    {gUnionRoomActivity_Blank, 10},
+    {gUnionRoomActivity_Blank, 11},
+    {gUnionRoomActivity_Blank, 12},
+    {gUnionRoomActivity_Blank, 13},
+    {gUnionRoomActivity_Blank, 14},
+    {gUnionRoomActivity_Blank, 15}
 };
 
 static const struct ListMenuTemplate gUnknown_845701C = {
@@ -518,54 +520,138 @@ static const struct ListMenuTemplate gUnknown_845701C = {
     .cursorKind = 0
 };
 
-static const struct UnkStruct_Shared gUnknown_8457034 = {};
+static const struct UnionGnameUnamePair sUnionGnameUnamePair_Dummy = {};
 
 // starts at gUnknown_082F0474 in pokeemerald, union link groups
 
-ALIGNED(4) static const u8 gUnknown_845704C[] = {0x01, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457050[] = {0x02, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457054[] = {0x03, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457058[] = {0x04, 0xFF};
-ALIGNED(4) static const u8 gUnknown_845705C[] = {0x09, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457060[] = {0x0A, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457064[] = {0x0B, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457068[] = {0x15, 0xFF};
-ALIGNED(4) static const u8 gUnknown_845706C[] = {0x16, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457070[] = {0x40, 0x41, 0x44, 0x45, 0x48, 0x51, 0x52, 0x53, 0x54, 0xFF};
-ALIGNED(4) static const u8 gUnknown_845707C[] = {0x0C, 0xFF};
-ALIGNED(4) static const u8 gUnknown_8457080[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0x0D, 0xFF};
-ALIGNED(4) static const u8 gUnknown_845708C[] = {0x01, 0x02, 0x03, 0x04, 0x0A, 0xFF};
-
-static const u8 *const gUnknown_8457094[] = {
-    gUnknown_845704C,
-    gUnknown_8457050,
-    gUnknown_8457054,
-    gUnknown_8457058,
-    gUnknown_845705C,
-    gUnknown_8457060,
-    gUnknown_8457064,
-    gUnknown_8457068,
-    gUnknown_845706C,
-    gUnknown_8457070,
-    gUnknown_845707C,
-    gUnknown_8457080,
-    gUnknown_845708C
+ALIGNED(4) static const u8 gUnknown_845704C[] = {
+    ACTIVITY_BATTLE,
+    0xFF
 };
 
-static const u8 gUnknown_84570C8[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0xF7, 0x00, 0xAF, 0xF7, 0x01, 0xFF, 0x00};
+ALIGNED(4) static const u8 gUnknown_8457050[] = {
+    ACTIVITY_DBLBATTLE,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457054[] = {
+    ACTIVITY_MLTBATTLE,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457058[] = {
+    ACTIVITY_TRADE,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_845705C[] = {
+    ACTIVITY_PJUMP,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457060[] = {
+    ACTIVITY_BCRUSH,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457064[] = {
+    ACTIVITY_BPICK,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457068[] = {
+    ACTIVITY_WCARD2,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_845706C[] = {
+    ACTIVITY_WNEWS2,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457070[] = {
+    ACTIVITY_NONE | IN_UNION_ROOM,
+    ACTIVITY_BATTLE | IN_UNION_ROOM,
+    ACTIVITY_TRADE | IN_UNION_ROOM,
+    ACTIVITY_CHAT | IN_UNION_ROOM,
+    ACTIVITY_CARD | IN_UNION_ROOM,
+    ACTIVITY_ACCEPT | IN_UNION_ROOM,
+    ACTIVITY_DECLINE | IN_UNION_ROOM,
+    ACTIVITY_NPCTALK | IN_UNION_ROOM,
+    ACTIVITY_PLYRTALK | IN_UNION_ROOM,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_845707C[] = {
+    ACTIVITY_SEARCH,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_8457080[] = {
+    ACTIVITY_BATTLE,
+    ACTIVITY_DBLBATTLE,
+    ACTIVITY_MLTBATTLE,
+    ACTIVITY_TRADE,
+    ACTIVITY_PJUMP,
+    ACTIVITY_BCRUSH,
+    ACTIVITY_BPICK,
+    ACTIVITY_WCARD2,
+    ACTIVITY_WNEWS2,
+    ACTIVITY_SPINTRADE,
+    0xFF
+};
+
+ALIGNED(4) static const u8 gUnknown_845708C[] = {
+    ACTIVITY_BATTLE,
+    ACTIVITY_DBLBATTLE,
+    ACTIVITY_MLTBATTLE,
+    ACTIVITY_TRADE,
+    ACTIVITY_BCRUSH,
+    0xFF
+};
+
+static const u8 *const sAcceptedActivityIds[] = {
+    [LINK_GROUP_SINGLE_BATTLE] = gUnknown_845704C,
+    [LINK_GROUP_DOUBLE_BATTLE] = gUnknown_8457050,
+    [LINK_GROUP_MULTI_BATTLE]  = gUnknown_8457054,
+    [LINK_GROUP_TRADE]         = gUnknown_8457058,
+    [LINK_GROUP_POKEMON_JUMP]  = gUnknown_845705C,
+    [LINK_GROUP_BERRY_CRUSH]   = gUnknown_8457060,
+    [LINK_GROUP_BERRY_PICKING] = gUnknown_8457064,
+    [LINK_GROUP_WONDER_CARD]   = gUnknown_8457068,
+    [LINK_GROUP_WONDER_NEWS]   = gUnknown_845706C,
+    [9]                        = gUnknown_8457070,
+    [10]                       = gUnknown_845707C,
+    [11]                       = gUnknown_8457080,
+    [12]                       = gUnknown_845708C
+};
+
+static const u8 sLinkGroupToURoomActivity[] = {
+    [LINK_GROUP_SINGLE_BATTLE] = ACTIVITY_BATTLE,
+    [LINK_GROUP_DOUBLE_BATTLE] = ACTIVITY_DBLBATTLE,
+    [LINK_GROUP_MULTI_BATTLE]  = ACTIVITY_MLTBATTLE,
+    [LINK_GROUP_TRADE]         = ACTIVITY_TRADE,
+    [LINK_GROUP_POKEMON_JUMP]  = ACTIVITY_PJUMP,
+    [LINK_GROUP_BERRY_CRUSH]   = ACTIVITY_BCRUSH,
+    [LINK_GROUP_BERRY_PICKING] = ACTIVITY_BPICK,
+    [LINK_GROUP_WONDER_CARD]   = ACTIVITY_WCARD2,
+    [LINK_GROUP_WONDER_NEWS]   = ACTIVITY_WNEWS2
+};
+
+static const u8 sUnref_84570D1[] = _("{DYNAMIC 00}·{DYNAMIC 01}");
 
 #undef _8456CD8
 
 // These are functions in Emerald but inlined in FireRed
 
-#define IntlConvPartnerUname7(dest, arg1) ({                              \
-    StringCopy7(dest, (arg1).unk.playerName);                             \
-    ConvertInternationalString(dest, (arg1).unk.gname.unk_00.unk_00_0); \
+#define IntlConvPartnerUname7(dest, arg1) ({                            \
+    StringCopy7(dest, (arg1).gname_uname.uname);                           \
+    ConvertInternationalString(dest, (arg1).gname_uname.gname.unk_00.language); \
 })
 
-#define IntlConvPartnerUname(dest, arg1) ({                               \
-    StringCopy(dest, (arg1).unk.playerName);                              \
-    ConvertInternationalString(dest, (arg1).unk.gname.unk_00.unk_00_0); \
+#define IntlConvPartnerUname(dest, arg1) ({                             \
+    StringCopy(dest, (arg1).gname_uname.uname);                            \
+    ConvertInternationalString(dest, (arg1).gname_uname.gname.unk_00.language); \
 })
 
 #define CopyTrainerCardData(dest, src, _version) ({ \
@@ -578,47 +664,56 @@ static const u8 gUnknown_84570C8[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B,
     _maxWidth - strWidth;                                          \
 })
 
-static void sub_811586C(u8 windowId, u8 arg1, u8 stringId)
+// capacityCode is a 2-nybble code
+// Bits 0-3: Capacity
+// Bits 4-7: Min required (if 0, must have exactly Capacity players
+static void PrintNumPlayersWaitingForMsg(u8 windowId, u8 capacityCode, u8 count)
 {
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
-    switch (arg1 << 8)
+    switch (capacityCode << 8)
     {
     case 0x200:
-        sub_811A444(windowId, 2, gUnknown_845742C[0][stringId - 1], 0, 2, 0);
+        UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[0][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE);
         break;
     case 0x400:
-        sub_811A444(windowId, 2, gUnknown_845742C[1][stringId - 1], 0, 2, 0);
+        UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[1][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE);
         break;
     case 0x2500:
-        sub_811A444(windowId, 2, gUnknown_845742C[2][stringId - 1], 0, 2, 0);
+        UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[2][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE);
         break;
     case 0x3500:
-        sub_811A444(windowId, 2, gUnknown_845742C[3][stringId - 1], 0, 2, 0);
+        UR_AddTextPrinterParameterized(windowId, 2, gUnknown_845742C[3][count - 1], 0, 2, UR_COLOR_DKE_WHT_LTE);
         break;
     }
 
     CopyWindowToVram(windowId, 2);
 }
 
-static void sub_8115924(u8 windowId)
+static void PrintPlayerNameAndIdOnWindow(u8 windowId)
 {
     u8 text[12];
     u8 text2[12];
 
-    sub_811A444(windowId, 2, gSaveBlock2Ptr->playerName, 0, 2, 0);
+    UR_AddTextPrinterParameterized(windowId, 2, gSaveBlock2Ptr->playerName, 0, 2, UR_COLOR_DKE_WHT_LTE);
     StringCopy(text2, gUnknown_84571B4);
     ConvertIntToDecimalStringN(text, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5);
     StringAppend(text2, text);
-    sub_811A444(windowId, 0, text2, 0, 0x10, 0);
+    UR_AddTextPrinterParameterized(windowId, 0, text2, 0, 0x10, UR_COLOR_DKE_WHT_LTE);
 }
 
-static void sub_811599C(u8 *dst, u8 caseId)
+static void StringExpandPlaceholders_AwaitingCommFromAnother(u8 *dst, u8 caseId)
 {
     switch (caseId)
     {
-    case 1 ... 4:
-    case 9 ... 11:
-    case 21 ... 22:
+    case ACTIVITY_BATTLE:
+    case ACTIVITY_DBLBATTLE:
+    case ACTIVITY_MLTBATTLE:
+    case ACTIVITY_TRADE:
+    case ACTIVITY_PJUMP:
+    case ACTIVITY_BCRUSH:
+    case ACTIVITY_BPICK:
+    case ACTIVITY_WCARD2:
+    case ACTIVITY_WNEWS2:
         // UB: argument *dst isn't used, instead it always prints to gStringVar4
         StringExpandPlaceholders(gStringVar4, gUnknown_8457234);
         break;
@@ -630,7 +725,7 @@ void TryBecomeLinkLeader(void)
     u8 taskId;
     struct UnkStruct_Leader * dataPtr;
 
-    taskId = CreateTask(sub_8115A68, 0);
+    taskId = CreateTask(Task_TryBecomeLinkLeader, 0);
     sUnionRoomMain.leader = dataPtr = (void*)(gTasks[taskId].data);
     sLeader = dataPtr;
 
@@ -639,7 +734,7 @@ void TryBecomeLinkLeader(void)
     gSpecialVar_Result = 0;
 }
 
-static void sub_8115A68(u8 taskId)
+static void Task_TryBecomeLinkLeader(u8 taskId)
 {
     u32 id, val;
     struct UnkStruct_Leader * data = sUnionRoomMain.leader;
@@ -647,63 +742,63 @@ static void sub_8115A68(u8 taskId)
     switch (data->state)
     {
     case 0:
-        gUnknown_203B058 = gUnknown_8456CD8[gSpecialVar_0x8004];
-        gUnknown_203B059 = gUnknown_8456CD8[gSpecialVar_0x8004] >> 8;
-        SetHostRFUtgtGname(gUnknown_203B058, 0, 0);
-        sub_800B1F4();
+        sPlayerCurrActivity = sLinkGroupToActivityAndCapacity[gSpecialVar_0x8004];
+        sPlayerActivityGroupSize = sLinkGroupToActivityAndCapacity[gSpecialVar_0x8004] >> 8;
+        SetHostRFUtgtGname(sPlayerCurrActivity, 0, 0);
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBB8C(gUnknown_203B059 & 0xF);
+        InitializeRfuLinkManager_LinkLeader(sPlayerActivityGroupSize & 0xF);
         data->state = 3;
         break;
     case 3:
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        data->field_0 = AllocZeroed(5 * sizeof(struct UnkStruct_x20));
-        data->field_8 = AllocZeroed(5 * sizeof(struct UnkStruct_x20));
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 5);
-        LinkRfu3_SetGnameUnameFromStaticBuffers(&data->field_0->arr[0].unk.gname, data->field_0->arr[0].unk.playerName);
+        data->field_0 = AllocZeroed(UROOM_MAX_PARTY_SIZE * sizeof(struct UnkStruct_x20));
+        data->field_8 = AllocZeroed(UROOM_MAX_PARTY_SIZE * sizeof(struct UnkStruct_x20));
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, UROOM_MAX_PARTY_SIZE);
+        LinkRfu3_SetGnameUnameFromStaticBuffers(&data->field_0->arr[0].gname_uname.gname, data->field_0->arr[0].gname_uname.uname);
         data->field_0->arr[0].field_18 = 0;
-        data->field_0->arr[0].field_1A_0 = 1;
+        data->field_0->arr[0].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
         data->field_0->arr[0].field_1A_1 = 0;
         data->field_0->arr[0].field_1B = 0;
-        data->field_17 = sub_811A054(data->field_4, 0xFF);
-        data->field_10 = AddWindow(&gUnknown_8456CD0);
-        data->listWindowId = AddWindow(&gUnknown_8456CFC);
-        data->field_11 = AddWindow(&gUnknown_8456D04);
+        data->listenTaskId = CreateTask_ListenForPartnersWithCompatibleSerialNos(data->field_4, 0xFF);
+        data->bButtonCancelWindowId = AddWindow(&sWindowTemplate_BButtonCancel);
+        data->listWindowId = AddWindow(&sWindowTemplate_List_PossibleGroupMembers);
+        data->nPlayerModeWindowId = AddWindow(&sWindowTemplate_NumPlayerMode);
 
-        FillWindowPixelBuffer(data->field_10, PIXEL_FILL(2));
-        sub_811A444(data->field_10, 0, gUnknown_845747C, 8, 2, 4);
-        PutWindowTilemap(data->field_10);
-        CopyWindowToVram(data->field_10, 2);
+        FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
+        UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_845747C, 8, 2, UR_COLOR_WHT_DKE_LTE);
+        PutWindowTilemap(data->bButtonCancelWindowId);
+        CopyWindowToVram(data->bButtonCancelWindowId, 2);
 
         DrawStdWindowFrame(data->listWindowId, FALSE);
-        gMultiuseListMenuTemplate = gUnknown_8456D34;
+        gMultiuseListMenuTemplate = sListMenuTemplate_PossibleGroupMembers;
         gMultiuseListMenuTemplate.windowId = data->listWindowId;
         data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
 
-        DrawStdWindowFrame(data->field_11, FALSE);
-        PutWindowTilemap(data->field_11);
-        CopyWindowToVram(data->field_11, 2);
+        DrawStdWindowFrame(data->nPlayerModeWindowId, FALSE);
+        PutWindowTilemap(data->nPlayerModeWindowId);
+        CopyWindowToVram(data->nPlayerModeWindowId, 2);
 
         CopyBgTilemapBufferToVram(0);
-        data->field_13 = 1;
+        data->playerCount = 1;
         data->state = 4;
         break;
     case 4:
-        StringCopy(gStringVar1, gUnknown_8456C74[gUnknown_203B058]);
-        if ((gUnknown_203B059 >> 4) != 0)
+        StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
+        if ((sPlayerActivityGroupSize >> 4) != 0)
         {
-            if (data->field_13 > (gUnknown_203B059 >> 4) - 1 && (gUnknown_203B059 & 0xF) != 0)
+            if (data->playerCount > (sPlayerActivityGroupSize >> 4) - 1 && (sPlayerActivityGroupSize & 0xF) != 0)
                 StringExpandPlaceholders(gStringVar4, gUnknown_8457264);
             else
                 StringExpandPlaceholders(gStringVar4, gUnknown_8457234);
         }
         else
         {
-            sub_811599C(gStringVar4, gUnknown_203B058);
+            StringExpandPlaceholders_AwaitingCommFromAnother(gStringVar4, sPlayerCurrActivity);
         }
 
-        sub_811586C(data->field_11, gUnknown_203B059, data->field_13);
+        PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount);
         data->state = 5;
         break;
     case 5:
@@ -711,24 +806,24 @@ static void sub_8115A68(u8 taskId)
             data->state = 6;
         break;
     case 6:
-        sub_8116444(data, 7, 10);
+        Leader_SetStateIfMemberListChanged(data, 7, 10);
         if (JOY_NEW(B_BUTTON))
         {
-            if (data->field_13 == 1)
+            if (data->playerCount == 1)
                 data->state = 23;
-            else if ((gUnknown_203B059 & 0xF0) != 0)
+            else if ((sPlayerActivityGroupSize & 0xF0) != 0)
                 data->state = 30;
             else
                 data->state = 19;
         }
-        if ((gUnknown_203B059 >> 4) != 0
-            && data->field_13 > (gUnknown_203B059 >> 4) - 1
-            && (gUnknown_203B059 & 0xF) != 0
+        if ((sPlayerActivityGroupSize >> 4) != 0
+            && data->playerCount > (sPlayerActivityGroupSize >> 4) - 1
+            && (sPlayerActivityGroupSize & 0xF) != 0
             && sub_80FC1CC()
             && JOY_NEW(START_BUTTON))
         {
             data->state = 15;
-            sub_80F8F5C();
+            LinkRfu_StopManagerAndFinalizeSlots();
         }
         if (data->state == 6 && sub_80FA5D4())
         {
@@ -739,20 +834,21 @@ static void sub_8115A68(u8 taskId)
         if (!sub_80FA5D4())
         {
             data->state = 6;
-            data->field_13 = sub_81165E8(data->field_0);
+            data->playerCount = UnionRoomLeaderField0CompactionAndCount(data->field_0);
         }
         break;
     case 10:
-        id = ((gUnknown_203B058 & 0xF) == 2) ? 1 : 0;
+        id = ((sPlayerCurrActivity & 0xF) == 2) ? 1 : 0;
         if (PrintOnTextbox(&data->textState, gUnknown_845767C[id]))
         {
-            data->field_13 = sub_81165E8(data->field_0);
+            data->playerCount = UnionRoomLeaderField0CompactionAndCount(data->field_0);
             RedrawListMenu(data->listTaskId);
             data->state = 4;
         }
         break;
     case 29:
-        id = ((gUnknown_203B059 & 0xF) == 2) ? 0 : 1;
+        // Other player cancelled.
+        id = ((sPlayerActivityGroupSize & 0xF) == 2) ? 0 : 1;
         if (PrintOnTextbox(&data->textState, gUnknown_845767C[id]))
         {
             data->state = 21;
@@ -765,19 +861,19 @@ static void sub_8115A68(u8 taskId)
         }
         break;
     case 11:
-        switch (sub_811A14C(&data->textState, sub_80FA634(ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName)))
+        switch (UnionRoomHandleYesNo(&data->textState, TrainerIdAndNameStillInPartnersList(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname)))
         {
         case 0:
             LoadWirelessStatusIndicatorSpriteGfx();
             CreateWirelessStatusIndicatorSprite(0, 0);
             data->field_19 = 5;
-            sub_80FA670(5, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+            SendByteToPartnerByIdAndName(5, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
             data->state = 12;
             break;
         case 1:
         case -1:
             data->field_19 = 6;
-            sub_80FA670(6, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+            SendByteToPartnerByIdAndName(6, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
             data->state = 12;
             break;
         case -3:
@@ -786,29 +882,31 @@ static void sub_8115A68(u8 taskId)
         }
         break;
     case 12:
-        val = sub_80FA6FC(ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+        val = WaitSendByteToPartnerByIdAndName(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
         if (val == 1)
         {
+            // Xfer complete
             if (data->field_19 == 5)
             {
-                data->field_0->arr[data->field_13].field_1B = 0;
+                // Sent "OK"
+                data->field_0->arr[data->playerCount].field_1B = 0;
                 RedrawListMenu(data->listTaskId);
-                data->field_13++;
-                if (data->field_13 == (gUnknown_203B059 & 0xF))
+                data->playerCount++;
+                if (data->playerCount == (sPlayerActivityGroupSize & 0xF))
                 {
-                    if ((gUnknown_203B059 & 0xF0) != 0 || data->field_13 == 4)
+                    if ((sPlayerActivityGroupSize & 0xF0) != 0 || data->playerCount == 4)
                     {
                         data->state = 15;
                     }
                     else
                     {
-                        IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->field_13 - 1]);
+                        IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->playerCount - 1]);
                         StringExpandPlaceholders(gStringVar4, gUnknown_8457554);
                         data->state = 13;
                     }
 
-                    sub_80F8F5C();
-                    sub_811586C(data->field_11, gUnknown_203B059, data->field_13);
+                    LinkRfu_StopManagerAndFinalizeSlots();
+                    PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount);
                 }
                 else
                 {
@@ -817,9 +915,10 @@ static void sub_8115A68(u8 taskId)
             }
             else
             {
-                sub_80FBD4C(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId));
-                data->field_0->arr[data->field_13].field_1A_0 = 0;
-                sub_81165E8(data->field_0);
+                // Sent "no"
+                RequestDisconnectSlotByTrainerNameAndId(data->field_0->arr[data->playerCount].gname_uname.uname, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId));
+                data->field_0->arr[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE;
+                UnionRoomLeaderField0CompactionAndCount(data->field_0);
                 RedrawListMenu(data->listTaskId);
                 data->state = 4;
             }
@@ -828,7 +927,8 @@ static void sub_8115A68(u8 taskId)
         }
         else if (val == 2)
         {
-            sub_80FB9E4(0, 0);
+            // Disconnect
+            RfuSetErrorStatus(0, 0);
             data->state = 4;
         }
         break;
@@ -837,22 +937,25 @@ static void sub_8115A68(u8 taskId)
             data->state = 14;
         break;
     case 14:
-        if (++data->field_E > 120)
+        if (++data->delayTimerAfterOk > 120)
             data->state = 17;
         break;
     case 15:
+        // Are these members OK?
         if (PrintOnTextbox(&data->textState, gUnknown_8457514))
             data->state = 16;
         break;
     case 16:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
+            // Yes
             data->state = 17;
             break;
         case 1:
         case -1:
-            if ((gUnknown_203B059 & 0xF0) != 0)
+            // No
+            if ((sPlayerActivityGroupSize & 0xF0) != 0)
                 data->state = 30;
             else
                 data->state = 19;
@@ -864,16 +967,16 @@ static void sub_8115A68(u8 taskId)
             data->state = 20;
         break;
     case 20:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
             data->state = 23;
             break;
         case 1:
         case -1:
-            if ((gUnknown_203B059 & 0xF0) != 0)
+            if ((sPlayerActivityGroupSize & 0xF0) != 0)
                 data->state = 15;
-            else if (data->field_13 == (gUnknown_203B059 & 0xF))
+            else if (data->playerCount == (sPlayerActivityGroupSize & 0xF))
                 data->state = 15;
             else
                 data->state = 4;
@@ -881,13 +984,15 @@ static void sub_8115A68(u8 taskId)
         }
         break;
     case 17:
-        if (!sub_8116444(data, 7, 23))
+        // Go to start
+        // Final membership check
+        if (!Leader_SetStateIfMemberListChanged(data, 7, 23))
             data->state = 18;
         break;
     case 18:
-        if (sub_80F8F40())
+        if (LmanAcceptSlotFlagIsNotZero())
         {
-            if (sub_80F8F7C(FALSE))
+            if (WaitRfuState(FALSE))
             {
                 data->state = 26;
             }
@@ -899,14 +1004,16 @@ static void sub_8115A68(u8 taskId)
         }
         break;
     case 30:
+        // Mode with members will be canceled.
         if (PrintOnTextbox(&data->textState, gUnknown_8457610))
             data->state = 23;
         break;
     case 21:
     case 23:
+        // An error occurred. Please start over from the beginning.
         DestroyWirelessStatusIndicatorSprite();
-        sub_80F8DC0();
-        sub_81161E4(data);
+        LinkRfu_Shutdown();
+        Leader_DestroyResources(data);
         data->state++;
         break;
     case 24:
@@ -920,7 +1027,7 @@ static void sub_8115A68(u8 taskId)
         gSpecialVar_Result = 8;
         break;
     case 26:
-        if (sub_80FBA00())
+        if (RfuIsErrorStatus1or2())
         {
             data->state = 29;
         }
@@ -928,9 +1035,9 @@ static void sub_8115A68(u8 taskId)
         {
             if (gReceivedRemoteLinkPlayers != 0)
             {
-                sub_80FAFE0(1);
-                sub_8117990();
-                sub_81161E4(data);
+                UpdateGameData_GroupLockedIn(TRUE);
+                CreateTask_RunScriptAndFadeToActivity();
+                Leader_DestroyResources(data);
                 DestroyTask(taskId);
             }
         }
@@ -938,196 +1045,196 @@ static void sub_8115A68(u8 taskId)
     }
 }
 
-static void sub_81161E4(struct UnkStruct_Leader * data)
+static void Leader_DestroyResources(struct UnkStruct_Leader * data)
 {
-    ClearWindowTilemap(data->field_11);
-    ClearStdWindowAndFrame(data->field_11, FALSE);
+    ClearWindowTilemap(data->nPlayerModeWindowId);
+    ClearStdWindowAndFrame(data->nPlayerModeWindowId, FALSE);
     DestroyListMenuTask(data->listTaskId, 0, 0);
-    ClearWindowTilemap(data->field_10);
+    ClearWindowTilemap(data->bButtonCancelWindowId);
     ClearStdWindowAndFrame(data->listWindowId, FALSE);
     CopyBgTilemapBufferToVram(0);
-    RemoveWindow(data->field_11);
+    RemoveWindow(data->nPlayerModeWindowId);
     RemoveWindow(data->listWindowId);
-    RemoveWindow(data->field_10);
-    DestroyTask(data->field_17);
+    RemoveWindow(data->bButtonCancelWindowId);
+    DestroyTask(data->listenTaskId);
 
     Free(data->field_8);
     Free(data->field_0);
     Free(data->field_4);
 }
 
-static void sub_8116244(u8 *dst, u8 caseId)
+static void Leader_GetAcceptNewMemberPrompt(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
-    case 1:
-    case 2:
-    case 4:
+    case ACTIVITY_BATTLE:
+    case ACTIVITY_DBLBATTLE:
+    case ACTIVITY_TRADE:
         StringExpandPlaceholders(dst, gUnknown_84574A0);
         break;
-    case 21:
-    case 22:
+    case ACTIVITY_WCARD2:
+    case ACTIVITY_WNEWS2:
         StringExpandPlaceholders(dst, gUnknown_84574C4);
         break;
-    case 3:
-    case 9:
-    case 10:
-    case 11:
+    case ACTIVITY_MLTBATTLE:
+    case ACTIVITY_PJUMP:
+    case ACTIVITY_BCRUSH:
+    case ACTIVITY_BPICK:
         StringExpandPlaceholders(dst, gUnknown_84574EC);
         break;
     }
 }
 
-static void sub_81162E0(u8 *dst, u8 caseId)
+static void GetYouDeclinedTheOfferMessage(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
-    case 65:
-    case 68:
+    case ACTIVITY_BATTLE | IN_UNION_ROOM:
+    case ACTIVITY_TRADE | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8457E28);
         break;
-    case 69:
-    case 72:
+    case ACTIVITY_CHAT | IN_UNION_ROOM:
+    case ACTIVITY_CARD | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8457E44);
         break;
     }
 }
 
-static void sub_811631C(u8 *dst, u8 caseId)
+static void GetYouAskedToJoinGroupPleaseWaitMessage(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
-    case 1:
-    case 2:
-    case 4:
-    case 21:
-    case 22:
+    case ACTIVITY_BATTLE:
+    case ACTIVITY_DBLBATTLE:
+    case ACTIVITY_TRADE:
+    case ACTIVITY_WCARD2:
+    case ACTIVITY_WNEWS2:
         StringExpandPlaceholders(dst, gUnknown_8459238);
         break;
-    case 3:
-    case 9:
-    case 10:
-    case 11:
+    case ACTIVITY_MLTBATTLE:
+    case ACTIVITY_PJUMP:
+    case ACTIVITY_BCRUSH:
+    case ACTIVITY_BPICK:
         StringExpandPlaceholders(dst, gUnknown_8459250);
         break;
     }
 }
 
-static void sub_81163B0(u8 *dst, u8 caseId)
+static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 caseId)
 {
     switch (caseId)
     {
-    case 1:
-    case 2:
-    case 4:
-    case 21:
-    case 22:
+    case ACTIVITY_BATTLE:
+    case ACTIVITY_DBLBATTLE:
+    case ACTIVITY_TRADE:
+    case ACTIVITY_WCARD2:
+    case ACTIVITY_WNEWS2:
         StringExpandPlaceholders(dst, gUnknown_84576AC);
         break;
-    case 3:
-    case 9:
-    case 10:
-    case 11:
+    case ACTIVITY_MLTBATTLE:
+    case ACTIVITY_PJUMP:
+    case ACTIVITY_BCRUSH:
+    case ACTIVITY_BPICK:
         StringExpandPlaceholders(dst, gUnknown_84576C4);
         break;
     }
 }
 
-static bool8 sub_8116444(struct UnkStruct_Leader * data, u32 arg1, u32 arg2)
+static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data, u32 state1, u32 state2)
 {
-    switch (sub_8116524(data->field_0))
+    switch (LeaderUpdateGroupMembership(data->field_0))
     {
-    case 1:
+    case UNION_ROOM_SPAWN_IN:
         PlaySE(SE_PC_LOGIN);
         RedrawListMenu(data->listTaskId);
-        IntlConvPartnerUname7(gStringVar2, data->field_0->arr[data->field_13]);
-        sub_8116244(gStringVar4, gUnknown_203B058);
-        data->state = arg1;
+        IntlConvPartnerUname7(gStringVar2, data->field_0->arr[data->playerCount]);
+        Leader_GetAcceptNewMemberPrompt(gStringVar4, sPlayerCurrActivity);
+        data->state = state1;
         break;
-    case 2:
-        sub_80FB9E4(0, 0);
+    case UNION_ROOM_SPAWN_OUT:
+        RfuSetErrorStatus(0, 0);
         RedrawListMenu(data->listTaskId);
-        data->state = arg2;
+        data->state = state2;
         return TRUE;
     }
 
     return FALSE;
 }
 
-static void sub_81164C8(u8 windowId, s32 itemId, u8 y)
+static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, s32 itemId, u8 y)
 {
     struct UnkStruct_Leader * data = sUnionRoomMain.leader;
     u8 var = 0;
 
-    switch (data->field_0->arr[itemId].field_1A_0)
+    switch (data->field_0->arr[itemId].groupScheduledAnim)
     {
-    case 1:
+    case UNION_ROOM_SPAWN_IN:
         if (data->field_0->arr[itemId].field_1B != 0)
-            var = 2;
+            var = UR_COLOR_GRN_WHT_LTG;
         break;
-    case 2:
-        var = 1;
+    case UNION_ROOM_SPAWN_OUT:
+        var = UR_COLOR_RED_WHT_LTR;
         break;
     }
 
-    sub_811A910(windowId, 0, y, &data->field_0->arr[itemId], var, itemId);
+    PrintGroupMemberCandidateOnWindowWithColor(windowId, 0, y, &data->field_0->arr[itemId], var, itemId);
 }
 
-static u8 sub_8116524(struct UnkStruct_Main0 * arg0)
+static u8 LeaderUpdateGroupMembership(struct UnkStruct_Main0 * arg0)
 {
     struct UnkStruct_Leader * data = sUnionRoomMain.leader;
-    u8 ret = 0;
+    u8 ret = UNION_ROOM_SPAWN_NONE;
     u8 i;
     s32 id;
 
-    for (i = 1; i < 5; i++)
+    for (i = 1; i < UROOM_MAX_PARTY_SIZE; i++)
     {
-        u16 var = data->field_0->arr[i].field_1A_0;
-        if (var == 1)
+        u16 var = data->field_0->arr[i].groupScheduledAnim;
+        if (var == UNION_ROOM_SPAWN_IN)
         {
-            id = sub_811A748(&data->field_0->arr[i], data->field_4->arr);
+            id = Findx20Inx1CArray(&data->field_0->arr[i], data->field_4->arr);
             if (id != 0xFF)
             {
-                data->field_0->arr[i].unk = data->field_4->arr[id].unk0;
-                data->field_0->arr[i].field_18 = var;
+                data->field_0->arr[i].gname_uname = data->field_4->arr[id].gname_uname;
+                data->field_0->arr[i].field_18 = 1;
             }
             else
             {
-                data->field_0->arr[i].field_1A_0 = 2;
-                ret = 2;
+                data->field_0->arr[i].groupScheduledAnim = UNION_ROOM_SPAWN_OUT;
+                ret = UNION_ROOM_SPAWN_OUT;
             }
         }
     }
 
-    for (id = 0; id < 4; id++)
-        sub_811A798(data->field_0->arr, &data->field_4->arr[id], 5);
+    for (id = 0; id < RFU_CHILD_MAX; id++)
+        Appendx1Ctox20(data->field_0->arr, &data->field_4->arr[id], UROOM_MAX_PARTY_SIZE);
 
-    if (ret != 2)
+    if (ret != UNION_ROOM_SPAWN_OUT)
     {
-        for (id = 0; id < 5; id++)
+        for (id = 0; id < UROOM_MAX_PARTY_SIZE; id++)
         {
             if (data->field_0->arr[id].field_1B != 0)
-                ret = 1;
+                ret = UNION_ROOM_SPAWN_IN;
         }
     }
 
     return ret;
 }
 
-static u8 sub_81165E8(struct UnkStruct_Main0 * arg0)
+static u8 UnionRoomLeaderField0CompactionAndCount(struct UnkStruct_Main0 * arg0)
 {
     struct UnkStruct_Leader * data = sUnionRoomMain.leader;
     u8 copiedCount;
     s32 i;
     u8 ret;
 
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < UROOM_MAX_PARTY_SIZE; i++)
         data->field_8->arr[i] = data->field_0->arr[i];
 
     copiedCount = 0;
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < UROOM_MAX_PARTY_SIZE; i++)
     {
-        if (data->field_8->arr[i].field_1A_0 == 1)
+        if (data->field_8->arr[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
         {
             data->field_0->arr[copiedCount] = data->field_8->arr[i];
             copiedCount++;
@@ -1135,18 +1242,18 @@ static u8 sub_81165E8(struct UnkStruct_Main0 * arg0)
     }
 
     ret = copiedCount;
-    for (; copiedCount < 5; copiedCount++)
+    for (; copiedCount < UROOM_MAX_PARTY_SIZE; copiedCount++)
     {
-        data->field_0->arr[copiedCount].unk = gUnknown_8457034;
+        data->field_0->arr[copiedCount].gname_uname = sUnionGnameUnamePair_Dummy;
         data->field_0->arr[copiedCount].field_18 = 0;
-        data->field_0->arr[copiedCount].field_1A_0 = 0;
-        data->field_0->arr[copiedCount].field_1A_1 = 0;
+        data->field_0->arr[copiedCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE;
+        data->field_0->arr[copiedCount].field_1A_1 = FALSE;
         data->field_0->arr[copiedCount].field_1B = 0;
     }
 
-    for (i = 0; i < 5; i++)
+    for (i = 0; i < UROOM_MAX_PARTY_SIZE; i++)
     {
-        if (data->field_0->arr[i].field_1A_0 != 1)
+        if (data->field_0->arr[i].groupScheduledAnim != UNION_ROOM_SPAWN_IN)
             continue;
         if (data->field_0->arr[i].field_1B != 0x40)
             continue;
@@ -1163,7 +1270,7 @@ void TryJoinLinkGroup(void)
     u8 taskId;
     struct UnkStruct_Group * dataPtr;
 
-    taskId = CreateTask(sub_8116738, 0);
+    taskId = CreateTask(Task_TryJoinLinkGroup, 0);
     sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data);
     sGroup = dataPtr;
 
@@ -1172,7 +1279,7 @@ void TryJoinLinkGroup(void)
     gSpecialVar_Result = 0;
 }
 
-static void sub_8116738(u8 taskId)
+static void Task_TryJoinLinkGroup(u8 taskId)
 {
     s32 id;
     struct UnkStruct_Group * data = sUnionRoomMain.group;
@@ -1180,11 +1287,11 @@ static void sub_8116738(u8 taskId)
     switch (data->state)
     {
     case 0:
-        SetHostRFUtgtGname(gUnknown_84570C8[gSpecialVar_0x8004], 0, 0);
-        gUnknown_203B058 = gUnknown_84570C8[gSpecialVar_0x8004];
-        sub_800B1F4();
+        SetHostRFUtgtGname(sLinkGroupToURoomActivity[gSpecialVar_0x8004], 0, 0);
+        sPlayerCurrActivity = sLinkGroupToURoomActivity[gSpecialVar_0x8004];
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBBD8();
+        InitializeRfuLinkManager_JoinGroup();
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
         data->field_0 = AllocZeroed(16 * sizeof(struct UnkStruct_x20));
         data->state = 1;
@@ -1194,34 +1301,34 @@ static void sub_8116738(u8 taskId)
             data->state = 2;
         break;
     case 2:
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 16);
-        data->field_11 = sub_811A054(data->field_4, gSpecialVar_0x8004);
-        data->field_C = AddWindow(&gUnknown_8456CD0);
-        data->listWindowId = AddWindow(&gUnknown_8456D4C);
-        data->field_D = AddWindow(&gUnknown_8456D54);
-
-        FillWindowPixelBuffer(data->field_C, PIXEL_FILL(2));
-        sub_811A444(data->field_C, 0, gUnknown_8458FC8, 8, 2, 4);
-        PutWindowTilemap(data->field_C);
-        CopyWindowToVram(data->field_C, 2);
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, 16);
+        data->listenTaskId = CreateTask_ListenForPartnersWithCompatibleSerialNos(data->field_4, gSpecialVar_0x8004);
+        data->bButtonCancelWindowId = AddWindow(&sWindowTemplate_BButtonCancel);
+        data->listWindowId = AddWindow(&sWindowTemplate_MysteryGiftList);
+        data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_MysteryGiftPlayerNameAndId);
+
+        FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
+        UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_8458FC8, 8, 2, UR_COLOR_WHT_DKE_LTE);
+        PutWindowTilemap(data->bButtonCancelWindowId);
+        CopyWindowToVram(data->bButtonCancelWindowId, 2);
 
         DrawStdWindowFrame(data->listWindowId, FALSE);
-        gMultiuseListMenuTemplate = gUnknown_8456DDC;
+        gMultiuseListMenuTemplate = sListMenuTemplate_UnionRoomGroups;
         gMultiuseListMenuTemplate.windowId = data->listWindowId;
         data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
 
-        DrawStdWindowFrame(data->field_D, FALSE);
-        PutWindowTilemap(data->field_D);
-        sub_8115924(data->field_D);
-        CopyWindowToVram(data->field_D, 2);
+        DrawStdWindowFrame(data->playerNameAndIdWindowId, FALSE);
+        PutWindowTilemap(data->playerNameAndIdWindowId);
+        PrintPlayerNameAndIdOnWindow(data->playerNameAndIdWindowId);
+        CopyWindowToVram(data->playerNameAndIdWindowId, 2);
 
         CopyBgTilemapBufferToVram(0);
-        data->field_F = 0;
+        data->leaderId = 0;
         data->state = 3;
         break;
     case 3:
-        id = sub_8116FE4();
+        id = GetNewLeaderCandidate();
         switch (id)
         {
         case 1:
@@ -1234,19 +1341,20 @@ static void sub_8116738(u8 taskId)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 unusedVar;
-                unusedVar  = data->field_0->arr[id].unk.gname.unk_0a_0;
+                unusedVar  = data->field_0->arr[id].gname_uname.gname.activity;
 
-                if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.gname.unk_0a_7)
+                if (data->field_0->arr[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->field_0->arr[id].gname_uname.gname.started)
                 {
-                    u32 var = sub_8116D10(data, id);
+                    u32 var = IsTryingToTradeWithHoennTooSoon(data, id);
                     if (var == 0)
                     {
-                        sub_8116D60(data, id);
+                        AskToJoinRfuGroup(data, id);
                         data->state = 5;
                         PlaySE(SE_PN_ON);
                     }
                     else
                     {
+                        // Postgame flags not both set
                         StringCopy(gStringVar4, gUnknown_8457608[var - 1]);
                         data->state = 18;
                         PlaySE(SE_PN_ON);
@@ -1268,30 +1376,38 @@ static void sub_8116738(u8 taskId)
         }
         break;
     case 5:
-        sub_811631C(gStringVar4, gUnknown_203B058);
+        GetYouAskedToJoinGroupPleaseWaitMessage(gStringVar4, sPlayerCurrActivity);
         if (PrintOnTextbox(&data->textState, gStringVar4))
         {
-            IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->field_F]);
+            IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->leaderId]);
             data->state = 6;
         }
         break;
     case 6:
         if (gReceivedRemoteLinkPlayers != 0)
         {
-            gUnknown_203B058 = data->field_0->arr[data->field_F].unk.gname.unk_0a_0;
-            sub_80FB9E4(0, 0);
-            switch (gUnknown_203B058)
+            sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
+            RfuSetErrorStatus(0, 0);
+            switch (sPlayerCurrActivity)
             {
-            case 1 ... 5:
-            case 9 ... 11:
-            case 13 ... 14:
-            case 21 ... 22:
+            case ACTIVITY_BATTLE:
+            case ACTIVITY_DBLBATTLE:
+            case ACTIVITY_MLTBATTLE:
+            case ACTIVITY_TRADE:
+            case ACTIVITY_CHAT:
+            case ACTIVITY_PJUMP:
+            case ACTIVITY_BCRUSH:
+            case ACTIVITY_BPICK:
+            case ACTIVITY_SPINTRADE:
+            case ACTIVITY_ITEMTRADE:
+            case ACTIVITY_WCARD2:
+            case ACTIVITY_WNEWS2:
                 data->state = 20;
                 break;
             }
         }
 
-        switch (sub_80FB9F4())
+        switch (RfuGetErrorStatus())
         {
         case 1:
             data->state = 12;
@@ -1302,31 +1418,32 @@ static void sub_8116738(u8 taskId)
             data->state = 14;
             break;
         case 5:
-            sub_81163B0(gStringVar4, gUnknown_203B058);
+            GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity);
             if (PrintOnTextbox(&data->textState, gStringVar4))
             {
-                sub_80FB9E4(7, 0);
-                StringCopy(gStringVar1, gUnknown_8456C74[gUnknown_203B058]);
+                RfuSetErrorStatus(7, 0);
+                StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
                 StringExpandPlaceholders(gStringVar4, gUnknown_8457700);
             }
             break;
         case 7:
-            if (data->field_15 > 0xF0)
+            // Wait 4 seconds
+            if (data->delayBeforePrint > 240)
             {
                 if (PrintOnTextbox(&data->textState, gStringVar4))
                 {
-                    sub_80FB9E4(12, 0);
-                    data->field_15 = 0;
+                    RfuSetErrorStatus(12, 0);
+                    data->delayBeforePrint = 0;
                 }
             }
             else
             {
-                data->field_15++;
+                data->delayBeforePrint++;
             }
             break;
         }
 
-        if (!sub_80FB9F4() && JOY_NEW(B_BUTTON))
+        if (!RfuGetErrorStatus() && JOY_NEW(B_BUTTON))
             data->state = 7;
         break;
     case 7:
@@ -1334,10 +1451,10 @@ static void sub_8116738(u8 taskId)
             data->state = 8;
         break;
     case 8:
-        switch (sub_811A14C(&data->textState, sub_80FB9F4()))
+        switch (UnionRoomHandleYesNo(&data->textState, RfuGetErrorStatus()))
         {
         case 0:
-            sub_80FA6BC();
+            LinkRfuNIsend8();
             data->state = 9;
             RedrawListMenu(data->listTaskId);
             break;
@@ -1353,7 +1470,7 @@ static void sub_8116738(u8 taskId)
         }
         break;
     case 9:
-        if (sub_80FB9F4())
+        if (RfuGetErrorStatus())
             data->state = 6;
         break;
     case 10:
@@ -1361,23 +1478,23 @@ static void sub_8116738(u8 taskId)
     case 14:
     case 18:
     case 20:
-        ClearWindowTilemap(data->field_D);
-        ClearStdWindowAndFrame(data->field_D, FALSE);
+        ClearWindowTilemap(data->playerNameAndIdWindowId);
+        ClearStdWindowAndFrame(data->playerNameAndIdWindowId, FALSE);
         DestroyListMenuTask(data->listTaskId, 0, 0);
-        ClearWindowTilemap(data->field_C);
+        ClearWindowTilemap(data->bButtonCancelWindowId);
         ClearStdWindowAndFrame(data->listWindowId, FALSE);
         CopyBgTilemapBufferToVram(0);
-        RemoveWindow(data->field_D);
+        RemoveWindow(data->playerNameAndIdWindowId);
         RemoveWindow(data->listWindowId);
-        RemoveWindow(data->field_C);
-        DestroyTask(data->field_11);
+        RemoveWindow(data->bButtonCancelWindowId);
+        DestroyTask(data->listenTaskId);
         Free(data->field_0);
         Free(data->field_4);
         data->state++;
         break;
     case 13:
         DestroyWirelessStatusIndicatorSprite();
-        if (PrintOnTextbox(&data->textState, gUnknown_8457754[sub_80FB9F4()]))
+        if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
         {
             gSpecialVar_Result = 6;
             data->state = 23;
@@ -1390,7 +1507,7 @@ static void sub_8116738(u8 taskId)
         break;
     case 15:
         DestroyWirelessStatusIndicatorSprite();
-        if (PrintOnTextbox(&data->textState, gUnknown_8457754[sub_80FB9F4()]))
+        if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
         {
             gSpecialVar_Result = 8;
             data->state = 23;
@@ -1405,25 +1522,25 @@ static void sub_8116738(u8 taskId)
         break;
     case 23:
         DestroyTask(taskId);
-        sub_811A41C();
-        sub_80F8DC0();
+        JoinGroup_BlankBg0AndEnableScriptContexts();
+        LinkRfu_Shutdown();
         break;
     case 21:
-        sub_8117990();
+        CreateTask_RunScriptAndFadeToActivity();
         DestroyTask(taskId);
         break;
     }
 }
 
-static u32 sub_8116D10(struct UnkStruct_Group * arg0, s32 id)
+static u32 IsTryingToTradeWithHoennTooSoon(struct UnkStruct_Group * arg0, s32 id)
 {
     struct UnkStruct_x20 * structPtr = &arg0->field_0->arr[id];
 
-    if (gUnknown_203B058 == 4 && structPtr->unk.gname.unk_00.unk_01_2 != VERSION_FIRE_RED && structPtr->unk.gname.unk_00.unk_01_2 != VERSION_LEAF_GREEN)
+    if (sPlayerCurrActivity == ACTIVITY_TRADE && structPtr->gname_uname.gname.unk_00.version != VERSION_FIRE_RED && structPtr->gname_uname.gname.unk_00.version != VERSION_LEAF_GREEN)
     {
         if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP))
             return 1;
-        else if (structPtr->unk.gname.unk_00.isChampion)
+        else if (structPtr->gname_uname.gname.unk_00.isChampion)
             return 0;
     }
     else
@@ -1434,23 +1551,23 @@ static u32 sub_8116D10(struct UnkStruct_Group * arg0, s32 id)
     return 2;
 }
 
-static void sub_8116D60(struct UnkStruct_Group * data, s32 id)
+static void AskToJoinRfuGroup(struct UnkStruct_Group * data, s32 id)
 {
-    data->field_F = id;
+    data->leaderId = id;
     LoadWirelessStatusIndicatorSpriteGfx();
     CreateWirelessStatusIndicatorSprite(0, 0);
     RedrawListMenu(data->listTaskId);
-    IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->field_F]);
-    sub_80FB008(gUnknown_84570C8[gSpecialVar_0x8004], 0, 1);
-    sub_80FBF54(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.gname.unk_00.playerTrainerId));
+    IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->leaderId]);
+    UpdateGameDataWithActivitySpriteGendersFlag(sLinkGroupToURoomActivity[gSpecialVar_0x8004], 0, TRUE);
+    CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.uname, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId));
 }
 
-u8 sub_8116DE0(void)
+u8 CreateTask_ListenToWireless(void)
 {
     u8 taskId;
     struct UnkStruct_Group * dataPtr;
 
-    taskId = CreateTask(sub_8116E1C, 0);
+    taskId = CreateTask(Task_ListenToWireless, 0);
     sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data);
 
     dataPtr->state = 0;
@@ -1461,7 +1578,7 @@ u8 sub_8116DE0(void)
     return taskId;
 }
 
-static void sub_8116E1C(u8 taskId)
+static void Task_ListenToWireless(u8 taskId)
 {
     struct UnkStruct_Group * data = sUnionRoomMain.group;
 
@@ -1469,53 +1586,53 @@ static void sub_8116E1C(u8 taskId)
     {
     case 0:
         SetHostRFUtgtGname(0, 0, 0);
-        sub_800B1F4();
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBBD8();
+        InitializeRfuLinkManager_JoinGroup();
         sub_80FB128(TRUE);
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
         data->field_0 = AllocZeroed(16 * sizeof(struct UnkStruct_x20));
         data->state = 2;
         break;
     case 2:
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 16);
-        data->field_11 = sub_811A054(data->field_4, 0xFF);
-        data->field_F = 0;
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, 16);
+        data->listenTaskId = CreateTask_ListenForPartnersWithCompatibleSerialNos(data->field_4, 0xFF);
+        data->leaderId = 0;
         data->state = 3;
         break;
     case 3:
-        if (sub_8116FE4() == 1)
+        if (GetNewLeaderCandidate() == 1)
             PlaySE(SE_PC_LOGIN);
         if (gTasks[taskId].data[15] == 0xFF)
             data->state = 10;
         break;
     case 10:
-        DestroyTask(data->field_11);
+        DestroyTask(data->listenTaskId);
         Free(data->field_0);
         Free(data->field_4);
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
         data->state++;
         break;
     case 11:
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
         DestroyTask(taskId);
         break;
     }
 }
 
-static bool32 sub_8116F28(u32 arg0, u32 id)
+static bool32 IsPartnerActivityAcceptable(u32 activity, u32 group)
 {
-    if (id == 0xFF)
+    if (group == 0xFF)
         return TRUE;
 
-    if (id <= NELEMS(gUnknown_8457094)) // UB: <= may access data outside the array
+    if (group <= NELEMS(sAcceptedActivityIds)) // UB: <= may access data outside the array
     {
-        const u8 *bytes = gUnknown_8457094[id];
+        const u8 *bytes = sAcceptedActivityIds[group];
 
         while ((*(bytes) != 0xFF))
         {
-            if ((*bytes) == arg0)
+            if ((*bytes) == activity)
                 return TRUE;
             bytes++;
         }
@@ -1524,30 +1641,30 @@ static bool32 sub_8116F28(u32 arg0, u32 id)
     return FALSE;
 }
 
-static u8 sub_8116F5C(struct UnkStruct_Group * data, u32 id)
+static u8 URoomGroupListGetTextColor(struct UnkStruct_Group * data, u32 id)
 {
-    if (data->field_0->arr[id].field_1A_0 == 1)
+    if (data->field_0->arr[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
     {
-        if (data->field_0->arr[id].unk.gname.unk_0a_7)
-            return 3;
-        else if (data->field_0->arr[id].field_1A_1 != 0)
-            return 1;
+        if (data->field_0->arr[id].gname_uname.gname.started)
+            return UR_COLOR_WHT_WHT_LTE;
+        else if (data->field_0->arr[id].field_1A_1)
+            return UR_COLOR_RED_WHT_LTR;
         else if (data->field_0->arr[id].field_1B != 0)
-            return 2;
+            return UR_COLOR_GRN_WHT_LTG;
     }
 
-    return 0;
+    return UR_COLOR_DKE_WHT_LTE;
 }
 
-static void sub_8116F94(u8 windowId, s32 itemId, u8 y)
+static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, s32 itemId, u8 y)
 {
     struct UnkStruct_Group * data = sUnionRoomMain.group;
-    u8 var = sub_8116F5C(data, itemId);
+    u8 color_idx = URoomGroupListGetTextColor(data, itemId);
 
-    sub_811A81C(windowId, 8, y, &data->field_0->arr[itemId], var, itemId);
+    PrintUnionRoomGroupOnWindow(windowId, 8, y, &data->field_0->arr[itemId], color_idx, itemId);
 }
 
-static u8 sub_8116FE4(void)
+static u8 GetNewLeaderCandidate(void)
 {
     struct UnkStruct_Group * data = sUnionRoomMain.group;
     u8 ret = 0;
@@ -1556,17 +1673,17 @@ static u8 sub_8116FE4(void)
 
     for (i = 0; i < 16; i++)
     {
-        if (data->field_0->arr[i].field_1A_0 != 0)
+        if (data->field_0->arr[i].groupScheduledAnim != UNION_ROOM_SPAWN_NONE)
         {
-            id = sub_811A748(&data->field_0->arr[i], data->field_4->arr);
+            id = Findx20Inx1CArray(&data->field_0->arr[i], data->field_4->arr);
             if (id != 0xFF)
             {
-                if (data->field_0->arr[i].field_1A_0 == 1)
+                if (data->field_0->arr[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
                 {
-                    if (sub_811A6DC(&data->field_0->arr[i].unk, &data->field_4->arr[id].unk0))
+                    if (AreUnionRoomPlayerGnamesDifferent(&data->field_0->arr[i].gname_uname, &data->field_4->arr[id].gname_uname))
                     {
-                        data->field_0->arr[i].unk = data->field_4->arr[id].unk0;
-                        data->field_0->arr[i].field_1B = 0x40;
+                        data->field_0->arr[i].gname_uname = data->field_4->arr[id].gname_uname;
+                        data->field_0->arr[i].field_1B = 64;
                         ret = 1;
                     }
                     else
@@ -1581,8 +1698,8 @@ static u8 sub_8116FE4(void)
                 }
                 else
                 {
-                    data->field_0->arr[i].field_1A_0 = 1;
-                    data->field_0->arr[i].field_1B = 0x40;
+                    data->field_0->arr[i].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
+                    data->field_0->arr[i].field_1B = 64;
                     ret = 1;
                 }
 
@@ -1590,12 +1707,12 @@ static u8 sub_8116FE4(void)
             }
             else
             {
-                if (data->field_0->arr[i].field_1A_0 != 2)
+                if (data->field_0->arr[i].groupScheduledAnim != UNION_ROOM_SPAWN_OUT)
                 {
                     data->field_0->arr[i].field_18++;
                     if (data->field_0->arr[i].field_18 >= 300)
                     {
-                        data->field_0->arr[i].field_1A_0 = 2;
+                        data->field_0->arr[i].groupScheduledAnim = UNION_ROOM_SPAWN_OUT;
                         ret = 2;
                     }
                 }
@@ -1603,29 +1720,29 @@ static u8 sub_8116FE4(void)
         }
     }
 
-    for (id = 0; id < 4; id++)
+    for (id = 0; id < RFU_CHILD_MAX; id++)
     {
-        if (sub_811A798(data->field_0->arr, &data->field_4->arr[id], 16) != 0xFF)
+        if (Appendx1Ctox20(data->field_0->arr, &data->field_4->arr[id], 16) != 0xFF)
             ret = 1;
     }
 
     return ret;
 }
 
-static void sub_8117100(u8 taskId)
+static void Task_CallCB2ReturnFromLinkTrade(u8 taskId)
 {
     CB2_ReturnFromLinkTrade();
     DestroyTask(taskId);
 }
 
-u8 sub_8117118(void)
+u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void)
 {
-    u8 taskId = CreateTask(sub_8117100, 0);
+    u8 taskId = CreateTask(Task_CallCB2ReturnFromLinkTrade, 0);
 
     return taskId;
 }
 
-static void sub_8117130(u8 taskId)
+static void Task_StartUnionRoomTrade(u8 taskId)
 {
     u32 monId = GetPartyPositionOfRegisteredMon(&sUnionRoomTrade, GetMultiplayerId());
 
@@ -1665,7 +1782,7 @@ static void sub_8117130(u8 taskId)
     }
 }
 
-static void sub_8117280(u8 taskId)
+static void Task_ExchangeCards(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -1689,11 +1806,11 @@ static void sub_8117280(u8 taskId)
             if (GetLinkPlayerCount() == 2)
             {
                 recvBuff = gBlockRecvBuffer[GetMultiplayerId() ^ 1];
-                sub_81446D0(recvBuff[48]);
+                MEventHandleReceivedWonderCard(recvBuff[sizeof(struct TrainerCard) / 2]);
             }
             else
             {
-                sub_81446C4();
+                ResetReceivedWonderCardFlag();
             }
 
             ResetBlockReceivedFlags();
@@ -1703,16 +1820,16 @@ static void sub_8117280(u8 taskId)
     }
 }
 
-static void sub_8117354(void)
+static void CB2_ShowCard(void)
 {
     switch (gMain.state)
     {
     case 0:
-        CreateTask(sub_8117280, 5);
+        CreateTask(Task_ExchangeCards, 5);
         gMain.state++;
         break;
     case 1:
-        if (!FuncIsActiveTask(sub_8117280))
+        if (!FuncIsActiveTask(Task_ExchangeCards))
             ShowTrainerCardInLink(GetMultiplayerId() ^ 1, CB2_ReturnToField);
         break;
     }
@@ -1723,7 +1840,7 @@ static void sub_8117354(void)
     BuildOamBuffer();
 }
 
-void sub_81173C0(u16 battleFlags)
+void StartUnionRoomBattle(u16 battleFlags)
 {
     HealPlayerParty();
     SavePlayerParty();
@@ -1736,7 +1853,7 @@ void sub_81173C0(u16 battleFlags)
     PlayBattleBGM();
 }
 
-static void sub_8117440(u16 linkService, u16 x, u16 y)
+static void SetCableClubStateAndWarpCurrentMap(u16 linkService, u16 x, u16 y)
 {
     VarSet(VAR_CABLE_CLUB_STATE, linkService);
     SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y);
@@ -1744,7 +1861,7 @@ static void sub_8117440(u16 linkService, u16 x, u16 y)
     WarpIntoMap();
 }
 
-static void sub_81174B4(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 linkService)
+static void SetCableClubStateAndWarpToNewMap(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 linkService)
 {
     gSpecialVar_0x8004 = linkService;
     VarSet(VAR_CABLE_CLUB_STATE, linkService);
@@ -1755,17 +1872,17 @@ static void sub_81174B4(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 linkService)
     WarpIntoMap();
 }
 
-static void sub_8117534(void)
+static void CB2_TransitionToCableClub(void)
 {
     switch (gMain.state)
     {
     case 0:
-        CreateTask(sub_8117280, 5);
+        CreateTask(Task_ExchangeCards, 5);
         gMain.state++;
         break;
     case 1:
-        if (!FuncIsActiveTask(sub_8117280))
-            SetMainCallback2(sub_8056788);
+        if (!FuncIsActiveTask(Task_ExchangeCards))
+            SetMainCallback2(CB2_ReturnToFieldCableClub);
         break;
     }
 
@@ -1775,101 +1892,106 @@ static void sub_8117534(void)
     BuildOamBuffer();
 }
 
-static void sub_8117594(void *arg0, bool32 arg1)
+static void CreateTrainerCardInBuffer(void *dest, bool32 setWonderCard)
 {
-    TrainerCard_GenerateCardForLinkPlayer((struct TrainerCard * )arg0);
-    if (arg1)
-        *((u16 *)(arg0 + sizeof(struct TrainerCard))) = GetWonderCardFlagId();
+    TrainerCard_GenerateCardForLinkPlayer((struct TrainerCard * )dest);
+    if (setWonderCard)
+        *((u16 *)(dest + sizeof(struct TrainerCard))) = GetWonderCardFlagId();
     else
-        *((u16 *)(arg0 + sizeof(struct TrainerCard))) = 0;
+        *((u16 *)(dest + sizeof(struct TrainerCard))) = 0;
 }
 
-static void sub_81175BC(u8 taskId)
+static void Task_StartActivity(u8 taskId)
 {
-    sub_81446C4();
-    switch (gUnknown_203B058)
+    ResetReceivedWonderCardFlag();
+    switch (sPlayerCurrActivity)
     {
-    case 1 ... 4:
-    case 9 ... 11:
-    case 13:
-    case 14:
+    case ACTIVITY_BATTLE:
+    case ACTIVITY_DBLBATTLE:
+    case ACTIVITY_MLTBATTLE:
+    case ACTIVITY_TRADE:
+    case ACTIVITY_PJUMP:
+    case ACTIVITY_BCRUSH:
+    case ACTIVITY_BPICK:
+    case ACTIVITY_SPINTRADE:
+    case ACTIVITY_ITEMTRADE:
         RecordMixTrainerNames();
         break;
     }
 
-    switch (gUnknown_203B058)
+    switch (sPlayerCurrActivity)
     {
-    case 65:
-    case 81:
+    case ACTIVITY_BATTLE | IN_UNION_ROOM:
+    case ACTIVITY_ACCEPT | IN_UNION_ROOM:
         CleanupOverworldWindowsAndTilemaps();
-        gMain.savedCallback = sub_811C1C8;
+        gMain.savedCallback = CB2_UnionRoomBattle;
         InitChooseHalfPartyForBattle(2);
         break;
-    case 1:
+    case ACTIVITY_BATTLE:
         CleanupOverworldWindowsAndTilemaps();
-        sub_8117594(gBlockSendBuffer, TRUE);
+        CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
         HealPlayerParty();
         SavePlayerParty();
         LoadPlayerBag();
-        sub_81174B4(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
-        SetMainCallback2(sub_8117534);
+        SetCableClubStateAndWarpToNewMap(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
+        SetMainCallback2(CB2_TransitionToCableClub);
         break;
-    case 2:
+    case ACTIVITY_DBLBATTLE:
         CleanupOverworldWindowsAndTilemaps();
         HealPlayerParty();
         SavePlayerParty();
         LoadPlayerBag();
-        sub_8117594(gBlockSendBuffer, TRUE);
-        sub_81174B4(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
-        SetMainCallback2(sub_8117534);
+        CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
+        SetCableClubStateAndWarpToNewMap(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
+        SetMainCallback2(CB2_TransitionToCableClub);
         break;
-    case 3:
+    case ACTIVITY_MLTBATTLE:
         CleanupOverworldWindowsAndTilemaps();
         HealPlayerParty();
         SavePlayerParty();
         LoadPlayerBag();
-        sub_8117594(gBlockSendBuffer, TRUE);
-        sub_81174B4(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
-        SetMainCallback2(sub_8117534);
+        CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
+        SetCableClubStateAndWarpToNewMap(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
+        SetMainCallback2(CB2_TransitionToCableClub);
         break;
-    case 4:
-        sub_8117594(gBlockSendBuffer, TRUE);
+    case ACTIVITY_TRADE:
+        CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
         CleanupOverworldWindowsAndTilemaps();
-        sub_81174B4(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER);
-        SetMainCallback2(sub_8117534);
+        SetCableClubStateAndWarpToNewMap(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER);
+        SetMainCallback2(CB2_TransitionToCableClub);
         break;
-    case 68:
-        CreateTask(sub_8117130, 0);
+    case ACTIVITY_TRADE | IN_UNION_ROOM:
+        CreateTask(Task_StartUnionRoomTrade, 0);
         break;
-    case 5:
-    case 69:
+    case ACTIVITY_CHAT:
+    case ACTIVITY_CHAT | IN_UNION_ROOM:
         if (GetMultiplayerId() == 0)
         {
-            sub_80F8CFC();
+            LinkRfu_CreateConnectionAsParent();
         }
         else
         {
-            sub_80F8D14();
-            SetHostRFUtgtGname(69, 0, 1);
+            LinkRfu_StopManagerBeforeEnteringChat();
+            SetHostRFUtgtGname(ACTIVITY_CHAT | IN_UNION_ROOM, 0, 1);
         }
         EnterUnionRoomChat();
         break;
-    case 8:
-    case 72:
-        sub_8117594(gBlockSendBuffer, FALSE);
-        SetMainCallback2(sub_8117354);
+    case ACTIVITY_CARD:
+    case ACTIVITY_CARD | IN_UNION_ROOM:
+        CreateTrainerCardInBuffer(gBlockSendBuffer, FALSE);
+        SetMainCallback2(CB2_ShowCard);
         break;
-    case 9:
-        sub_8117440(USING_MINIGAME, 5, 1);
-        sub_8147AA8(GetCursorSelectionMonId(), CB2_LoadMap);
+    case ACTIVITY_PJUMP:
+        SetCableClubStateAndWarpCurrentMap(USING_MINIGAME, 5, 1);
+        StartPokemonJump(GetCursorSelectionMonId(), CB2_LoadMap);
         break;
-    case 10:
-        sub_8117440(USING_BERRY_CRUSH, 9, 1);
-        sub_814B754(CB2_LoadMap);
+    case ACTIVITY_BCRUSH:
+        SetCableClubStateAndWarpCurrentMap(USING_BERRY_CRUSH, 9, 1);
+        StartBerryCrush(CB2_LoadMap);
         break;
-    case 11:
-        sub_8117440(USING_MINIGAME, 5, 1);
-        sub_81507FC(GetCursorSelectionMonId(), CB2_LoadMap);
+    case ACTIVITY_BPICK:
+        SetCableClubStateAndWarpCurrentMap(USING_MINIGAME, 5, 1);
+        StartDodrioBerryPicking(GetCursorSelectionMonId(), CB2_LoadMap);
         break;
     }
 
@@ -1878,7 +2000,7 @@ static void sub_81175BC(u8 taskId)
     ScriptContext2_Disable();
 }
 
-static void sub_8117900(u8 taskId)
+static void Task_RunScriptAndFadeToActivity(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     u16 *sendBuff = (u16*)(gBlockSendBuffer);
@@ -1900,7 +2022,7 @@ static void sub_8117900(u8 taskId)
     case 2:
         if (!gPaletteFade.active)
         {
-            sub_800AB9C();
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             data[0]++;
         }
         break;
@@ -1908,38 +2030,38 @@ static void sub_8117900(u8 taskId)
         if (IsLinkTaskFinished())
         {
             DestroyTask(taskId);
-            sub_81179A4();
+            CreateTask_StartActivity();
         }
         break;
     }
 }
 
-static void sub_8117990(void)
+static void CreateTask_RunScriptAndFadeToActivity(void)
 {
-    CreateTask(sub_8117900, 0);
+    CreateTask(Task_RunScriptAndFadeToActivity, 0);
 }
 
-static void sub_81179A4(void)
+static void CreateTask_StartActivity(void)
 {
-    u8 taskId = CreateTask(sub_81175BC, 0);
+    u8 taskId = CreateTask(Task_StartActivity, 0);
     gTasks[taskId].data[0] = 0;
 }
 
-void MEvent_CreateTask_Leader(u32 arg0)
+void MEvent_CreateTask_Leader(u32 activity)
 {
     u8 taskId;
     struct UnkStruct_Leader * dataPtr;
 
-    taskId = CreateTask(sub_8117A0C, 0);
+    taskId = CreateTask(Task_MEvent_Leader, 0);
     sUnionRoomMain.leader = dataPtr = (void*)(gTasks[taskId].data);
 
     dataPtr->state = 0;
     dataPtr->textState = 0;
-    dataPtr->field_18 = arg0;
+    dataPtr->activity = activity;
     gSpecialVar_Result = 0;
 }
 
-static void sub_8117A0C(u8 taskId)
+static void Task_MEvent_Leader(u8 taskId)
 {
     struct UnkStruct_Leader * data = sUnionRoomMain.leader;
     struct WindowTemplate winTemplate;
@@ -1948,43 +2070,43 @@ static void sub_8117A0C(u8 taskId)
     switch (data->state)
     {
     case 0:
-        gUnknown_203B058 = data->field_18;
-        gUnknown_203B059 = 2;
-        SetHostRFUtgtGname(data->field_18, 0, 0);
-        sub_80FAF74(FALSE, FALSE);
-        sub_800B1F4();
+        sPlayerCurrActivity = data->activity;
+        sPlayerActivityGroupSize = 2;
+        SetHostRFUtgtGname(data->activity, 0, 0);
+        SetGnameBufferWonderFlags(FALSE, FALSE);
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBB8C(2);
+        InitializeRfuLinkManager_LinkLeader(2);
         data->state = 1;
         break;
     case 1:
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        data->field_0 = AllocZeroed(5 * sizeof(struct UnkStruct_x20));
-        data->field_8 = AllocZeroed(5 * sizeof(struct UnkStruct_x20));
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 5);
-        LinkRfu3_SetGnameUnameFromStaticBuffers(&data->field_0->arr[0].unk.gname, data->field_0->arr[0].unk.playerName);
+        data->field_0 = AllocZeroed(UROOM_MAX_PARTY_SIZE * sizeof(struct UnkStruct_x20));
+        data->field_8 = AllocZeroed(UROOM_MAX_PARTY_SIZE * sizeof(struct UnkStruct_x20));
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, UROOM_MAX_PARTY_SIZE);
+        LinkRfu3_SetGnameUnameFromStaticBuffers(&data->field_0->arr[0].gname_uname.gname, data->field_0->arr[0].gname_uname.uname);
         data->field_0->arr[0].field_18 = 0;
-        data->field_0->arr[0].field_1A_0 = 1;
-        data->field_0->arr[0].field_1A_1 = 0;
+        data->field_0->arr[0].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
+        data->field_0->arr[0].field_1A_1 = FALSE;
         data->field_0->arr[0].field_1B = 0;
-        data->field_17 = sub_811A054(data->field_4, 0xFF);
+        data->listenTaskId = CreateTask_ListenForPartnersWithCompatibleSerialNos(data->field_4, 0xFF);
 
-        winTemplate = gUnknown_8456CFC;
+        winTemplate = sWindowTemplate_List_PossibleGroupMembers;
         winTemplate.baseBlock = GetMysteryGiftBaseBlock();
         data->listWindowId = AddWindow(&winTemplate);
         MG_DrawTextBorder(data->listWindowId);
-        gMultiuseListMenuTemplate = gUnknown_8456D34;
+        gMultiuseListMenuTemplate = sListMenuTemplate_PossibleGroupMembers;
         gMultiuseListMenuTemplate.windowId = data->listWindowId;
         data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
 
         CopyBgTilemapBufferToVram(0);
-        data->field_13 = 1;
+        data->playerCount = 1;
         data->state = 2;
         break;
     case 2:
-        StringCopy(gStringVar1, gUnknown_8456C74[gUnknown_203B058]);
-        sub_811599C(gStringVar4, gUnknown_203B058);
+        StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
+        StringExpandPlaceholders_AwaitingCommFromAnother(gStringVar4, sPlayerCurrActivity);
         data->state = 3;
         break;
     case 3:
@@ -1992,7 +2114,7 @@ static void sub_8117A0C(u8 taskId)
         data->state = 4;
         break;
     case 4:
-        sub_8116444(data, 5, 6);
+        Leader_SetStateIfMemberListChanged(data, 5, 6);
         if (JOY_NEW(B_BUTTON))
         {
             data->state = 13;
@@ -2000,9 +2122,10 @@ static void sub_8117A0C(u8 taskId)
         }
         break;
     case 6:
+        // The link with your friend has been dropped...
         if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84577F8))
         {
-            data->field_13 = sub_81165E8(data->field_0);
+            data->playerCount = UnionRoomLeaderField0CompactionAndCount(data->field_0);
             RedrawListMenu(data->listTaskId);
             data->state = 2;
         }
@@ -2011,44 +2134,44 @@ static void sub_8117A0C(u8 taskId)
         data->state = 7;
         break;
     case 7:
-        switch (mevent_message_print_and_prompt_yes_no(&data->textState, (u16 *)&data->field_14, FALSE, gStringVar4))
+        switch (mevent_message_print_and_prompt_yes_no(&data->textState, (u16 *)&data->messageWindowId, FALSE, gStringVar4))
         {
         case 0:
             LoadWirelessStatusIndicatorSpriteGfx();
             CreateWirelessStatusIndicatorSprite(0, 0);
-            data->field_0->arr[data->field_13].field_1B = 0;
+            data->field_0->arr[data->playerCount].field_1B = 0;
             RedrawListMenu(data->listTaskId);
             data->field_19 = 5;
-            sub_80FA670(5, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+            SendByteToPartnerByIdAndName(5, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
             data->state = 8;
             break;
         case 1:
         case -1:
             data->field_19 = 6;
-            sub_80FA670(6, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+            SendByteToPartnerByIdAndName(6, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
             data->state = 8;
             break;
         }
         break;
     case 8:
-        val = sub_80FA6FC(ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName);
+        val = WaitSendByteToPartnerByIdAndName(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname);
         if (val == 1)
         {
             if (data->field_19 == 5)
             {
-                data->field_0->arr[data->field_13].field_1B = 0;
+                data->field_0->arr[data->playerCount].field_1B = 0;
                 RedrawListMenu(data->listTaskId);
-                data->field_13++;
-                IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->field_13 - 1]);
+                data->playerCount++;
+                IntlConvPartnerUname7(gStringVar1, data->field_0->arr[data->playerCount - 1]);
                 StringExpandPlaceholders(gStringVar4, gUnknown_8457554);
                 data->state = 9;
-                sub_80F8F5C();
+                LinkRfu_StopManagerAndFinalizeSlots();
             }
             else
             {
-                sub_80FBD4C(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.gname.unk_00.playerTrainerId));
-                data->field_0->arr[data->field_13].field_1A_0 = 0;
-                sub_81165E8(data->field_0);
+                RequestDisconnectSlotByTrainerNameAndId(data->field_0->arr[data->playerCount].gname_uname.uname, ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId));
+                data->field_0->arr[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE;
+                UnionRoomLeaderField0CompactionAndCount(data->field_0);
                 RedrawListMenu(data->listTaskId);
                 data->state = 2;
             }
@@ -2057,7 +2180,7 @@ static void sub_8117A0C(u8 taskId)
         }
         else if (val == 2)
         {
-            sub_80FB9E4(0, 0);
+            RfuSetErrorStatus(0, 0);
             data->state = 2;
         }
         break;
@@ -2066,17 +2189,17 @@ static void sub_8117A0C(u8 taskId)
         data->state = 10;
         break;
     case 10:
-        if (++data->field_E > 120)
+        if (++data->delayTimerAfterOk > 120)
             data->state = 11;
         break;
     case 11:
-        if (!sub_8116444(data, 5, 6))
+        if (!Leader_SetStateIfMemberListChanged(data, 5, 6))
             data->state = 12;
         break;
     case 12:
-        if (sub_80F8F40())
+        if (LmanAcceptSlotFlagIsNotZero())
         {
-            sub_80F8F7C(FALSE);
+            WaitRfuState(FALSE);
             data->state = 15;
         }
         else
@@ -2086,17 +2209,18 @@ static void sub_8117A0C(u8 taskId)
         break;
     case 13:
         DestroyWirelessStatusIndicatorSprite();
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
         DestroyListMenuTask(data->listTaskId, 0, 0);
         CopyBgTilemapBufferToVram(0);
         RemoveWindow(data->listWindowId);
-        DestroyTask(data->field_17);
+        DestroyTask(data->listenTaskId);
         Free(data->field_8);
         Free(data->field_0);
         Free(data->field_4);
         data->state++;
         break;
     case 14:
+        // Please start over from the beginning.
         if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_84571B8))
         {
             DestroyTask(taskId);
@@ -2104,13 +2228,13 @@ static void sub_8117A0C(u8 taskId)
         }
         break;
     case 15:
-        if (sub_80FB9F4() == 1 || sub_80FB9F4() == 2)
+        if (RfuGetErrorStatus() == 1 || RfuGetErrorStatus() == 2)
         {
             data->state = 13;
         }
         else if (gReceivedRemoteLinkPlayers != 0)
         {
-            sub_80FAFE0(1);
+            UpdateGameData_GroupLockedIn(TRUE);
             data->state++;
         }
         break;
@@ -2118,11 +2242,11 @@ static void sub_8117A0C(u8 taskId)
         DestroyListMenuTask(data->listTaskId, 0, 0);
         CopyBgTilemapBufferToVram(0);
         RemoveWindow(data->listWindowId);
-        DestroyTask(data->field_17);
+        DestroyTask(data->listenTaskId);
         Free(data->field_8);
         Free(data->field_0);
         Free(data->field_4);
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         data->state++;
         break;
     case 17:
@@ -2132,22 +2256,22 @@ static void sub_8117A0C(u8 taskId)
     }
 }
 
-void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0)
+void MEvent_CreateTask_CardOrNewsWithFriend(u32 activity)
 {
     u8 taskId;
     struct UnkStruct_Group * dataPtr;
 
-    taskId = CreateTask(sub_8117F20, 0);
+    taskId = CreateTask(Task_CardOrNewsWithFriend, 0);
     sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data);
     sGroup = dataPtr;
 
     dataPtr->state = 0;
     dataPtr->textState = 0;
-    dataPtr->field_12 = arg0 - 21;
+    dataPtr->cardOrNews = activity - ACTIVITY_WCARD2; // 0: Card; 1: News
     gSpecialVar_Result = 0;
 }
 
-static void sub_8117F20(u8 taskId)
+static void Task_CardOrNewsWithFriend(u8 taskId)
 {
     s32 id;
     struct WindowTemplate winTemplate1, winTemplate2;
@@ -2156,10 +2280,10 @@ static void sub_8117F20(u8 taskId)
     switch (data->state)
     {
     case 0:
-        SetHostRFUtgtGname(data->field_12 + 21, 0, 0);
-        sub_800B1F4();
+        SetHostRFUtgtGname(data->cardOrNews + ACTIVITY_WCARD2, 0, 0);
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBBD8();
+        InitializeRfuLinkManager_JoinGroup();
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
         data->field_0 = AllocZeroed(16 * sizeof(struct UnkStruct_x20));
         data->state = 1;
@@ -2169,33 +2293,33 @@ static void sub_8117F20(u8 taskId)
         data->state = 2;
         break;
     case 2:
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 16);
-        data->field_11 = sub_811A054(data->field_4, data->field_12 + 7);
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, 16);
+        data->listenTaskId = CreateTask_ListenForPartnersWithCompatibleSerialNos(data->field_4, data->cardOrNews + LINK_GROUP_WONDER_CARD);
 
-        winTemplate1 = gUnknown_8456D4C;
+        winTemplate1 = sWindowTemplate_MysteryGiftList;
         winTemplate1.baseBlock = GetMysteryGiftBaseBlock();
         data->listWindowId = AddWindow(&winTemplate1);
 
-        data->field_D = AddWindow(&gUnknown_8456D54);
+        data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_MysteryGiftPlayerNameAndId);
 
         MG_DrawTextBorder(data->listWindowId);
-        gMultiuseListMenuTemplate = gUnknown_8456DDC;
+        gMultiuseListMenuTemplate = sListMenuTemplate_UnionRoomGroups;
         gMultiuseListMenuTemplate.windowId = data->listWindowId;
         data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
 
-        MG_DrawTextBorder(data->field_D);
-        FillWindowPixelBuffer(data->field_D, PIXEL_FILL(1));
-        PutWindowTilemap(data->field_D);
-        sub_8115924(data->field_D);
-        CopyWindowToVram(data->field_D, 2);
+        MG_DrawTextBorder(data->playerNameAndIdWindowId);
+        FillWindowPixelBuffer(data->playerNameAndIdWindowId, PIXEL_FILL(1));
+        PutWindowTilemap(data->playerNameAndIdWindowId);
+        PrintPlayerNameAndIdOnWindow(data->playerNameAndIdWindowId);
+        CopyWindowToVram(data->playerNameAndIdWindowId, 2);
 
         CopyBgTilemapBufferToVram(0);
-        data->field_F = 0;
+        data->leaderId = 0;
         data->state = 3;
         break;
     case 3:
-        id = sub_8116FE4();
+        id = GetNewLeaderCandidate();
         switch (id)
         {
         case 1:
@@ -2209,16 +2333,16 @@ static void sub_8117F20(u8 taskId)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 unusedVar;
-                unusedVar  = data->field_0->arr[id].unk.gname.unk_0a_0;
+                unusedVar  = data->field_0->arr[id].gname_uname.gname.activity;
 
-                if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.gname.unk_0a_7)
+                if (data->field_0->arr[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->field_0->arr[id].gname_uname.gname.started)
                 {
-                    data->field_F = id;
+                    data->leaderId = id;
                     LoadWirelessStatusIndicatorSpriteGfx();
                     CreateWirelessStatusIndicatorSprite(0, 0);
                     RedrawListMenu(data->listTaskId);
-                    IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->field_F]);
-                    sub_80FBF54(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.gname.unk_00.playerTrainerId));
+                    IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]);
+                    CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.uname, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId));
                     PlaySE(SE_PN_ON);
                     data->state = 4;
                 }
@@ -2236,17 +2360,17 @@ static void sub_8117F20(u8 taskId)
         break;
     case 4:
         AddTextPrinterToWindow1(gUnknown_8459238);
-        IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->field_F]);
+        IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]);
         data->state = 5;
         break;
     case 5:
         if (gReceivedRemoteLinkPlayers != 0)
         {
-            gUnknown_203B058 = data->field_0->arr[data->field_F].unk.gname.unk_0a_0;
+            sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
             data->state = 10;
         }
 
-        switch (sub_80FB9F4())
+        switch (RfuGetErrorStatus())
         {
         case 1:
         case 2:
@@ -2255,7 +2379,7 @@ static void sub_8117F20(u8 taskId)
             break;
         case 5:
             AddTextPrinterToWindow1(gUnknown_84576AC);
-            sub_80FB9E4(0, 0);
+            RfuSetErrorStatus(0, 0);
             break;
         }
         break;
@@ -2264,19 +2388,19 @@ static void sub_8117F20(u8 taskId)
     case 10:
         DestroyListMenuTask(data->listTaskId, 0, 0);
         CopyBgTilemapBufferToVram(0);
-        RemoveWindow(data->field_D);
+        RemoveWindow(data->playerNameAndIdWindowId);
         RemoveWindow(data->listWindowId);
-        DestroyTask(data->field_11);
+        DestroyTask(data->listenTaskId);
         Free(data->field_0);
         Free(data->field_4);
         data->state++;
         break;
     case 9:
-        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[sub_80FB9F4()]))
+        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetErrorStatus()]))
         {
             DestroyWirelessStatusIndicatorSprite();
             DestroyTask(taskId);
-            sub_80F8DC0();
+            LinkRfu_Shutdown();
             gSpecialVar_Result = 5;
         }
         break;
@@ -2284,12 +2408,12 @@ static void sub_8117F20(u8 taskId)
         DestroyWirelessStatusIndicatorSprite();
         AddTextPrinterToWindow1(gUnknown_84571B8);
         DestroyTask(taskId);
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
         gSpecialVar_Result = 5;
         break;
     case 11:
         data->state++;
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         break;
     case 12:
         if (IsLinkTaskFinished())
@@ -2298,22 +2422,22 @@ static void sub_8117F20(u8 taskId)
     }
 }
 
-void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0)
+void MEvent_CreateTask_CardOrNewsOverWireless(u32 activity)
 {
     u8 taskId;
     struct UnkStruct_Group * dataPtr;
 
-    taskId = CreateTask(sub_81182DC, 0);
+    taskId = CreateTask(Task_CardOrNewsOverWireless, 0);
     sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data);
     sGroup = dataPtr;
 
     dataPtr->state = 0;
     dataPtr->textState = 0;
-    dataPtr->field_12 = arg0 - 21;
+    dataPtr->cardOrNews = activity - ACTIVITY_WCARD2; // 0: Card; 1: News
     gSpecialVar_Result = 0;
 }
 
-static void sub_81182DC(u8 taskId)
+static void Task_CardOrNewsOverWireless(u8 taskId)
 {
     s32 id;
     struct WindowTemplate winTemplate;
@@ -2323,9 +2447,9 @@ static void sub_81182DC(u8 taskId)
     {
     case 0:
         SetHostRFUtgtGname(0, 0, 0);
-        sub_800B1F4();
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBBD8();
+        InitializeRfuLinkManager_JoinGroup();
         data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
         data->field_0 = AllocZeroed(16 * sizeof(struct UnkStruct_x20));
         data->state = 1;
@@ -2335,29 +2459,29 @@ static void sub_81182DC(u8 taskId)
         data->state = 2;
         break;
     case 2:
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A5E4(data->field_0->arr, 16);
-        data->field_11 = sub_811A084(data->field_4, data->field_12 + 7);
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x20Array(data->field_0->arr, 16);
+        data->listenTaskId = CreateTask_ListenForPartnersWithSerial7F7D(data->field_4, data->cardOrNews + LINK_GROUP_WONDER_CARD);
 
         if (data->field_13 != 0)
         {
-            winTemplate = gUnknown_8456D4C;
+            winTemplate = sWindowTemplate_MysteryGiftList;
             winTemplate.baseBlock = GetMysteryGiftBaseBlock();
             data->listWindowId = AddWindow(&winTemplate);
 
             MG_DrawTextBorder(data->listWindowId);
-            gMultiuseListMenuTemplate = gUnknown_8456DDC;
+            gMultiuseListMenuTemplate = sListMenuTemplate_UnionRoomGroups;
             gMultiuseListMenuTemplate.windowId = data->listWindowId;
             data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
 
             CopyBgTilemapBufferToVram(0);
         }
 
-        data->field_F = 0;
+        data->leaderId = 0;
         data->state = 3;
         break;
     case 3:
-        id = sub_8116FE4();
+        id = GetNewLeaderCandidate();
         switch (id)
         {
         case 1:
@@ -2369,17 +2493,17 @@ static void sub_81182DC(u8 taskId)
         case 0:
             if (data->field_13 != 0)
                 id = ListMenu_ProcessInput(data->listTaskId);
-            if (data->field_14 > 120)
+            if (data->refreshTimer > 120)
             {
-                if (data->field_0->arr[0].field_1A_0 == 1 && !data->field_0->arr[0].unk.gname.unk_0a_7)
+                if (data->field_0->arr[0].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->field_0->arr[0].gname_uname.gname.started)
                 {
-                    if (sub_8119FB0(&data->field_0->arr[0].unk.gname, data->field_12 + 7))
+                    if (GetGnameWonderFlagByLinkGroup(&data->field_0->arr[0].gname_uname.gname, data->cardOrNews + LINK_GROUP_WONDER_CARD))
                     {
-                        data->field_F = 0;
-                        data->field_14 = 0;
+                        data->leaderId = 0;
+                        data->refreshTimer = 0;
                         LoadWirelessStatusIndicatorSpriteGfx();
                         CreateWirelessStatusIndicatorSprite(0, 0);
-                        sub_80FBF54(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.gname.unk_00.playerTrainerId));
+                        CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.uname, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId));
                         PlaySE(SE_PN_ON);
                         data->state = 4;
                     }
@@ -2393,25 +2517,25 @@ static void sub_81182DC(u8 taskId)
             else if (JOY_NEW(B_BUTTON))
             {
                 data->state = 6;
-                data->field_14 = 0;
+                data->refreshTimer = 0;
             }
-            data->field_14++;
+            data->refreshTimer++;
             break;
         }
         break;
     case 4:
         AddTextPrinterToWindow1(gUnknown_845928C);
-        IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->field_F]);
+        IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]);
         data->state = 5;
         break;
     case 5:
         if (gReceivedRemoteLinkPlayers != 0)
         {
-            gUnknown_203B058 = data->field_0->arr[data->field_F].unk.gname.unk_0a_0;
+            sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
             data->state = 12;
         }
 
-        switch (sub_80FB9F4())
+        switch (RfuGetErrorStatus())
         {
         case 1:
         case 2:
@@ -2420,7 +2544,7 @@ static void sub_81182DC(u8 taskId)
             break;
         case 5:
             AddTextPrinterToWindow1(gUnknown_845777C);
-            sub_80FB9E4(0, 0);
+            RfuSetErrorStatus(0, 0);
             break;
         }
         break;
@@ -2434,7 +2558,7 @@ static void sub_81182DC(u8 taskId)
             CopyBgTilemapBufferToVram(0);
             RemoveWindow(data->listWindowId);
         }
-        DestroyTask(data->field_11);
+        DestroyTask(data->listenTaskId);
         Free(data->field_0);
         Free(data->field_4);
         data->state++;
@@ -2444,7 +2568,7 @@ static void sub_81182DC(u8 taskId)
         {
             DestroyWirelessStatusIndicatorSprite();
             DestroyTask(taskId);
-            sub_80F8DC0();
+            LinkRfu_Shutdown();
             gSpecialVar_Result = 5;
         }
         break;
@@ -2453,22 +2577,22 @@ static void sub_81182DC(u8 taskId)
         {
             DestroyWirelessStatusIndicatorSprite();
             DestroyTask(taskId);
-            sub_80F8DC0();
+            LinkRfu_Shutdown();
             gSpecialVar_Result = 5;
         }
         break;
     case 11:
-        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_845933C[data->field_12]))
+        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_845933C[data->cardOrNews]))
         {
             DestroyWirelessStatusIndicatorSprite();
             DestroyTask(taskId);
-            sub_80F8DC0();
+            LinkRfu_Shutdown();
             gSpecialVar_Result = 5;
         }
         break;
     case 13:
         data->state++;
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         break;
     case 14:
         if (IsLinkTaskFinished())
@@ -2482,7 +2606,7 @@ void UnionRoomSpecial(void)
     struct UnkStruct_URoom * dataPtr;
 
     ClearAndInitHostRFUtgtGname();
-    CreateTask(sub_81186E0, 10);
+    CreateTask(Task_RunUnionRoom, 10);
 
     // dumb line needed to match
     sUnionRoomMain.uRoom = sUnionRoomMain.uRoom;
@@ -2497,7 +2621,7 @@ void UnionRoomSpecial(void)
     dataPtr->field_12 = 0;
 
     gSpecialVar_Result = 0;
-    sub_8107D38(0xD0, 1);
+    ListMenuLoadStdPalAt(0xD0, 1);
 }
 
 static u16 ReadAsU16(const u8 *ptr)
@@ -2505,7 +2629,7 @@ static u16 ReadAsU16(const u8 *ptr)
     return (ptr[1] << 8) | (ptr[0]);
 }
 
-static void sub_8118664(u32 nextState, const u8 *src)
+static void UnionRoom_ScheduleFieldMessageWithFollowupState(u32 nextState, const u8 *src)
 {
     struct UnkStruct_URoom * data = sUnionRoomMain.uRoom;
 
@@ -2515,7 +2639,7 @@ static void sub_8118664(u32 nextState, const u8 *src)
         StringExpandPlaceholders(gStringVar4, src);
 }
 
-static void sub_811868C(const u8 *src)
+static void UnionRoom_ScheduleFieldMessageAndExit(const u8 *src)
 {
     struct UnkStruct_URoom * data = sUnionRoomMain.uRoom;
 
@@ -2524,17 +2648,17 @@ static void sub_811868C(const u8 *src)
         StringExpandPlaceholders(gStringVar4, src);
 }
 
-static void sub_81186B0(struct UnkStruct_URoom * data)
+static void BackUpURoomField0ToDecompressionBuffer(struct UnkStruct_URoom * data)
 {
-    memcpy(&gDecompressionBuffer[0x3F00], data->field_0, 8 * sizeof(struct UnkStruct_x20));
+    memcpy(&gDecompressionBuffer[0x3F00], data->field_0, UROOM_MAX_GROUP_COUNT * sizeof(struct UnkStruct_x20));
 }
 
-static void sub_81186C8(struct UnkStruct_URoom * data)
+static void RestoreURoomField0FromDecompressionBuffer(struct UnkStruct_URoom * data)
 {
-    memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 8 * sizeof(struct UnkStruct_x20));
+    memcpy(data->field_0, &gDecompressionBuffer[0x3F00], UROOM_MAX_GROUP_COUNT * sizeof(struct UnkStruct_x20));
 }
 
-static void sub_81186E0(u8 taskId)
+static void Task_RunUnionRoom(u8 taskId)
 {
     u32 id = 0;
     s32 var5 = 0;
@@ -2545,53 +2669,53 @@ static void sub_81186E0(u8 taskId)
     switch (data->state)
     {
     case 0:
-        data->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        data->field_C = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        data->field_0 = AllocZeroed(8 * sizeof(struct UnkStruct_x20));
+        data->field_4 = AllocZeroed(RFU_CHILD_MAX * sizeof(struct UnkStruct_x1C));
+        data->field_C = AllocZeroed(RFU_CHILD_MAX * sizeof(struct UnkStruct_x1C));
+        data->field_0 = AllocZeroed(UROOM_MAX_GROUP_COUNT * sizeof(struct UnkStruct_x20));
         data->field_8 = AllocZeroed(sizeof(struct UnkStruct_x20));
-        sub_811A5E4(data->field_0->arr, 8);
-        gUnknown_203B058 = 0x40;
-        data->field_20 = sub_8119E84(data->field_C, data->field_4, 9);
+        BlankUnkStruct_x20Array(data->field_0->arr, UROOM_MAX_GROUP_COUNT);
+        sPlayerCurrActivity = IN_UNION_ROOM;
+        data->field_20 = CreateTask_SearchForChildOrParent(data->field_C, data->field_4, LINK_GROUP_UNION_ROOM_RESUME);
         ZeroUnionObjWork(data->unionObjs);
-        sub_811BB68();
+        MakeGroupAssemblyAreasPassable();
         data->state = 1;
         break;
     case 1:
-        sub_811BAAC(data->spriteIds, taskData[0]);
+        CreateGroupMemberObjectsInvisible(data->spriteIds, taskData[0]);
         if (++taskData[0] == 8)
             data->state = 2;
         break;
     case 2:
-        SetHostRFUtgtGname(0x40, 0, 0);
-        sub_80FAFA0(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
-        sub_800B1F4();
+        SetHostRFUtgtGname(IN_UNION_ROOM, 0, 0);
+        RfuUpdatePlayerGnameStateAndSend(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBC00();
-        sub_811A5E4(&data->field_8->arr[0], 1);
-        sub_811A650(data->field_4->arr, 4);
-        sub_811A650(data->field_C->arr, 4);
+        InitializeRfuLinkManager_EnterUnionRoom();
+        BlankUnkStruct_x20Array(&data->field_8->arr[0], 1);
+        BlankUnkStruct_x1CArray(data->field_4->arr, 4);
+        BlankUnkStruct_x1CArray(data->field_C->arr, 4);
         gSpecialVar_Result = 0;
         data->state = 3;
         break;
     case 3:
         if ((GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_REGISTER
-             || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE)
+          || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE)
             && sUnionRoomTrade.field_0 != 0)
         {
             id = GetCursorSelectionMonId();
             switch (sUnionRoomTrade.field_0)
             {
             case 1:
-                sub_80FB008(0x54, 0, 1);
+                UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
                 if (id >= PARTY_SIZE)
                 {
                     ResetUnionRoomTrade(&sUnionRoomTrade);
-                    sub_80FAFA0(0, 0, 0);
-                    sub_811868C(gUnknown_8458D54);
+                    RfuUpdatePlayerGnameStateAndSend(0, 0, 0);
+                    UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D54);
                 }
                 else if (!RegisterTradeMonAndGetIsEgg(GetCursorSelectionMonId(), &sUnionRoomTrade))
                 {
-                    sub_8118664(0x34, gUnknown_8458CD4);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(52, gURText_PleaseChooseTypeOfMon);
                 }
                 else
                 {
@@ -2599,16 +2723,16 @@ static void sub_81186E0(u8 taskId)
                 }
                 break;
             case 2:
-                sub_81186C8(data);
+                RestoreURoomField0FromDecompressionBuffer(data);
                 taskData[1] = sUnionRoomTrade.field_8;
                 if (id >= PARTY_SIZE)
                 {
-                    sub_811868C(gUnknown_8458D9C);
+                    UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D9C);
                 }
                 else
                 {
-                    sub_80FB008(0x54, 0, 1);
-                    gUnknown_203B058 = 0x44;
+                    UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
+                    sPlayerCurrActivity = ACTIVITY_TRADE | IN_UNION_ROOM;
                     RegisterTradeMon(GetCursorSelectionMonId(), &sUnionRoomTrade);
                     data->state = 51;
                 }
@@ -2626,7 +2750,7 @@ static void sub_81186E0(u8 taskId)
         {
             if (gSpecialVar_Result == 9)
             {
-                sub_80FB008(0x54, 0, 1);
+                UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
                 PlaySE(SE_PC_LOGIN);
                 StringCopy(gStringVar1, gSaveBlock2Ptr->playerName);
                 data->state = 42;
@@ -2634,7 +2758,7 @@ static void sub_81186E0(u8 taskId)
             }
             else if (gSpecialVar_Result == 11)
             {
-                sub_80FB008(0x54, 0, 1);
+                UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
                 data->state = 23;
                 gSpecialVar_Result = 0;
             }
@@ -2650,98 +2774,98 @@ static void sub_81186E0(u8 taskId)
         {
             if (JOY_NEW(A_BUTTON))
             {
-                if (sub_811BF00(data->field_0, &taskData[0], &taskData[1], data->spriteIds))
+                if (RfuUnionTool_GetGroupAndMemberInFrontOfPlayer(data->field_0, &taskData[0], &taskData[1], data->spriteIds))
                 {
                     PlaySE(SE_SELECT);
-                    sub_811B298();
+                    UR_EnableScriptContext2AndFreezeObjectEvents();
                     data->state = 24;
                     break;
                 }
-                else if (sub_811A9B8())
+                else if (PlayerIsTalkingToUnionRoomAide())
                 {
-                    sub_80FB008(0x54, 0, 1);
+                    UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
                     PlaySE(SE_PC_LOGIN);
-                    sub_811B298();
+                    UR_EnableScriptContext2AndFreezeObjectEvents();
                     StringCopy(gStringVar1, gSaveBlock2Ptr->playerName);
                     data->state = 45;
                     break;
                 }
             }
 
-            switch (sub_8119B94())
+            switch (HandlePlayerListUpdate())
             {
             case 1:
                 PlaySE(SE_TOY_C);
             case 2:
-                sub_811BECC(data);
+                ScheduleUnionRoomPlayerRefresh(data);
                 break;
             case 4:
                 data->state = 11;
-                sub_811B298();
-                sub_80FAFA0(0, 0, 0);
-                sub_80FB008(0x53, sub_811B2D8(data), 0);
+                UR_EnableScriptContext2AndFreezeObjectEvents();
+                RfuUpdatePlayerGnameStateAndSend(0, 0, 0);
+                UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_NPCTALK | IN_UNION_ROOM, GetActivePartnerSpriteGenderParam(data), FALSE);
                 break;
             }
-            sub_811BEDC(data);
+            HandleUnionRoomPlayerRefresh(data);
         }
         break;
     case 23:
         if (!FuncIsActiveTask(Task_StartMenuHandleInput))
         {
-            sub_80FB008(0x40, 0, 0);
+            UpdateGameDataWithActivitySpriteGendersFlag(IN_UNION_ROOM, 0, FALSE);
             data->state = 4;
         }
         break;
     case 24:
-        sub_811A0E0();
+        UR_RunTextPrinters_CheckPrinter0Active();
         playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-        sub_80FB008(0x54, 0, 1);
-        switch (sub_811AA5C(data->field_0, taskData[0], taskData[1], playerGender))
+        UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
+        switch (UnionRoomGetPlayerInteractionResponse(data->field_0, taskData[0], taskData[1], playerGender))
         {
         case 0:
             data->state = 26;
             break;
         case 1:
-            sub_80FC114(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.gname, gUnknown_203B058);
+            sub_80FC114(data->field_0->arr[taskData[1]].gname_uname.uname, &data->field_0->arr[taskData[1]].gname_uname.gname, sPlayerCurrActivity);
             data->field_12 = id; // Should be just 0, but won't match any other way.
             data->state = 25;
             break;
         case 2:
-            sub_8118664(0x13, gStringVar4);
+            UnionRoom_ScheduleFieldMessageWithFollowupState(19, gStringVar4);
             break;
         }
         break;
     case 25:
-        sub_811A0E0();
-        switch (sub_80FB9F4())
+        UR_RunTextPrinters_CheckPrinter0Active();
+        switch (RfuGetErrorStatus())
         {
         case 4:
-            sub_811B258(TRUE);
+            HandleCancelTrade(TRUE);
             data->state = 4;
             break;
         case 1:
         case 2:
-            if (sub_80FBB0C() == TRUE)
-                sub_811868C(gUnknown_8457F90);
+            if (IsUnionRoomListenTaskActive() == TRUE)
+                UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8457F90);
             else
-                sub_8118664(30, gUnknown_8457F90);
+                UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_8457F90);
 
-            gUnknown_203B058 = 0x40;
+            sPlayerCurrActivity = IN_UNION_ROOM;
             break;
         }
 
         if (gReceivedRemoteLinkPlayers != 0)
         {
-            sub_8117594(gBlockSendBuffer, TRUE);
-            CreateTask(sub_8117280, 5);
+            CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
+            CreateTask(Task_ExchangeCards, 5);
             data->state = 38;
         }
         break;
     case 38:
-        if (!FuncIsActiveTask(sub_8117280))
+        if (!FuncIsActiveTask(Task_ExchangeCards))
         {
-            if (gUnknown_203B058 == 0x44)
-                sub_8118664(31, gUnknown_84578BC);
+            if (sPlayerCurrActivity == (ACTIVITY_TRADE | IN_UNION_ROOM))
+                UnionRoom_ScheduleFieldMessageWithFollowupState(31, gUnknown_84578BC);
             else
                 data->state = 5;
         }
@@ -2749,18 +2873,18 @@ static void sub_81186E0(u8 taskId)
     case 30:
         if (gReceivedRemoteLinkPlayers == 0)
         {
-            sub_811B258(FALSE);
-            sub_811C028(taskData[0], taskData[1], data->field_0);
+            HandleCancelTrade(FALSE);
+            UpdateUnionGroupMemberFacing(taskData[0], taskData[1], data->field_0);
             data->state = 2;
         }
         break;
     case 5:
-        id = sub_811AA24(&data->field_0->arr[taskData[1]]);
+        id = ConvPartnerUnameAndGetWhetherMetAlready(&data->field_0->arr[taskData[1]]);
         playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-        sub_8118664(6, gUnknown_8457B04[id][playerGender]);
+        UnionRoom_ScheduleFieldMessageWithFollowupState(6, gURText_FriendPromptsForActivity[id][playerGender]);
         break;
     case 6:
-        var5 = sub_811A218(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_8456DF4, &gUnknown_8456E1C);
+        var5 = ListMenuHandler_AllItemsAvailable(&data->textState, &data->topListMenuWindowId, &data->topListMenuListMenuId, &sWindowTemplate_InviteToActivity, &sListMenuTemplate_InviteToActivity);
         if (var5 != -1)
         {
             if (gReceivedRemoteLinkPlayers == 0)
@@ -2769,27 +2893,27 @@ static void sub_81186E0(u8 taskId)
             }
             else
             {
-                data->field_98 = 0;
+                data->partnerYesNoResponse = 0;
                 playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-                if (var5 == -2 || var5 == 0x40)
+                if (var5 == -2 || var5 == IN_UNION_ROOM)
                 {
-                    data->field_4C[0] = 0x40;
-                    sub_80F9E2C(data->field_4C);
+                    data->playerSendBuffer[0] = IN_UNION_ROOM;
+                    RfuPrepareSend0x2f00(data->playerSendBuffer);
                     StringCopy(gStringVar4, gUnknown_845842C[gLinkPlayers[0].gender]);
                     data->state = 32;
                 }
                 else
                 {
-                    gUnknown_203B058 = var5;
-                    gUnknown_203B059 = (u32)(var5) >> 8;
-                    if (gUnknown_203B058 == 0x41 && !HasAtLeastTwoMonsOfLevel30OrLower())
+                    sPlayerCurrActivity = var5;
+                    sPlayerActivityGroupSize = (u32)(var5) >> 8;
+                    if (sPlayerCurrActivity == (ACTIVITY_BATTLE | IN_UNION_ROOM) && !HasAtLeastTwoMonsOfLevel30OrLower())
                     {
-                        sub_8118664(5, gUnknown_845847C);
+                        UnionRoom_ScheduleFieldMessageWithFollowupState(5, gUnknown_845847C);
                     }
                     else
                     {
-                        data->field_4C[0] = gUnknown_203B058 | 0x40;
-                        sub_80F9E2C(data->field_4C);
+                        data->playerSendBuffer[0] = sPlayerCurrActivity | IN_UNION_ROOM;
+                        RfuPrepareSend0x2f00(data->playerSendBuffer);
                         data->state = 27;
                     }
                 }
@@ -2801,24 +2925,24 @@ static void sub_81186E0(u8 taskId)
         data->state = 36;
         break;
     case 27:
-        sub_811B0A4(data);
+        PollPartnerYesNoResponse(data);
         playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-        id = sub_811A9FC(data->field_4C[0] & 0x3F);
-        if (PrintOnTextbox(&data->textState, gUnknown_84580F4[playerGender][id]))
+        id = GetResponseIdx_InviteToURoomActivity(data->playerSendBuffer[0] & 0x3F);
+        if (PrintOnTextbox(&data->textState, gResponseToURoomActivityInviteStringPtrs[playerGender][id]))
         {
             taskData[3] = 0;
             data->state = 29;
         }
         break;
     case 32:
-        sub_800AAC0();
+        Link_TryStartSend5FFF();
         data->state = 36;
         break;
     case 31:
-        data->field_4C[0] = 0x44;
-        data->field_4C[1] = sUnionRoomTrade.species;
-        data->field_4C[2] = sUnionRoomTrade.level;
-        sub_80F9E2C(data->field_4C);
+        data->playerSendBuffer[0] = ACTIVITY_TRADE | IN_UNION_ROOM;
+        data->playerSendBuffer[1] = sUnionRoomTrade.species;
+        data->playerSendBuffer[2] = sUnionRoomTrade.level;
+        RfuPrepareSend0x2f00(data->playerSendBuffer);
         data->state = 29;
         break;
     case 29:
@@ -2829,12 +2953,12 @@ static void sub_81186E0(u8 taskId)
         }
         else
         {
-            sub_811B0A4(data);
-            if (data->field_98 == 0x51)
+            PollPartnerYesNoResponse(data);
+            if (data->partnerYesNoResponse == (ACTIVITY_ACCEPT | IN_UNION_ROOM))
             {
-                if (gUnknown_203B058 == 8)
+                if (sPlayerCurrActivity == ACTIVITY_CARD)
                 {
-                    sub_811B31C(gStringVar4, data, FALSE);
+                    ViewURoomPartnerTrainerCard(gStringVar4, data, MODE_CHILD);
                     data->state = 40;
                 }
                 else
@@ -2842,27 +2966,27 @@ static void sub_81186E0(u8 taskId)
                     data->state = 13;
                 }
             }
-            else if (data->field_98 == 0x52)
+            else if (data->partnerYesNoResponse == (ACTIVITY_DECLINE | IN_UNION_ROOM))
             {
                 data->state = 32;
-                sub_811AE68(gStringVar4, gUnknown_203B058 | 0x40, gLinkPlayers[0].gender);
-                gUnknown_203B058 = 0;
+                GetURoomActivityRejectMsg(gStringVar4, sPlayerCurrActivity | IN_UNION_ROOM, gLinkPlayers[0].gender);
+                sPlayerCurrActivity = 0;
             }
         }
         break;
 
     case 7:
-        id = sub_811AA24(&data->field_0->arr[taskData[1]]);
+        id = ConvPartnerUnameAndGetWhetherMetAlready(&data->field_0->arr[taskData[1]]);
         playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-        sub_8118664(6, gUnknown_8457B04[id][playerGender]);
+        UnionRoom_ScheduleFieldMessageWithFollowupState(6, gURText_FriendPromptsForActivity[id][playerGender]);
         break;
     case 40:
         if (PrintOnTextbox(&data->textState, gStringVar4))
         {
             data->state = 41;
-            sub_800AB9C();
-            data->field_98 = 0;
-            data->field_9A[0] = 0;
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+            data->partnerYesNoResponse = 0;
+            data->recvActivityRequest[0] = 0;
         }
         break;
     case 41:
@@ -2882,13 +3006,13 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 19:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
             CopyBgTilemapBufferToVram(0);
-            gUnknown_203B058 = 0x45;
-            sub_80FB008(0x45, 0, 1);
-            sub_80FC114(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.gname, gUnknown_203B058);
+            sPlayerCurrActivity = ACTIVITY_CHAT | IN_UNION_ROOM;
+            UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_CHAT | IN_UNION_ROOM, 0, TRUE);
+            sub_80FC114(data->field_0->arr[taskData[1]].gname_uname.uname, &data->field_0->arr[taskData[1]].gname_uname.gname, sPlayerCurrActivity);
             data->field_12 = taskData[1];
             data->state = 20;
             taskData[3] = 0;
@@ -2896,7 +3020,7 @@ static void sub_81186E0(u8 taskId)
         case 1:
         case -1:
             playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-            sub_811868C(gUnknown_8458548[playerGender]);
+            UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458548[playerGender]);
             break;
         }
         break;
@@ -2908,20 +3032,20 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 21:
-        switch (sub_80FB9F4())
+        switch (RfuGetErrorStatus())
         {
         case 4:
-            sub_811B258(TRUE);
+            HandleCancelTrade(TRUE);
             data->state = 4;
             break;
         case 1:
         case 2:
             playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-            sub_80FB008(0x54, 0, 1);
-            if (sub_80FBB0C() == TRUE)
-                sub_811868C(gUnknown_84585E8[playerGender]);
+            UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
+            if (IsUnionRoomListenTaskActive() == TRUE)
+                UnionRoom_ScheduleFieldMessageAndExit(gUnknown_84585E8[playerGender]);
             else
-                sub_8118664(30, gUnknown_84585E8[playerGender]);
+                UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_84585E8[playerGender]);
             break;
         case 3:
             data->state = 22;
@@ -2930,14 +3054,14 @@ static void sub_81186E0(u8 taskId)
         taskData[3]++;
         break;
     case 22:
-        if (sub_80FBA00())
+        if (RfuIsErrorStatus1or2())
         {
             playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
-            sub_80FB008(0x54, 0, 1);
-            if (sub_80FBB0C() == TRUE)
-                sub_811868C(gUnknown_84585E8[playerGender]);
+            UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
+            if (IsUnionRoomListenTaskActive() == TRUE)
+                UnionRoom_ScheduleFieldMessageAndExit(gUnknown_84585E8[playerGender]);
             else
-                sub_8118664(30, gUnknown_84585E8[playerGender]);
+                UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_84585E8[playerGender]);
         }
         if (gReceivedRemoteLinkPlayers != 0)
             data->state = 16;
@@ -2946,24 +3070,24 @@ static void sub_81186E0(u8 taskId)
         PlaySE(SE_PINPON);
         sub_80F8FA0();
         data->state = 12;
-        data->field_9A[0] = 0;
+        data->recvActivityRequest[0] = 0;
         break;
     case 12:
-        if (sub_80FBA00())
+        if (RfuIsErrorStatus1or2())
         {
-            sub_811B258(FALSE);
+            HandleCancelTrade(FALSE);
             data->state = 2;
         }
         else if (gReceivedRemoteLinkPlayers != 0)
         {
-            sub_8117594(gBlockSendBuffer, TRUE);
-            CreateTask(sub_8117280, 5);
+            CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
+            CreateTask(Task_ExchangeCards, 5);
             data->state = 39;
         }
         break;
     case 39:
-        sub_8119904(data);
-        if (!FuncIsActiveTask(sub_8117280))
+        ReceiveUnionRoomActivityPacket(data);
+        if (!FuncIsActiveTask(Task_ExchangeCards))
         {
             data->state = 33;
             StringCopy(gStringVar1, gLinkPlayers[1].name);
@@ -2972,13 +3096,13 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 33:
-        sub_8119904(data);
+        ReceiveUnionRoomActivityPacket(data);
         if (PrintOnTextbox(&data->textState, gStringVar4))
             data->state = 34;
         break;
     case 34:
-        sub_8119904(data);
-        if (sub_8119944(data) && JOY_NEW(B_BUTTON))
+        ReceiveUnionRoomActivityPacket(data);
+        if (UnionRoom_HandleContactFromOtherPlayer(data) && JOY_NEW(B_BUTTON))
         {
             sub_80FBD6C(1);
             StringCopy(gStringVar4, gUnknown_8457E60);
@@ -2986,80 +3110,82 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 35:
-        sub_8118664(9, gStringVar4);
+        // You said yes
+        UnionRoom_ScheduleFieldMessageWithFollowupState(9, gStringVar4);
         break;
     case 9:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
-            data->field_4C[0] = 0x51;
-            if (gUnknown_203B058 == 0x45)
-                sub_80FB008(gUnknown_203B058 | 0x40, sub_811B2A8(1), 0);
+            data->playerSendBuffer[0] = ACTIVITY_ACCEPT | IN_UNION_ROOM;
+            if (sPlayerCurrActivity == (ACTIVITY_CHAT | IN_UNION_ROOM))
+                UpdateGameDataWithActivitySpriteGendersFlag(sPlayerCurrActivity | IN_UNION_ROOM, GetSinglePartnerSpriteGenderParam(1), FALSE);
             else
-                sub_80FB008(gUnknown_203B058 | 0x40, sub_811B2A8(1), 1);
+                UpdateGameDataWithActivitySpriteGendersFlag(sPlayerCurrActivity | IN_UNION_ROOM, GetSinglePartnerSpriteGenderParam(1), TRUE);
 
             data->field_8->arr[0].field_1B = 0;
             taskData[3] = 0;
-            if (gUnknown_203B058 == 0x41)
+            if (sPlayerCurrActivity == (ACTIVITY_BATTLE | IN_UNION_ROOM))
             {
                 if (!HasAtLeastTwoMonsOfLevel30OrLower())
                 {
-                    data->field_4C[0] = 0x52;
-                    sub_80F9E2C(data->field_4C);
+                    data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM;
+                    RfuPrepareSend0x2f00(data->playerSendBuffer);
                     data->state = 10;
                     StringCopy(gStringVar4, gUnknown_84584C0);
                 }
                 else
                 {
-                    sub_80F9E2C(data->field_4C);
+                    RfuPrepareSend0x2f00(data->playerSendBuffer);
                     data->state = 13;
                 }
             }
-            else if (gUnknown_203B058 == 0x48)
+            else if (sPlayerCurrActivity == (ACTIVITY_CARD | IN_UNION_ROOM))
             {
-                sub_80F9E2C(data->field_4C);
-                sub_811B31C(gStringVar4, data, 1);
+                RfuPrepareSend0x2f00(data->playerSendBuffer);
+                ViewURoomPartnerTrainerCard(gStringVar4, data, MODE_PARENT);
                 data->state = 40;
             }
             else
             {
-                sub_80F9E2C(data->field_4C);
+                RfuPrepareSend0x2f00(data->playerSendBuffer);
                 data->state = 13;
             }
             break;
         case 1:
         case -1:
-            data->field_4C[0] = 0x52;
-            sub_80F9E2C(data->field_4C);
+            data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM;
+            RfuPrepareSend0x2f00(data->playerSendBuffer);
             data->state = 10;
-            sub_81162E0(gStringVar4, gUnknown_203B058);
+            GetYouDeclinedTheOfferMessage(gStringVar4, sPlayerCurrActivity);
             break;
         }
         break;
     case 10:
-        sub_800AAC0();
+        Link_TryStartSend5FFF();
         data->state = 36;
         break;
     case 36:
+        // You said no
         if (gReceivedRemoteLinkPlayers == 0)
         {
-            gUnknown_203B058 = 0x40;
-            sub_8118664(0x25, gStringVar4);
-            memset(data->field_4C, 0, sizeof(data->field_4C));
-            data->field_9A[0] = 0;
-            data->field_98 = 0;
+            sPlayerCurrActivity = IN_UNION_ROOM;
+            UnionRoom_ScheduleFieldMessageWithFollowupState(37, gStringVar4);
+            memset(data->playerSendBuffer, 0, sizeof(data->playerSendBuffer));
+            data->recvActivityRequest[0] = 0;
+            data->partnerYesNoResponse = 0;
         }
         break;
     case 37:
         data->state = 2;
-        sub_811B258(FALSE);
+        HandleCancelTrade(FALSE);
         break;
     case 13:
-        sub_811AECC(gStringVar4, gUnknown_203B058 | 0x40);
-        sub_8118664(14, gStringVar4);
+        GetURoomActivityStartMsg(gStringVar4, sPlayerCurrActivity | IN_UNION_ROOM);
+        UnionRoom_ScheduleFieldMessageWithFollowupState(14, gStringVar4);
         break;
     case 14:
-        sub_800AB9C();
+        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
         data->state = 15;
         break;
     case 15:
@@ -3072,7 +3198,7 @@ static void sub_81186E0(u8 taskId)
         Free(data->field_C);
         Free(data->field_4);
         DestroyTask(data->field_20);
-        sub_811BB40(data->spriteIds);
+        DestroyGroupMemberObjects(data->spriteIds);
         data->state = 17;
         break;
     case 17:
@@ -3082,30 +3208,30 @@ static void sub_81186E0(u8 taskId)
     case 18:
         if (!UpdatePaletteFade())
         {
-            sub_811BA78();
+            DeleteUnionObjWorkAndStopTask();
             DestroyTask(taskId);
             Free(sUnionRoomMain.uRoom);
-            sub_81179A4();
+            CreateTask_StartActivity();
         }
         break;
     case 42:
-        if (sub_80F9800()->species == SPECIES_NONE)
+        if (GetHostRFUtgtGname()->species == SPECIES_NONE)
         {
             data->state = 43;
         }
         else
         {
-            if (sub_80F9800()->species == SPECIES_EGG)
+            if (GetHostRFUtgtGname()->species == SPECIES_EGG)
             {
                 StringCopy(gStringVar4, gUnknown_8458DE8);
             }
             else
             {
-                StringCopy(gStringVar1, gSpeciesNames[sub_80F9800()->species]);
-                ConvertIntToDecimalStringN(gStringVar2, sub_80F9800()->level, STR_CONV_MODE_LEFT_ALIGN, 3);
+                StringCopy(gStringVar1, gSpeciesNames[GetHostRFUtgtGname()->species]);
+                ConvertIntToDecimalStringN(gStringVar2, GetHostRFUtgtGname()->level, STR_CONV_MODE_LEFT_ALIGN, 3);
                 StringExpandPlaceholders(gStringVar4, gUnknown_8458DBC);
             }
-            sub_8118664(44, gStringVar4);
+            UnionRoom_ScheduleFieldMessageWithFollowupState(44, gStringVar4);
         }
         break;
     case 43:
@@ -3113,23 +3239,23 @@ static void sub_81186E0(u8 taskId)
             data->state = 47;
         break;
     case 47:
-        var5 = sub_811A218(&data->textState, &data->field_1D, &data->field_1E, &gUnknown_8456E34, &gUnknown_8456E54);
+        var5 = ListMenuHandler_AllItemsAvailable(&data->textState, &data->tradeBoardSelectWindowId, &data->tradeBoardDetailsWindowId, &sWindowTemplate_TradeBoardRegisterInfoExit, &sListMenuTemplate_TradeBoardRegisterInfoExit);
         if (var5 != -1)
         {
             if (var5 == -2 || var5 == 3)
             {
                 data->state = 4;
-                sub_811B258(TRUE);
+                HandleCancelTrade(TRUE);
             }
             else
             {
                 switch (var5)
                 {
                 case 1: // REGISTER
-                    sub_8118664(53, gUnknown_8458D1C);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(53, gUnknown_8458D1C);
                     break;
                 case 2: // INFO
-                    sub_8118664(47, gUnknown_8458B44);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(47, gUnknown_8458B44);
                     break;
                 }
             }
@@ -3149,7 +3275,7 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 52:
-        var5 = sub_811A218(&data->textState, &data->field_1D, &data->field_1E, &gUnknown_8456E6C, &gUnknown_8456F04);
+        var5 = ListMenuHandler_AllItemsAvailable(&data->textState, &data->tradeBoardSelectWindowId, &data->tradeBoardDetailsWindowId, &sWindowTemplate_TypeNames, &sListMenuTemplate_TypeNames);
         if (var5 != -1)
         {
             switch (var5)
@@ -3157,8 +3283,8 @@ static void sub_81186E0(u8 taskId)
             case -2:
             case 18:
                 ResetUnionRoomTrade(&sUnionRoomTrade);
-                sub_80FAFA0(0, 0, 0);
-                sub_811868C(gUnknown_8458D54);
+                RfuUpdatePlayerGnameStateAndSend(0, 0, 0);
+                UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D54);
                 break;
             default:
                 sUnionRoomTrade.type = var5;
@@ -3168,18 +3294,18 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 55:
-        sub_80FAFA0(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
-        sub_811868C(gUnknown_8458D78);
+        RfuUpdatePlayerGnameStateAndSend(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
+        UnionRoom_ScheduleFieldMessageAndExit(gUnknown_8458D78);
         break;
     case 44:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
             data->state = 56;
             break;
         case 1:
         case -1:
-            sub_811B258(TRUE);
+            HandleCancelTrade(TRUE);
             data->state = 4;
             break;
         }
@@ -3187,9 +3313,9 @@ static void sub_81186E0(u8 taskId)
     case 56:
         if (PrintOnTextbox(&data->textState, gUnknown_8458E10))
         {
-            sub_80FAFA0(0, 0, 0);
+            RfuUpdatePlayerGnameStateAndSend(0, 0, 0);
             ResetUnionRoomTrade(&sUnionRoomTrade);
-            sub_811B258(TRUE);
+            HandleCancelTrade(TRUE);
             data->state = 4;
         }
         break;
@@ -3198,38 +3324,38 @@ static void sub_81186E0(u8 taskId)
             data->state = 46;
         break;
     case 46:
-        sub_811A3F8();
+        UR_BlankBg0();
         data->state = 48;
         break;
     case 48:
-        var5 = sub_811A2EC(&data->textState, &data->field_1D, &data->field_4A, &data->field_1E, &gUnknown_8456F24, &gUnknown_8456F7C, data->field_0);
+        var5 = TradeBoardMenuHandler(&data->textState, &data->tradeBoardSelectWindowId, &data->tradeBoardListMenuId, &data->tradeBoardDetailsWindowId, &gUnknown_8456F24, &sTradeBoardListMenuTemplate, data->field_0);
         if (var5 != -1)
         {
             switch (var5)
             {
             case -2:
             case 8:
-                sub_811B258(TRUE);
+                HandleCancelTrade(TRUE);
                 DestroyHelpMessageWindow_();
                 data->state = 4;
                 break;
             default:
-                switch (sub_811ADD0(data->field_0->arr[var5].unk.gname.type, data->field_0->arr[var5].unk.gname.species))
+                switch (IsRequestedTypeAndSpeciesInPlayerParty(data->field_0->arr[var5].gname_uname.gname.type, data->field_0->arr[var5].gname_uname.gname.species))
                 {
-                case 0:
+                case UR_TRADE_MATCH:
                     IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]);
-                    sub_8118664(49, gUnknown_8458E70);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(49, gUnknown_8458E70);
                     taskData[1] = var5;
                     break;
-                case 1:
+                case UR_TRADE_NOTYPE:
                     IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]);
-                    StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].unk.gname.type]);
-                    sub_8118664(46, gUnknown_8458ED0);
+                    StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].gname_uname.gname.type]);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(46, gUnknown_8458ED0);
                     break;
-                case 2:
+                case UR_TRADE_NOEGG:
                     IntlConvPartnerUname(gStringVar1, data->field_0->arr[var5]);
-                    StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].unk.gname.type]);
-                    sub_8118664(46, gUnknown_8458F04);
+                    StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].gname_uname.gname.type]);
+                    UnionRoom_ScheduleFieldMessageWithFollowupState(46, gUnknown_8458F04);
                     break;
                 }
                 break;
@@ -3237,14 +3363,14 @@ static void sub_81186E0(u8 taskId)
         }
         break;
     case 49:
-        switch (sub_811A14C(&data->textState, FALSE))
+        switch (UnionRoomHandleYesNo(&data->textState, FALSE))
         {
         case 0:
             data->state = 50;
             break;
         case -1:
         case 1:
-            sub_811B258(TRUE);
+            HandleCancelTrade(TRUE);
             data->state = 4;
             break;
         }
@@ -3253,27 +3379,27 @@ static void sub_81186E0(u8 taskId)
         if (PrintOnTextbox(&data->textState, gUnknown_8458D1C))
         {
             sUnionRoomTrade.field_0 = 2;
-            memcpy(&gUnknown_203B064, &data->field_0->arr[taskData[1]].unk.gname.unk_00, sizeof(gUnknown_203B064));
-            gUnionRoomRequestedMonType = data->field_0->arr[taskData[1]].unk.gname.type;
-            gUnionRoomOfferedSpecies = data->field_0->arr[taskData[1]].unk.gname.species;
+            memcpy(&gPartnerTgtGnameSub, &data->field_0->arr[taskData[1]].gname_uname.gname.unk_00, sizeof(gPartnerTgtGnameSub));
+            gUnionRoomRequestedMonType = data->field_0->arr[taskData[1]].gname_uname.gname.type;
+            gUnionRoomOfferedSpecies = data->field_0->arr[taskData[1]].gname_uname.gname.species;
             gFieldCallback = sub_807DCE4;
             ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_TRADE, CB2_ReturnToField);
-            sub_81186B0(data);
+            BackUpURoomField0ToDecompressionBuffer(data);
             sUnionRoomTrade.field_8 = taskData[1];
         }
         break;
     case 51:
-        gUnknown_203B058 = 0x44;
-        sub_80FC114(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.gname, 0x44);
+        sPlayerCurrActivity = ACTIVITY_TRADE | IN_UNION_ROOM;
+        sub_80FC114(data->field_0->arr[taskData[1]].gname_uname.uname, &data->field_0->arr[taskData[1]].gname_uname.gname, ACTIVITY_TRADE | IN_UNION_ROOM);
         IntlConvPartnerUname(gStringVar1, data->field_0->arr[taskData[1]]);
-        sub_811A0B4(gUnknown_8457A34[2]);
+        UR_PrintFieldMessage(gURText_PleaseWaitMsgs[2]);
         data->state = 25;
         break;
     case 26:
         if (PrintOnTextbox(&data->textState, gStringVar4))
         {
-            sub_811B258(TRUE);
-            sub_811C028(taskData[0], taskData[1], data->field_0);
+            HandleCancelTrade(TRUE);
+            UpdateUnionGroupMemberFacing(taskData[0], taskData[1], data->field_0);
             data->state = 4;
         }
         break;
@@ -3290,38 +3416,38 @@ void var_800D_set_xB(void)
         gSpecialVar_Result = 11;
 }
 
-static void sub_8119904(struct UnkStruct_URoom * arg0)
+static void ReceiveUnionRoomActivityPacket(struct UnkStruct_URoom * uroom)
 {
-    if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == 0x2F00)
+    if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == RFU_COMMAND_0x2f00)
     {
-        arg0->field_9A[0] = gRecvCmds[1][1];
-        if (gRecvCmds[1][1] == 0x44)
+        uroom->recvActivityRequest[0] = gRecvCmds[1][1];
+        if (gRecvCmds[1][1] == (ACTIVITY_TRADE | IN_UNION_ROOM))
         {
-            arg0->field_9A[1] = gRecvCmds[1][2];
-            arg0->field_9A[2] = gRecvCmds[1][3];
+            uroom->recvActivityRequest[1] = gRecvCmds[1][2];
+            uroom->recvActivityRequest[2] = gRecvCmds[1][3];
         }
     }
 }
 
-static bool32 sub_8119944(struct UnkStruct_URoom * arg0)
+static bool32 UnionRoom_HandleContactFromOtherPlayer(struct UnkStruct_URoom * uroom)
 {
-    if (arg0->field_9A[0] != 0)
+    if (uroom->recvActivityRequest[0] != 0)
     {
-        s32 var = sub_811AF6C(gStringVar4, gLinkPlayers[1].gender, &arg0->field_9A[0], arg0);
+        s32 var = GetChatLeaderActionRequestMessage(gStringVar4, gLinkPlayers[1].gender, &uroom->recvActivityRequest[0], uroom);
         if (var == 0)
         {
             return TRUE;
         }
         else if (var == 1)
         {
-            arg0->state = 35;
-            gUnknown_203B058 = arg0->field_9A[0];
+            uroom->state = 35;
+            sPlayerCurrActivity = uroom->recvActivityRequest[0];
             return FALSE;
         }
         else if (var == 2)
         {
-            arg0->state = 36;
-            sub_800AAC0();
+            uroom->state = 36;
+            Link_TryStartSend5FFF();
             return FALSE;
         }
     }
@@ -3336,7 +3462,7 @@ void InitUnionRoom(void)
     sUnionRoomPlayerName[0] = EOS;
     if (gQuestLogState == 2 || gQuestLogState == 3)
         return;
-    CreateTask(sub_81199FC, 0);
+    CreateTask(Task_InitUnionRoom, 0);
     sUnionRoomMain.uRoom = sUnionRoomMain.uRoom; // Needed to match.
     sUnionRoomMain.uRoom = ptr = AllocZeroed(sizeof(struct UnkStruct_URoom));
     sURoom = sUnionRoomMain.uRoom;
@@ -3347,7 +3473,7 @@ void InitUnionRoom(void)
     sUnionRoomPlayerName[0] = EOS;
 }
 
-static void sub_81199FC(u8 taskId)
+static void Task_InitUnionRoom(u8 taskId)
 {
     s32 i;
     u8 text[32];
@@ -3359,27 +3485,27 @@ static void sub_81199FC(u8 taskId)
         structPtr->state = 1;
         break;
     case 1:
-        SetHostRFUtgtGname(0xC, 0, 0);
-        sub_800B1F4();
+        SetHostRFUtgtGname(ACTIVITY_SEARCH, 0, 0);
+        SetWirelessCommType1();
         OpenLink();
-        sub_80FBC00();
-        sub_80FB128(1);
+        InitializeRfuLinkManager_EnterUnionRoom();
+        sub_80FB128(TRUE);
         structPtr->state = 2;
         break;
     case 2:
         structPtr->field_4 = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        sub_811A650(structPtr->field_4->arr, 4);
+        BlankUnkStruct_x1CArray(structPtr->field_4->arr, 4);
         structPtr->field_C = AllocZeroed(4 * sizeof(struct UnkStruct_x1C));
-        sub_811A650(structPtr->field_C->arr, 4);
-        structPtr->field_0 = AllocZeroed(8 * sizeof(struct UnkStruct_x20));
-        sub_811A5E4(structPtr->field_0->arr, 8);
+        BlankUnkStruct_x1CArray(structPtr->field_C->arr, 4);
+        structPtr->field_0 = AllocZeroed(UROOM_MAX_GROUP_COUNT * sizeof(struct UnkStruct_x20));
+        BlankUnkStruct_x20Array(structPtr->field_0->arr, UROOM_MAX_GROUP_COUNT);
         structPtr->field_8 = AllocZeroed(sizeof(struct UnkStruct_x20));
-        sub_811A5E4(&structPtr->field_8->arr[0], 1);
-        structPtr->field_20 = sub_8119E84(structPtr->field_C, structPtr->field_4, 10);
+        BlankUnkStruct_x20Array(&structPtr->field_8->arr[0], 1);
+        structPtr->field_20 = CreateTask_SearchForChildOrParent(structPtr->field_C, structPtr->field_4, LINK_GROUP_UNION_ROOM_INIT);
         structPtr->state = 3;
         break;
     case 3:
-        switch (sub_8119B94())
+        switch (HandlePlayerListUpdate())
         {
         case 1:
         case 2:
@@ -3387,10 +3513,10 @@ static void sub_81199FC(u8 taskId)
             {
                 for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
                 {
-                    if (structPtr->field_0->arr[i].field_1A_0 == 1)
+                    if (structPtr->field_0->arr[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
                     {
                         IntlConvPartnerUname(text, structPtr->field_0->arr[i]);
-                        if (PlayerHasMetTrainerBefore(ReadAsU16(structPtr->field_0->arr[i].unk.gname.unk_00.playerTrainerId), text))
+                        if (PlayerHasMetTrainerBefore(ReadAsU16(structPtr->field_0->arr[i].gname_uname.gname.unk_00.playerTrainerId), text))
                         {
                             StringCopy(sUnionRoomPlayerName, text);
                             break;
@@ -3410,7 +3536,7 @@ static void sub_81199FC(u8 taskId)
         Free(structPtr->field_4);
         DestroyTask(structPtr->field_20);
         Free(sUnionRoomMain.uRoom);
-        sub_80F8DC0();
+        LinkRfu_Shutdown();
         DestroyTask(taskId);
         break;
     }
@@ -3430,36 +3556,41 @@ bool16 BufferUnionRoomPlayerName(void)
     }
 }
 
-static u8 sub_8119B94(void)
+static u8 HandlePlayerListUpdate(void)
 {
     s32 i;
     u8 j;
     struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom;
     s32 r7 = 0;
 
-    for (i = 0; i < 4; i++)
+    // If someone new joined, register them in field_8
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (sub_811A694(&structPtr->field_C->arr[i].unk0, &gUnknown_8457034) == TRUE)
+        if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE)
         {
-            structPtr->field_8->arr[0].unk = structPtr->field_C->arr[i].unk0;
+            structPtr->field_8->arr[0].gname_uname = structPtr->field_C->arr[i].gname_uname;
             structPtr->field_8->arr[0].field_18 = 0;
-            structPtr->field_8->arr[0].field_1A_0 = 1;
+            structPtr->field_8->arr[0].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
             structPtr->field_8->arr[0].field_1B = 1;
             return 4;
         }
     }
-    for (j = 0; j < 8; j++)
+
+    // Handle changes to existing player statuses
+    for (j = 0; j < UROOM_MAX_GROUP_COUNT; j++)
     {
-        if (structPtr->field_0->arr[j].field_1A_0 != 0)
+        if (structPtr->field_0->arr[j].groupScheduledAnim != UNION_ROOM_SPAWN_NONE)
         {
-            i = sub_811A748(&structPtr->field_0->arr[j], &structPtr->field_4->arr[0]);
+            i = Findx20Inx1CArray(&structPtr->field_0->arr[j], &structPtr->field_4->arr[0]);
             if (i != 0xFF)
             {
-                if (structPtr->field_0->arr[j].field_1A_0 == 1)
+                if (structPtr->field_0->arr[j].groupScheduledAnim == UNION_ROOM_SPAWN_IN)
                 {
-                    if (sub_811A6DC(&structPtr->field_0->arr[j].unk, &structPtr->field_4->arr[i].unk0))
+                    // New join in queue
+                    if (AreUnionRoomPlayerGnamesDifferent(&structPtr->field_0->arr[j].gname_uname, &structPtr->field_4->arr[i].gname_uname))
                     {
-                        structPtr->field_0->arr[j].unk = structPtr->field_4->arr[i].unk0;
+                        // Just joined, copy their names
+                        structPtr->field_0->arr[j].gname_uname = structPtr->field_4->arr[i].gname_uname;
                         structPtr->field_0->arr[j].field_1B = 0x40;
                         r7 = 1;
                     }
@@ -3472,116 +3603,121 @@ static u8 sub_8119B94(void)
                 }
                 else
                 {
-                    structPtr->field_0->arr[j].field_1A_0 = 1;
+                    // New join, queue them
+                    structPtr->field_0->arr[j].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
                     structPtr->field_0->arr[j].field_1B = 0;
                     r7 = 2;
                 }
                 structPtr->field_0->arr[j].field_18 = 0;
             }
-            else if (structPtr->field_0->arr[j].field_1A_0 != 2)
+            else if (structPtr->field_0->arr[j].groupScheduledAnim != UNION_ROOM_SPAWN_OUT)
             {
+                // Person may have disconnected. Give them 10 seconds.
                 structPtr->field_0->arr[j].field_18++;
                 if (structPtr->field_0->arr[j].field_18 >= 600)
                 {
-                    structPtr->field_0->arr[j].field_1A_0 = 2;
+                    structPtr->field_0->arr[j].groupScheduledAnim = UNION_ROOM_SPAWN_OUT;
                     r7 = 2;
                 }
             }
-            else if (structPtr->field_0->arr[j].field_1A_0 == 2)
+            else if (structPtr->field_0->arr[j].groupScheduledAnim == UNION_ROOM_SPAWN_OUT)
             {
+                // Person dropped. Wait 15 seconds, then remove them.
                 structPtr->field_0->arr[j].field_18++;
                 if (structPtr->field_0->arr[j].field_18 >= 900)
                 {
-                    sub_811A5E4(&structPtr->field_0->arr[j], 1);
+                    BlankUnkStruct_x20Array(&structPtr->field_0->arr[j], 1);
                 }
             }
         }
     }
-    for (i = 0; i < 4; i++)
+
+    // Update the players list
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (sub_811A798(&structPtr->field_0->arr[0], &structPtr->field_4->arr[i], 8) != 0xFF)
+        if (Appendx1Ctox20(&structPtr->field_0->arr[0], &structPtr->field_4->arr[i], UROOM_MAX_GROUP_COUNT) != 0xFF)
             r7 = 1;
     }
 
     return r7;
 }
 
-static void sub_8119D34(u8 taskId)
+static void Task_SearchForChildOrParent(u8 taskId)
 {
     s32 i, j;
-    struct UnkStruct_Shared sp0;
+    struct UnionGnameUnamePair gname_uname;
     struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data;
-    bool8 r4;
+    bool8 parent_child;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        r4 = sub_80FCC3C(&sp0.gname, sp0.playerName, i);
-        if (!sub_8116F28(sp0.gname.unk_0a_0, gTasks[taskId].data[4]))
+        parent_child = LinkRfu_GetNameIfCompatible(&gname_uname.gname, gname_uname.uname, i);
+        if (!IsPartnerActivityAcceptable(gname_uname.gname.activity, gTasks[taskId].data[4]))
         {
-            sp0 = gUnknown_8457034;
+            gname_uname = sUnionGnameUnamePair_Dummy;
         }
-        if (sp0.gname.unk_00.unk_00_0 == 1)
+        if (gname_uname.gname.unk_00.language == LANGUAGE_JAPANESE)
         {
-            sp0 = gUnknown_8457034;
+            gname_uname = sUnionGnameUnamePair_Dummy;
         }
-        if (!r4)
+        if (parent_child == MODE_CHILD)
         {
             for (j = 0; j < i; j++)
             {
-                if (!sub_811A694(&ptr[1]->arr[j].unk0, &sp0))
+                if (!AreGnameUnameDifferent(&ptr[1]->arr[j].gname_uname, &gname_uname))
                 {
-                    sp0 = gUnknown_8457034;
+                    gname_uname = sUnionGnameUnamePair_Dummy;
                 }
             }
-            ptr[1]->arr[i].unk0 = sp0;
-            ptr[1]->arr[i].unk18 = sub_811A694(&ptr[1]->arr[i].unk0, &gUnknown_8457034);
+            ptr[1]->arr[i].gname_uname = gname_uname;
+            ptr[1]->arr[i].active = AreGnameUnameDifferent(&ptr[1]->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy);
         }
         else
         {
-            ptr[0]->arr[i].unk0 = sp0;
-            ptr[0]->arr[i].unk18 = sub_811A694(&ptr[0]->arr[i].unk0, &gUnknown_8457034);
+            ptr[0]->arr[i].gname_uname = gname_uname;
+            ptr[0]->arr[i].active = AreGnameUnameDifferent(&ptr[0]->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy);
         }
     }
 }
 
-static u8 sub_8119E84(struct UnkStruct_Main4 * a0, struct UnkStruct_Main4 * a1, u32 a2)
+static u8 CreateTask_SearchForChildOrParent(struct UnkStruct_Main4 * main4_parent, struct UnkStruct_Main4 * main4_child, u32 linkGroup)
 {
-    u8 taskId = CreateTask(sub_8119D34, 0);
+    u8 taskId = CreateTask(Task_SearchForChildOrParent, 0);
     struct UnkStruct_Main4 ** data = (void *)gTasks[taskId].data;
-    data[0] = a0;
-    data[1] = a1;
-    gTasks[taskId].data[4] = a2;
+    data[0] = main4_parent;
+    data[1] = main4_child;
+    gTasks[taskId].data[4] = linkGroup;
     return taskId;
 }
 
-static void sub_8119EB8(u8 taskId)
+static void Task_ListenForPartnersWithCompatibleSerialNos(u8 taskId)
 {
     s32 i, j;
     struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        sub_80FCC3C(&ptr[0]->arr[i].unk0.gname, ptr[0]->arr[i].unk0.playerName, i);
-        if (!sub_8116F28(ptr[0]->arr[i].unk0.gname.unk_0a_0, gTasks[taskId].data[2]))
+        LinkRfu_GetNameIfCompatible(&ptr[0]->arr[i].gname_uname.gname, ptr[0]->arr[i].gname_uname.uname, i);
+        if (!IsPartnerActivityAcceptable(ptr[0]->arr[i].gname_uname.gname.activity, gTasks[taskId].data[2]))
         {
-            ptr[0]->arr[i].unk0 = gUnknown_8457034;
+            ptr[0]->arr[i].gname_uname = sUnionGnameUnamePair_Dummy;
         }
         for (j = 0; j < i; j++)
         {
-            if (!sub_811A694(&ptr[0]->arr[j].unk0, &ptr[0]->arr[i].unk0))
+            if (!AreGnameUnameDifferent(&ptr[0]->arr[j].gname_uname, &ptr[0]->arr[i].gname_uname))
             {
-                ptr[0]->arr[i].unk0 = gUnknown_8457034;
+                ptr[0]->arr[i].gname_uname = sUnionGnameUnamePair_Dummy;
             }
         }
-        ptr[0]->arr[i].unk18 = sub_811A694(&ptr[0]->arr[i].unk0, &gUnknown_8457034);
+        ptr[0]->arr[i].active = AreGnameUnameDifferent(&ptr[0]->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy);
     }
 }
 
-static bool32 sub_8119FB0(struct GFtgtGname * arg0, s16 arg1)
+static bool32 GetGnameWonderFlagByLinkGroup(struct GFtgtGname * gname, s16 linkGroup)
 {
-    if (arg1 == 7)
+    if (linkGroup == LINK_GROUP_WONDER_CARD)
     {
-        if (!arg0->unk_00.unk_00_5)
+        if (!gname->unk_00.hasCard)
         {
             return FALSE;
         }
@@ -3590,9 +3726,9 @@ static bool32 sub_8119FB0(struct GFtgtGname * arg0, s16 arg1)
             return TRUE;
         }
     }
-    else if (arg1 == 8)
+    else if (linkGroup == LINK_GROUP_WONDER_NEWS)
     {
-        if (!arg0->unk_00.unk_00_4)
+        if (!gname->unk_00.hasNews)
         {
             return FALSE;
         }
@@ -3607,40 +3743,40 @@ static bool32 sub_8119FB0(struct GFtgtGname * arg0, s16 arg1)
     }
 }
 
-static void sub_8119FD8(u8 taskId)
+static void Task_ListenForPartnersWithSerial7F7D(u8 taskId)
 {
     s32 i;
     struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (sub_80FCCF4(&ptr[0]->arr[i].unk0.gname, ptr[0]->arr[i].unk0.playerName, i))
+        if (LinkRfu_GetNameIfSerial7F7D(&ptr[0]->arr[i].gname_uname.gname, ptr[0]->arr[i].gname_uname.uname, i))
         {
-            sub_8119FB0(&ptr[0]->arr[i].unk0.gname, gTasks[taskId].data[2]);
+            GetGnameWonderFlagByLinkGroup(&ptr[0]->arr[i].gname_uname.gname, gTasks[taskId].data[2]);
         }
-        ptr[0]->arr[i].unk18 = sub_811A694(&ptr[0]->arr[i].unk0, &gUnknown_8457034);
+        ptr[0]->arr[i].active = AreGnameUnameDifferent(&ptr[0]->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy);
     }
 }
 
-static u8 sub_811A054(struct UnkStruct_Main4 * a0, u32 a1)
+static u8 CreateTask_ListenForPartnersWithCompatibleSerialNos(struct UnkStruct_Main4 * main4, u32 linkGroup)
 {
-    u8 taskId = CreateTask(sub_8119EB8, 0);
+    u8 taskId = CreateTask(Task_ListenForPartnersWithCompatibleSerialNos, 0);
     struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data;
-    ptr[0] = a0;
-    gTasks[taskId].data[2] = a1;
+    ptr[0] = main4;
+    gTasks[taskId].data[2] = linkGroup;
     return taskId;
 }
 
-static u8 sub_811A084(struct UnkStruct_Main4 * a0, u32 a1)
+static u8 CreateTask_ListenForPartnersWithSerial7F7D(struct UnkStruct_Main4 * main4, u32 linkGroup)
 {
-    u8 taskId = CreateTask(sub_8119FD8, 0);
+    u8 taskId = CreateTask(Task_ListenForPartnersWithSerial7F7D, 0);
     struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data;
-    ptr[0] = a0;
-    gTasks[taskId].data[2] = a1;
+    ptr[0] = main4;
+    gTasks[taskId].data[2] = linkGroup;
     return taskId;
 }
 
-static bool32 sub_811A0B4(const u8 *src)
+static bool32 UR_PrintFieldMessage(const u8 *src)
 {
     LoadStdWindowFrameGfx();
     DrawDialogueFrame(0, 1);
@@ -3649,7 +3785,7 @@ static bool32 sub_811A0B4(const u8 *src)
     return FALSE;
 }
 
-static bool32 sub_811A0E0(void)
+static bool32 UR_RunTextPrinters_CheckPrinter0Active(void)
 {
     if (!RunTextPrinters_CheckPrinter0Active())
     {
@@ -3683,31 +3819,31 @@ static bool8 PrintOnTextbox(u8 *textState, const u8 *str)
     return FALSE;
 }
 
-static s8 sub_811A14C(u8 *arg0, bool32 arg1)
+static s8 UnionRoomHandleYesNo(u8 *state_p, bool32 no_draw)
 {
     s8 r1;
 
-    switch (*arg0)
+    switch (*state_p)
     {
     case 0:
-        if (arg1)
+        if (no_draw)
         {
             return -3;
         }
         DisplayYesNoMenuDefaultYes();
-        (*arg0)++;
+        (*state_p)++;
         break;
     case 1:
-        if (arg1)
+        if (no_draw)
         {
             DestroyYesNoMenu();
-            *arg0 = 0;
+            *state_p = 0;
             return -3;
         }
         r1 = Menu_ProcessInputNoWrapClearOnChoose();
         if (r1 == -1 || r1 == 0 || r1 == 1)
         {
-            *arg0 = 0;
+            *state_p = 0;
             return r1;
         }
         break;
@@ -3715,54 +3851,54 @@ static s8 sub_811A14C(u8 *arg0, bool32 arg1)
     return -2;
 }
 
-static u8 sub_811A1AC(const struct WindowTemplate * template)
+static u8 CreateTradeBoardWindow(const struct WindowTemplate * template)
 {
     u8 windowId = AddWindow(template);
     DrawStdWindowFrame(windowId, FALSE);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
-    sub_811A444(windowId, 0, gUnknown_8459378, 8, 1, 6);
+    UR_AddTextPrinterParameterized(windowId, 0, gUnknown_8459378, 8, 1, UR_COLOR_DN5_DN6_LTB);
     PutWindowTilemap(windowId);
     CopyWindowToVram(windowId, 2);
     return windowId;
 }
 
-static void sub_811A1FC(u8 windowId)
+static void DeleteTradeBoardWindow(u8 windowId)
 {
     ClearStdWindowAndFrame(windowId, TRUE);
     RemoveWindow(windowId);
 }
 
-static s32 sub_811A218(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate)
+static s32 ListMenuHandler_AllItemsAvailable(u8 *state_p, u8 *win_id_p, u8 *list_menu_id_p, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate)
 {
-    s32 r1, r8;
+    s32 input;
 
-    switch (*arg0)
+    switch (*state_p)
     {
     case 0:
-        *arg1 = AddWindow(winTemplate);
-        DrawStdWindowFrame(*arg1, FALSE);
+        *win_id_p = AddWindow(winTemplate);
+        DrawStdWindowFrame(*win_id_p, FALSE);
         gMultiuseListMenuTemplate = *menuTemplate;
-        gMultiuseListMenuTemplate.windowId = *arg1;
-        *arg2 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
-        CopyWindowToVram(*arg1, TRUE);
-        (*arg0)++;
+        gMultiuseListMenuTemplate.windowId = *win_id_p;
+        *list_menu_id_p = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
+        CopyWindowToVram(*win_id_p, TRUE);
+        (*state_p)++;
         break;
     case 1:
-        r8 = ListMenu_ProcessInput(*arg2);
+        input = ListMenu_ProcessInput(*list_menu_id_p);
         if (JOY_NEW(A_BUTTON))
         {
-            DestroyListMenuTask(*arg2, NULL, NULL);
-            ClearStdWindowAndFrame(*arg1, TRUE);
-            RemoveWindow(*arg1);
-            *arg0 = 0;
-            return r8;
+            DestroyListMenuTask(*list_menu_id_p, NULL, NULL);
+            ClearStdWindowAndFrame(*win_id_p, TRUE);
+            RemoveWindow(*win_id_p);
+            *state_p = 0;
+            return input;
         }
         else if (JOY_NEW(B_BUTTON))
         {
-            DestroyListMenuTask(*arg2, NULL, NULL);
-            ClearStdWindowAndFrame(*arg1, TRUE);
-            RemoveWindow(*arg1);
-            *arg0 = 0;
+            DestroyListMenuTask(*list_menu_id_p, NULL, NULL);
+            ClearStdWindowAndFrame(*win_id_p, TRUE);
+            RemoveWindow(*win_id_p);
+            *state_p = 0;
             return -2;
         }
         break;
@@ -3771,46 +3907,46 @@ static s32 sub_811A218(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate
     return -1;
 }
 
-static s32 sub_811A2EC(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate, struct UnkStruct_Main0 * arg6)
+static s32 TradeBoardMenuHandler(u8 *state_p, u8 *win_id_p, u8 *list_menu_id_p, u8 *trade_board_win_id_p, const struct WindowTemplate * winTemplate, const struct ListMenuTemplate * menuTemplate, struct UnkStruct_Main0 * traders)
 {
     s32 input;
     s32 r4;
 
-    switch (*arg0)
+    switch (*state_p)
     {
     case 0:
-        *arg3 = sub_811A1AC(&gUnknown_8456F1C);
-        *arg1 = AddWindow(winTemplate);
-        DrawStdWindowFrame(*arg1, FALSE);
+        *trade_board_win_id_p = CreateTradeBoardWindow(&sTradeBoardWindowTemplate);
+        *win_id_p = AddWindow(winTemplate);
+        DrawStdWindowFrame(*win_id_p, FALSE);
         gMultiuseListMenuTemplate = *menuTemplate;
-        gMultiuseListMenuTemplate.windowId = *arg1;
-        *arg2 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 1);
-        CopyWindowToVram(*arg1, TRUE);
-        (*arg0)++;
+        gMultiuseListMenuTemplate.windowId = *win_id_p;
+        *list_menu_id_p = ListMenuInit(&gMultiuseListMenuTemplate, 0, 1);
+        CopyWindowToVram(*win_id_p, TRUE);
+        (*state_p)++;
         break;
     case 1:
-        input = ListMenu_ProcessInput(*arg2);
+        input = ListMenu_ProcessInput(*list_menu_id_p);
         if (JOY_NEW(A_BUTTON | B_BUTTON))
         {
-            if (input == 8 || JOY_NEW(B_BUTTON))
+            if (input == UROOM_MAX_GROUP_COUNT || JOY_NEW(B_BUTTON))
             {
-                DestroyListMenuTask(*arg2, NULL, NULL);
-                ClearStdWindowAndFrame(*arg1, TRUE);
-                RemoveWindow(*arg1);
-                sub_811A1FC(*arg3);
-                *arg0 = 0;
+                DestroyListMenuTask(*list_menu_id_p, NULL, NULL);
+                ClearStdWindowAndFrame(*win_id_p, TRUE);
+                RemoveWindow(*win_id_p);
+                DeleteTradeBoardWindow(*trade_board_win_id_p);
+                *state_p = 0;
                 return -2;
             }
             else
             {
-                r4 = sub_811AD7C(arg6->arr, input);
+                r4 = GetIndexOfNthTradeBoardOffer(traders->arr, input);
                 if (r4 >= 0)
                 {
-                    DestroyListMenuTask(*arg2, NULL, NULL);
-                    ClearStdWindowAndFrame(*arg1, TRUE);
-                    RemoveWindow(*arg1);
-                    sub_811A1FC(*arg3);
-                    *arg0 = 0;
+                    DestroyListMenuTask(*list_menu_id_p, NULL, NULL);
+                    ClearStdWindowAndFrame(*win_id_p, TRUE);
+                    RemoveWindow(*win_id_p);
+                    DeleteTradeBoardWindow(*trade_board_win_id_p);
+                    *state_p = 0;
                     return r4;
                 }
                 else
@@ -3825,20 +3961,20 @@ static s32 sub_811A2EC(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct Wind
     return -1;
 }
 
-static void sub_811A3F8(void)
+static void UR_BlankBg0(void)
 {
     FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0);
     CopyBgTilemapBufferToVram(0);
 }
 
-static void sub_811A41C(void)
+static void JoinGroup_BlankBg0AndEnableScriptContexts(void)
 {
     FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0);
     CopyBgTilemapBufferToVram(0);
     EnableBothScriptContexts();
 }
 
-static void sub_811A444(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx)
+static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx)
 {
     struct TextPrinterTemplate printerTemplate;
 
@@ -3854,100 +3990,100 @@ static void sub_811A444(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 co
     gTextFlags.useAlternateDownArrow = FALSE;
     switch (colorIdx)
     {
-    case 0:
+    case UR_COLOR_DKE_WHT_LTE:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 2;
-        printerTemplate.bgColor = 1;
-        printerTemplate.shadowColor = 3;
+        printerTemplate.fgColor = TEXT_COLOR_DARK_GREY;
+        printerTemplate.bgColor = TEXT_COLOR_WHITE;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY;
         break;
-    case 1:
+    case UR_COLOR_RED_WHT_LTR:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 4;
-        printerTemplate.bgColor = 1;
-        printerTemplate.shadowColor = 5;
+        printerTemplate.fgColor = TEXT_COLOR_RED;
+        printerTemplate.bgColor = TEXT_COLOR_WHITE;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_RED;
         break;
-    case 2:
+    case UR_COLOR_GRN_WHT_LTG:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 6;
-        printerTemplate.bgColor = 1;
-        printerTemplate.shadowColor = 7;
+        printerTemplate.fgColor = TEXT_COLOR_GREEN;
+        printerTemplate.bgColor = TEXT_COLOR_WHITE;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREEN;
         break;
-    case 3:
+    case UR_COLOR_WHT_WHT_LTE:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 1;
-        printerTemplate.bgColor = 1;
-        printerTemplate.shadowColor = 3;
+        printerTemplate.fgColor = TEXT_COLOR_WHITE;
+        printerTemplate.bgColor = TEXT_COLOR_WHITE;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY;
         break;
-    case 4:
+    case UR_COLOR_WHT_DKE_LTE:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 1;
-        printerTemplate.bgColor = 2;
-        printerTemplate.shadowColor = 3;
+        printerTemplate.fgColor = TEXT_COLOR_WHITE;
+        printerTemplate.bgColor = TEXT_COLOR_DARK_GREY;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY;
         break;
-    case 5:
+    case UR_COLOR_GRN_DN6_LTB:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 7;
-        printerTemplate.bgColor = 15;
-        printerTemplate.shadowColor = 9;
+        printerTemplate.fgColor = TEXT_COLOR_LIGHT_GREEN;
+        printerTemplate.bgColor = TEXT_DYNAMIC_COLOR_6;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_BLUE;
         break;
-    case 6:
+    case UR_COLOR_DN5_DN6_LTB:
         printerTemplate.letterSpacing = 0;
         printerTemplate.lineSpacing = 0;
-        printerTemplate.fgColor = 14;
-        printerTemplate.bgColor = 15;
-        printerTemplate.shadowColor = 9;
+        printerTemplate.fgColor = TEXT_DYNAMIC_COLOR_5;
+        printerTemplate.bgColor = TEXT_DYNAMIC_COLOR_6;
+        printerTemplate.shadowColor = TEXT_COLOR_LIGHT_BLUE;
         break;
     }
 
     AddTextPrinter(&printerTemplate, 0xFF, NULL);
 }
 
-static void sub_811A5E4(struct UnkStruct_x20 * arg0, u8 count)
+static void BlankUnkStruct_x20Array(struct UnkStruct_x20 * x20arr, u8 count)
 {
     s32 i;
 
     for (i = 0; i < count; i++)
     {
-        arg0[i].unk = gUnknown_8457034;
-        arg0[i].field_18 = 0xFF;
-        arg0[i].field_1A_0 = 0;
-        arg0[i].field_1A_1 = 0;
-        arg0[i].field_1B = 0;
+        x20arr[i].gname_uname = sUnionGnameUnamePair_Dummy;
+        x20arr[i].field_18 = 0xFF;
+        x20arr[i].groupScheduledAnim = UNION_ROOM_SPAWN_NONE;
+        x20arr[i].field_1A_1 = FALSE;
+        x20arr[i].field_1B = 0;
     }
 }
 
-static void sub_811A650(struct UnkStruct_x1C * arg0, u8 count)
+static void BlankUnkStruct_x1CArray(struct UnkStruct_x1C * x1Carr, u8 count)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        arg0[i].unk0 = gUnknown_8457034;
-        arg0[i].unk18 = 0;
+        x1Carr[i].gname_uname = sUnionGnameUnamePair_Dummy;
+        x1Carr[i].active = FALSE;
     }
 }
 
-static bool8 sub_811A694(struct UnkStruct_Shared * arg0, const struct UnkStruct_Shared * arg1)
+static bool8 AreGnameUnameDifferent(struct UnionGnameUnamePair * left, const struct UnionGnameUnamePair * right)
 {
     s32 i;
 
     for (i = 0; i < 2; i++)
     {
-        if (arg0->gname.unk_00.playerTrainerId[i] != arg1->gname.unk_00.playerTrainerId[i])
+        if (left->gname.unk_00.playerTrainerId[i] != right->gname.unk_00.playerTrainerId[i])
         {
             return TRUE;
         }
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < RFU_USER_NAME_LENGTH; i++)
     {
-        if (arg0->playerName[i] != arg1->playerName[i])
+        if (left->uname[i] != right->uname[i])
         {
             return TRUE;
         }
@@ -3956,34 +4092,34 @@ static bool8 sub_811A694(struct UnkStruct_Shared * arg0, const struct UnkStruct_
     return FALSE;
 }
 
-static bool32 sub_811A6DC(struct UnkStruct_Shared * arg0, struct UnkStruct_Shared * arg1)
+static bool32 AreUnionRoomPlayerGnamesDifferent(struct UnionGnameUnamePair * left, struct UnionGnameUnamePair * right)
 {
     s32 i;
 
-    if (arg0->gname.unk_0a_0 != arg1->gname.unk_0a_0)
+    if (left->gname.activity != right->gname.activity)
     {
         return TRUE;
     }
 
-    if (arg0->gname.unk_0a_7 != arg1->gname.unk_0a_7)
+    if (left->gname.started != right->gname.started)
     {
         return TRUE;
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (arg0->gname.unk_04[i] != arg1->gname.unk_04[i])
+        if (left->gname.child_sprite_gender[i] != right->gname.child_sprite_gender[i])
         {
             return TRUE;
         }
     }
 
-    if (arg0->gname.species != arg1->gname.species)
+    if (left->gname.species != right->gname.species)
     {
         return TRUE;
     }
 
-    if (arg0->gname.type != arg1->gname.type)
+    if (left->gname.type != right->gname.type)
     {
         return TRUE;
     }
@@ -3991,38 +4127,38 @@ static bool32 sub_811A6DC(struct UnkStruct_Shared * arg0, struct UnkStruct_Share
     return FALSE;
 }
 
-static u32 sub_811A748(struct UnkStruct_x20 * arg0, struct UnkStruct_x1C * arg1)
+static u32 Findx20Inx1CArray(struct UnkStruct_x20 * x20, struct UnkStruct_x1C * x1Carr)
 {
     u8 result = 0xFF;
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (arg1[i].unk18 && !sub_811A694(&arg0->unk, &arg1[i].unk0))
+        if (x1Carr[i].active && !AreGnameUnameDifferent(&x20->gname_uname, &x1Carr[i].gname_uname))
         {
             result = i;
-            arg1[i].unk18 = FALSE;
+            x1Carr[i].active = FALSE;
         }
     }
 
     return result;
 }
 
-static u8 sub_811A798(struct UnkStruct_x20 * arg0, struct UnkStruct_x1C * arg1, u8 arg2)
+static u8 Appendx1Ctox20(struct UnkStruct_x20 * x20arr, struct UnkStruct_x1C * x1C, u8 count)
 {
     s32 i;
 
-    if (arg1->unk18)
+    if (x1C->active)
     {
-        for (i = 0; i < arg2; i++)
+        for (i = 0; i < count; i++)
         {
-            if (arg0[i].field_1A_0 == 0)
+            if (x20arr[i].groupScheduledAnim == UNION_ROOM_SPAWN_NONE)
             {
-                arg0[i].unk = arg1->unk0;
-                arg0[i].field_18 = 0;
-                arg0[i].field_1A_0 = 1;
-                arg0[i].field_1B = 64;
-                arg1->unk18 = FALSE;
+                x20arr[i].gname_uname = x1C->gname_uname;
+                x20arr[i].field_18 = 0;
+                x20arr[i].groupScheduledAnim = UNION_ROOM_SPAWN_IN;
+                x20arr[i].field_1B = 0x40;
+                x1C->active = FALSE;
                 return i;
             }
         }
@@ -4031,47 +4167,47 @@ static u8 sub_811A798(struct UnkStruct_x20 * arg0, struct UnkStruct_x1C * arg1,
     return 0xFF;
 }
 
-static void sub_811A81C(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 * arg3, u8 arg4, u8 id)
+static void PrintUnionRoomGroupOnWindow(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * group, u8 colorIdx, u8 id)
 {
-    u8 r2;
-    u8 sp0[6];
-    u8 sp10[30];
+    u8 activity;
+    u8 id_str[6];
+    u8 uname[30];
 
     ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
     StringAppend(gStringVar4, gUnknown_84571B0);
-    sub_811A444(arg0, 0, gStringVar4, arg1, arg2, 0);
-    arg1 += 18;
-    r2 = arg3->unk.gname.unk_0a_0;
-    if (arg3->field_1A_0 == 1 && !(r2 & 0x40))
+    UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, UR_COLOR_DKE_WHT_LTE);
+    x += 18;
+    activity = group->gname_uname.gname.activity;
+    if (group->groupScheduledAnim == UNION_ROOM_SPAWN_IN && !(activity & IN_UNION_ROOM))
     {
-        IntlConvPartnerUname(sp10, *arg3);
-        sub_811A444(arg0, 2, sp10, arg1, arg2, arg4);
-        ConvertIntToDecimalStringN(sp0, arg3->unk.gname.unk_00.playerTrainerId[0] | (arg3->unk.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
+        IntlConvPartnerUname(uname, *group);
+        UR_AddTextPrinterParameterized(windowId, 2, uname, x, y, colorIdx);
+        ConvertIntToDecimalStringN(id_str, group->gname_uname.gname.unk_00.playerTrainerId[0] | (group->gname_uname.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
         StringCopy(gStringVar4, gUnknown_84571B4);
-        StringAppend(gStringVar4, sp0);
-        arg1 += 77;
-        sub_811A444(arg0, 0, gStringVar4, arg1, arg2, arg4);
+        StringAppend(gStringVar4, id_str);
+        x += 77;
+        UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, colorIdx);
     }
 }
 
-static void sub_811A910(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * arg3, u8 arg4, u8 id)
+static void PrintGroupMemberCandidateOnWindowWithColor(u8 windowId, u8 x, u8 y, struct UnkStruct_x20 * group, u8 colorIdx, u8 id)
 {
-    u8 sp0[6];
-    u8 sp10[30];
+    u8 id_str[6];
+    u8 uname[30];
 
-    if (arg3->field_1A_0 == 1)
+    if (group->groupScheduledAnim == UNION_ROOM_SPAWN_IN)
     {
-        IntlConvPartnerUname(sp10, *arg3);
-        sub_811A444(windowId, 2, sp10, x, y, arg4);
-        ConvertIntToDecimalStringN(sp0, arg3->unk.gname.unk_00.playerTrainerId[0] | (arg3->unk.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
+        IntlConvPartnerUname(uname, *group);
+        UR_AddTextPrinterParameterized(windowId, 2, uname, x, y, colorIdx);
+        ConvertIntToDecimalStringN(id_str, group->gname_uname.gname.unk_00.playerTrainerId[0] | (group->gname_uname.gname.unk_00.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
         StringCopy(gStringVar4, gUnknown_84571B4);
-        StringAppend(gStringVar4, sp0);
+        StringAppend(gStringVar4, id_str);
         x += 71;
-        sub_811A444(windowId, 0, gStringVar4, x, y, arg4);
+        UR_AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, colorIdx);
     }
 }
 
-static bool32 sub_811A9B8(void)
+static bool32 PlayerIsTalkingToUnionRoomAide(void)
 {
     s16 x, y;
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
@@ -4091,72 +4227,77 @@ static bool32 sub_811A9B8(void)
     return FALSE;
 }
 
-static u32 sub_811A9FC(s32 arg0)
+static u32 GetResponseIdx_InviteToURoomActivity(s32 activity)
 {
-    switch (arg0)
+    switch (activity)
     {
-    case 5:
+    case ACTIVITY_CHAT:
         return 1;
-    case 4:
+    case ACTIVITY_TRADE:
         return 2;
-    case 8:
+    case ACTIVITY_CARD:
         return 3;
-    case 3:
+    case ACTIVITY_MLTBATTLE:
     default:
         return 0;
     }
 }
 
-static u32 sub_811AA24(struct UnkStruct_x20 * arg0)
+static u32 ConvPartnerUnameAndGetWhetherMetAlready(struct UnkStruct_x20 * x20)
 {
     u8 sp0[30];
-    IntlConvPartnerUname(sp0, *arg0);
-    return PlayerHasMetTrainerBefore(ReadAsU16(arg0->unk.gname.unk_00.playerTrainerId), sp0);
+    IntlConvPartnerUname(sp0, *x20);
+    return PlayerHasMetTrainerBefore(ReadAsU16(x20->gname_uname.gname.unk_00.playerTrainerId), sp0);
 }
 
-static s32 sub_811AA5C(struct UnkStruct_Main0 * arg0, u8 arg1, u8 arg2, u32 playerGender)
+static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, u8 overrideGender, u8 playerIdx, u32 playerGender)
 {
-    bool32 r2;
+    bool32 metBefore;
 
-    struct UnkStruct_x20 * r5 = &arg0->arr[arg2];
+    struct UnkStruct_x20 * x20 = &main0->arr[playerIdx];
 
-    if (!r5->unk.gname.unk_0a_7 && arg1 == 0)
+    if (!x20->gname_uname.gname.started && overrideGender == 0)
     {
-        IntlConvPartnerUname(gStringVar1, *r5);
-        r2 = PlayerHasMetTrainerBefore(ReadAsU16(r5->unk.gname.unk_00.playerTrainerId), gStringVar1);
-        if (r5->unk.gname.unk_0a_0 == 0x45)
+        IntlConvPartnerUname(gStringVar1, *x20);
+        metBefore = PlayerHasMetTrainerBefore(ReadAsU16(x20->gname_uname.gname.unk_00.playerTrainerId), gStringVar1);
+        if (x20->gname_uname.gname.activity == (ACTIVITY_CHAT | IN_UNION_ROOM))
         {
-            StringExpandPlaceholders(gStringVar4, gUnknown_8457F80[r2][playerGender]);
+            StringExpandPlaceholders(gStringVar4, gUnknown_8457F80[metBefore][playerGender]);
             return 2;
         }
         else
         {
-            sub_811A0B4(gUnknown_8457A34[r2]);
+            UR_PrintFieldMessage(gURText_PleaseWaitMsgs[metBefore]);
             return 1;
         }
     }
     else
     {
-        IntlConvPartnerUname(gStringVar1, *r5);
-        if (arg1 != 0)
+        IntlConvPartnerUname(gStringVar1, *x20);
+        if (overrideGender != 0)
         {
-            playerGender = (r5->unk.gname.unk_00.playerTrainerId[arg1 + 1] >> 3) & 1;
+            playerGender = (x20->gname_uname.gname.unk_00.playerTrainerId[overrideGender + 1] >> 3) & 1;
         }
-        switch (r5->unk.gname.unk_0a_0 & 0x3F)
+        switch (x20->gname_uname.gname.activity & 0x3F)
         {
-        case 1:
+        case ACTIVITY_BATTLE:
+            // Battling
             StringExpandPlaceholders(gStringVar4, gUnknown_8458758[playerGender][Random() % 4]);
             break;
-        case 4:
+        case ACTIVITY_TRADE:
+            // Trading
             StringExpandPlaceholders(gStringVar4, gUnknown_8458A78[playerGender][Random() % 2]);
             break;
-        case 5:
+        case ACTIVITY_CHAT:
+            // Chatting
             StringExpandPlaceholders(gStringVar4, gUnknown_84588BC[playerGender][Random() % 4]);
             break;
-        case 8:
+        case ACTIVITY_CARD:
+            // Sharing cards
             StringExpandPlaceholders(gStringVar4, gUnknown_84589AC[playerGender][Random() % 2]);
             break;
         default:
+            // Unknown
             StringExpandPlaceholders(gStringVar4, gUnknown_8457F90);
             break;
         }
@@ -4169,73 +4310,73 @@ static void nullsub_92(u8 windowId, s32 itemId, u8 y)
 
 }
 
-static void sub_811ABE4(u8 windowId, u8 y, struct GFtgtGname * gname, const u8 * uname, u8 colorIdx)
+static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct GFtgtGname * gname, const u8 * uname, u8 colorIdx)
 {
     u8 level_t[4];
     u16 species = gname->species;
     u8 type = gname->type;
     u8 level = gname->level;
 
-    sub_811A444(windowId, 2, uname, 8, y, colorIdx);
+    UR_AddTextPrinterParameterized(windowId, 2, uname, 8, y, colorIdx);
     if (species == SPECIES_EGG)
     {
-        sub_811A444(windowId, 2, gUnknown_8458FBC, 0x44, y, colorIdx);
+        UR_AddTextPrinterParameterized(windowId, 2, gText_EggTrade, 0x44, y, colorIdx);
     }
     else
     {
         BlitMoveInfoIcon(windowId, type + 1, 0x44, y);
-        sub_811A444(windowId, 2, gSpeciesNames[species], 0x76, y, colorIdx);
+        UR_AddTextPrinterParameterized(windowId, 2, gSpeciesNames[species], 0x76, y, colorIdx);
         ConvertIntToDecimalStringN(level_t, level, STR_CONV_MODE_LEFT_ALIGN, 3);
-        sub_811A444(windowId, 2, level_t, GetStringRightAlignXOffset(2, level_t, 218), y, colorIdx);
+        UR_AddTextPrinterParameterized(windowId, 2, level_t, GetStringRightAlignXOffset(2, level_t, 218), y, colorIdx);
     }
 }
 
-static void sub_811ACA4(u8 windowId, s32 itemId, u8 y)
+static void TradeBoardListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y)
 {
     struct UnkStruct_Leader * leader = sUnionRoomMain.leader;
     struct GFtgtGname * rfu;
     s32 i, j;
-    u8 uname[8];
+    u8 uname[RFU_USER_NAME_LENGTH];
 
-    if (itemId == -3 && y == gUnknown_8456F7C.upText_Y)
+    if (itemId == -3 && y == sTradeBoardListMenuTemplate.upText_Y)
     {
-        rfu = sub_80F9800();
+        rfu = GetHostRFUtgtGname();
         if (rfu->species != SPECIES_NONE)
         {
-            sub_811ABE4(windowId, y, rfu, gSaveBlock2Ptr->playerName, 5);
+            TradeBoardPrintItemInfo(windowId, y, rfu, gSaveBlock2Ptr->playerName, 5);
         }
     }
     else
     {
         j = 0;
-        for (i = 0; i < 8; i++)
+        for (i = 0; i < UROOM_MAX_GROUP_COUNT; i++)
         {
-            if (leader->field_0->arr[i].field_1A_0 == 1 && leader->field_0->arr[i].unk.gname.species != SPECIES_NONE)
+            if (leader->field_0->arr[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN && leader->field_0->arr[i].gname_uname.gname.species != SPECIES_NONE)
             {
                 j++;
             }
             if (j == itemId + 1)
             {
                 IntlConvPartnerUname(uname, leader->field_0->arr[i]);
-                sub_811ABE4(windowId, y, &leader->field_0->arr[i].unk.gname, uname, 6);
+                TradeBoardPrintItemInfo(windowId, y, &leader->field_0->arr[i].gname_uname.gname, uname, 6);
                 break;
             }
         }
     }
 }
 
-static s32 sub_811AD7C(struct UnkStruct_x20 * arg, s32 arg1)
+static s32 GetIndexOfNthTradeBoardOffer(struct UnkStruct_x20 * x20, s32 n)
 {
     s32 i;
     s32 j = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < UROOM_MAX_GROUP_COUNT; i++)
     {
-        if (arg[i].field_1A_0 == 1 && arg[i].unk.gname.species != SPECIES_NONE)
+        if (x20[i].groupScheduledAnim == UNION_ROOM_SPAWN_IN && x20[i].gname_uname.gname.species != SPECIES_NONE)
         {
             j++;
         }
-        if (j == arg1 + 1)
+        if (j == n + 1)
         {
             return i;
         }
@@ -4244,12 +4385,12 @@ static s32 sub_811AD7C(struct UnkStruct_x20 * arg, s32 arg1)
     return -1;
 }
 
-static s32 GetUnionRoomPlayerGender(s32 arg1, struct UnkStruct_Main0 * arg0)
+static s32 GetUnionRoomPlayerGender(s32 playerIdx, struct UnkStruct_Main0 * main0)
 {
-    return arg0->arr[arg1].unk.gname.playerGender;
+    return main0->arr[playerIdx].gname_uname.gname.playerGender;
 }
 
-static s32 sub_811ADD0(u32 type, u32 species)
+static s32 IsRequestedTypeAndSpeciesInPlayerParty(u32 type, u32 species)
 {
     s32 i;
 
@@ -4260,10 +4401,10 @@ static s32 sub_811ADD0(u32 type, u32 species)
             species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
             if (species == SPECIES_EGG)
             {
-                return 0;
+                return UR_TRADE_MATCH;
             }
         }
-        return 2;
+        return UR_TRADE_NOEGG;
     }
     else
     {
@@ -4272,77 +4413,77 @@ static s32 sub_811ADD0(u32 type, u32 species)
             species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
             if (gBaseStats[species].type1 == type || gBaseStats[species].type2 == type)
             {
-                return 0;
+                return UR_TRADE_MATCH;
             }
         }
-        return 1;
+        return UR_TRADE_NOTYPE;
     }
 }
 
-static void sub_811AE68(u8 *dst, s32 arg1, u32 playerGender)
+static void GetURoomActivityRejectMsg(u8 *dst, s32 activity, u32 playerGender)
 {
-    switch (arg1)
+    switch (activity)
     {
-    case 0x41:
+    case ACTIVITY_BATTLE | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8458314[playerGender]);
         break;
-    case 0x45:
+    case ACTIVITY_CHAT | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_84585E8[playerGender]);
         break;
-    case 0x44:
+    case ACTIVITY_TRADE | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8458F9C);
         break;
-    case 0x48:
+    case ACTIVITY_CARD | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_84583B4[playerGender]);
         break;
     }
 }
 
-static void sub_811AECC(u8 *dst, u8 arg1)
+static void GetURoomActivityStartMsg(u8 *dst, u8 activity)
 {
     u8 mpId = GetMultiplayerId();
     u8 gender = gLinkPlayers[mpId ^ 1].gender;
 
-    switch (arg1)
+    switch (activity)
     {
-    case 0x41:
+    case ACTIVITY_BATTLE | IN_UNION_ROOM:
         StringCopy(dst, gUnknown_8458230[mpId][gender][0]);
         break;
-    case 0x44:
+    case ACTIVITY_TRADE | IN_UNION_ROOM:
         StringCopy(dst, gUnknown_8458230[mpId][gender][2]);
         break;
-    case 0x45:
+    case ACTIVITY_CHAT | IN_UNION_ROOM:
         StringCopy(dst, gUnknown_8458230[mpId][gender][1]);
         break;
     }
 }
 
-static s32 sub_811AF6C(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom * arg3)
+static s32 GetChatLeaderActionRequestMessage(u8 *dst, u32 gender, u16 *activity_p, struct UnkStruct_URoom * arg3)
 {
     s32 result = 0;
     u16 species = SPECIES_NONE;
     s32 i;
 
-    switch (arg2[0])
+    switch (activity_p[0])
     {
-    case 0x41:
+    case ACTIVITY_BATTLE | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8457CA4);
         result = 1;
         break;
-    case 0x45:
+    case ACTIVITY_CHAT | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8457CF8);
         result = 1;
         break;
-    case 0x44:
-        ConvertIntToDecimalStringN(arg3->field_58[0], sUnionRoomTrade.playerLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
-        StringCopy(arg3->field_58[1], gSpeciesNames[sUnionRoomTrade.playerSpecies]);
-        for (i = 0; i < 4; i++)
+    case ACTIVITY_TRADE | IN_UNION_ROOM:
+        ConvertIntToDecimalStringN(arg3->activityRequestStrbufs[0], sUnionRoomTrade.playerLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
+        StringCopy(arg3->activityRequestStrbufs[1], gSpeciesNames[sUnionRoomTrade.playerSpecies]);
+        for (i = 0; i < RFU_CHILD_MAX; i++)
         {
-            if (gRfuLinkStatus->partner[i].serialNo == 2)
+            if (gRfuLinkStatus->partner[i].serialNo == 0x0002)
             {
-                ConvertIntToDecimalStringN(arg3->field_58[2], arg2[2], STR_CONV_MODE_LEFT_ALIGN, 3);
-                StringCopy(arg3->field_58[3], gSpeciesNames[arg2[1]]);
-                species = arg2[1];
+                ConvertIntToDecimalStringN(arg3->activityRequestStrbufs[2], activity_p[2], STR_CONV_MODE_LEFT_ALIGN, 3);
+                StringCopy(arg3->activityRequestStrbufs[3], gSpeciesNames[activity_p[1]]);
+                species = activity_p[1];
                 break;
             }
         }
@@ -4352,19 +4493,20 @@ static s32 sub_811AF6C(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom *
         }
         else
         {
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < RFU_CHILD_MAX; i++)
             {
-                DynamicPlaceholderTextUtil_SetPlaceholderPtr(i, arg3->field_58[i]);
+                DynamicPlaceholderTextUtil_SetPlaceholderPtr(i, arg3->activityRequestStrbufs[i]);
             }
             DynamicPlaceholderTextUtil_ExpandPlaceholders(dst, gUnknown_8457D44);
         }
         result = 1;
         break;
-    case 0x48:
+    case ACTIVITY_CARD | IN_UNION_ROOM:
         StringExpandPlaceholders(dst, gUnknown_8457C48);
         result = 1;
         break;
-    case 0x40:
+    case IN_UNION_ROOM:
+        // Chat dropped
         StringExpandPlaceholders(dst, gUnknown_8457E0C);
         result = 2;
         break;
@@ -4373,18 +4515,18 @@ static s32 sub_811AF6C(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom *
     return result;
 }
 
-static bool32 sub_811B0A4(struct UnkStruct_URoom * arg0)
+static bool32 PollPartnerYesNoResponse(struct UnkStruct_URoom * uroom)
 {
     if (gRecvCmds[0][1] != 0)
     {
-        if (gRecvCmds[0][1] == 0x51)
+        if (gRecvCmds[0][1] == (ACTIVITY_ACCEPT | IN_UNION_ROOM))
         {
-            arg0->field_98 = 0x51;
+            uroom->partnerYesNoResponse = ACTIVITY_ACCEPT | IN_UNION_ROOM;
             return TRUE;
         }
-        else if (gRecvCmds[0][1] == 0x52)
+        else if (gRecvCmds[0][1] == (ACTIVITY_DECLINE | IN_UNION_ROOM))
         {
-            arg0->field_98 = 0x52;
+            uroom->partnerYesNoResponse = ACTIVITY_DECLINE | IN_UNION_ROOM;
             return TRUE;
         }
     }
@@ -4418,16 +4560,16 @@ static bool32 HasAtLeastTwoMonsOfLevel30OrLower(void)
         return FALSE;
 }
 
-static void ResetUnionRoomTrade(struct UnionRoomTrade * arg0)
+static void ResetUnionRoomTrade(struct UnionRoomTrade * uroomTrade)
 {
-    arg0->field_0 = 0;
-    arg0->type = 0;
-    arg0->playerPersonality = 0;
-    arg0->playerSpecies = 0;
-    arg0->playerLevel = 0;
-    arg0->species = 0;
-    arg0->level = 0;
-    arg0->personality = 0;
+    uroomTrade->field_0 = 0;
+    uroomTrade->type = 0;
+    uroomTrade->playerPersonality = 0;
+    uroomTrade->playerSpecies = 0;
+    uroomTrade->playerLevel = 0;
+    uroomTrade->species = 0;
+    uroomTrade->level = 0;
+    uroomTrade->personality = 0;
 }
 
 void Script_ResetUnionRoomTrade(void)
@@ -4494,26 +4636,26 @@ static u32 GetPartyPositionOfRegisteredMon(struct UnionRoomTrade * trade, u8 mul
     return response;
 }
 
-static void sub_811B258(bool32 arg0)
+static void HandleCancelTrade(bool32 unlockObjs)
 {
-    sub_811A3F8();
+    UR_BlankBg0();
     ScriptContext2_Disable();
-    sub_80696F0();
-    gUnknown_203B058 = 0;
-    if (arg0)
+    UnionRoom_UnlockPlayerAndChatPartner();
+    sPlayerCurrActivity = 0;
+    if (unlockObjs)
     {
-        sub_80FAFA0(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
-        sub_80FB008(0x40, 0, 0);
+        RfuUpdatePlayerGnameStateAndSend(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
+        UpdateGameDataWithActivitySpriteGendersFlag(IN_UNION_ROOM, 0, FALSE);
     }
 }
 
-static void sub_811B298(void)
+static void UR_EnableScriptContext2AndFreezeObjectEvents(void)
 {
     ScriptContext2_Enable();
     ScriptFreezeObjectEvents();
 }
 
-static u8 sub_811B2A8(s32 linkPlayer)
+static u8 GetSinglePartnerSpriteGenderParam(s32 linkPlayer)
 {
     u8 retval = 0x80;
     retval |= gLinkPlayers[linkPlayer].gender << 3;
@@ -4521,17 +4663,17 @@ static u8 sub_811B2A8(s32 linkPlayer)
     return retval;
 }
 
-static u8 sub_811B2D8(struct UnkStruct_URoom * arg0)
+static u8 GetActivePartnerSpriteGenderParam(struct UnkStruct_URoom * uroom)
 {
     u8 retVal = 0x80;
     u8 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (arg0->field_C->arr[i].unk18)
+        if (uroom->field_C->arr[i].active)
         {
-            retVal |= arg0->field_C->arr[i].unk0.gname.playerGender << 3;
-            retVal |= arg0->field_C->arr[i].unk0.gname.unk_00.playerTrainerId[0] & 7;
+            retVal |= uroom->field_C->arr[i].gname_uname.gname.playerGender << 3;
+            retVal |= uroom->field_C->arr[i].gname_uname.gname.unk_00.playerTrainerId[0] & 7;
             break;
         }
     }
@@ -4539,7 +4681,7 @@ static u8 sub_811B2D8(struct UnkStruct_URoom * arg0)
     return retVal;
 }
 
-static void sub_811B31C(u8 *unused, struct UnkStruct_URoom * arg1, bool8 arg2)
+static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uroom, bool8 parent_child)
 {
     struct TrainerCard * trainerCard = &gTrainerCards[GetMultiplayerId() ^ 1];
     s32 i;
@@ -4547,61 +4689,61 @@ static void sub_811B31C(u8 *unused, struct UnkStruct_URoom * arg1, bool8 arg2)
 
     DynamicPlaceholderTextUtil_Reset();
 
-    StringCopy(arg1->trainerCardStrbufs[0], gTrainerClassNames[sub_80447F0()]);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, arg1->trainerCardStrbufs[0]);
+    StringCopy(uroom->trainerCardStrbufs[0], gTrainerClassNames[sub_80447F0()]);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, uroom->trainerCardStrbufs[0]);
 
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->playerName);
 
-    StringCopy(arg1->field_174, gUnknown_84594B0[trainerCard->stars]);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, arg1->field_174);
+    StringCopy(uroom->field_174, gUnknown_84594B0[trainerCard->stars]);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, uroom->field_174);
 
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[2], trainerCard->caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, arg1->trainerCardStrbufs[2]);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[2], trainerCard->caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, uroom->trainerCardStrbufs[2]);
 
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[3], trainerCard->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3);
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[4], trainerCard->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, arg1->trainerCardStrbufs[3]);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, arg1->trainerCardStrbufs[4]);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[3], trainerCard->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[4], trainerCard->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, uroom->trainerCardStrbufs[3]);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, uroom->trainerCardStrbufs[4]);
 
-    DynamicPlaceholderTextUtil_ExpandPlaceholders(arg1->field_1A4, gUnknown_84594C4);
-    StringCopy(gStringVar4, arg1->field_1A4);
+    DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_84594C4);
+    StringCopy(gStringVar4, uroom->field_1A4);
 
     n = trainerCard->linkBattleWins;
     if (n > 9999)
     {
         n = 9999;
     }
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[0], n, STR_CONV_MODE_LEFT_ALIGN, 4);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, arg1->trainerCardStrbufs[0]);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[0], n, STR_CONV_MODE_LEFT_ALIGN, 4);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, uroom->trainerCardStrbufs[0]);
 
     n = trainerCard->linkBattleLosses;
     if (n > 9999)
     {
         n = 9999;
     }
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[1], n, STR_CONV_MODE_LEFT_ALIGN, 4);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, arg1->trainerCardStrbufs[1]);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[1], n, STR_CONV_MODE_LEFT_ALIGN, 4);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, uroom->trainerCardStrbufs[1]);
 
-    ConvertIntToDecimalStringN(arg1->trainerCardStrbufs[2], trainerCard->pokemonTrades, STR_CONV_MODE_LEFT_ALIGN, 5);
-    DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, arg1->trainerCardStrbufs[2]);
+    ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[2], trainerCard->pokemonTrades, STR_CONV_MODE_LEFT_ALIGN, 5);
+    DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, uroom->trainerCardStrbufs[2]);
 
     for (i = 0; i < 4; i++)
     {
-        CopyEasyChatWord(arg1->trainerCardStrbufs[i + 3], trainerCard->var_28[i]);
-        DynamicPlaceholderTextUtil_SetPlaceholderPtr(i + 4, arg1->trainerCardStrbufs[i + 3]);
+        CopyEasyChatWord(uroom->trainerCardStrbufs[i + 3], trainerCard->var_28[i]);
+        DynamicPlaceholderTextUtil_SetPlaceholderPtr(i + 4, uroom->trainerCardStrbufs[i + 3]);
     }
 
-    DynamicPlaceholderTextUtil_ExpandPlaceholders(arg1->field_1A4, gUnknown_8459504);
-    StringAppend(gStringVar4, arg1->field_1A4);
+    DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459504);
+    StringAppend(gStringVar4, uroom->field_1A4);
 
-    if (arg2 == TRUE)
+    if (parent_child == MODE_PARENT)
     {
-        DynamicPlaceholderTextUtil_ExpandPlaceholders(arg1->field_1A4, gUnknown_8459588);
-        StringAppend(gStringVar4, arg1->field_1A4);
+        DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459588);
+        StringAppend(gStringVar4, uroom->field_1A4);
     }
-    else if (arg2 == FALSE)
+    else if (parent_child == MODE_CHILD)
     {
-        DynamicPlaceholderTextUtil_ExpandPlaceholders(arg1->field_1A4, gUnknown_8459580[trainerCard->gender]);
-        StringAppend(gStringVar4, arg1->field_1A4);
+        DynamicPlaceholderTextUtil_ExpandPlaceholders(uroom->field_1A4, gUnknown_8459580[trainerCard->gender]);
+        StringAppend(gStringVar4, uroom->field_1A4);
     }
 }
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index b75cc086d..b4d8af9ce 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -13,15 +13,16 @@
 #include "text_window.h"
 #include "union_room.h"
 #include "window.h"
+#include "constants/union_room.h"
 
-struct UnkStruct_203B08C
+struct UnionRoomBattleWork
 {
-    s16 a0;
+    s16 textState;
 };
 
-static EWRAM_DATA struct UnkStruct_203B08C * gUnknown_203B08C = NULL;
+static EWRAM_DATA struct UnionRoomBattleWork * sWork = NULL;
 
-static const struct BgTemplate gUnknown_8457194[] = {
+static const struct BgTemplate sBgTemplates[] = {
     {
         .bg = 0,
         .charBaseIndex = 3,
@@ -29,7 +30,7 @@ static const struct BgTemplate gUnknown_8457194[] = {
     }
 };
 
-static const struct WindowTemplate gUnknown_8457198[] = {
+static const struct WindowTemplate sWindowTemplates[] = {
     {
         .bg = 0,
         .tilemapLeft = 2,
@@ -43,10 +44,10 @@ static const struct WindowTemplate gUnknown_8457198[] = {
 
 static const u8 gUnknown_84571A8[] = {1, 2, 3};
 
-static void sub_811C04C(void)
+static void SetUpPartiesAndStartBattle(void)
 {
     s32 i;
-    sub_81173C0(BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER);
+    StartUnionRoomBattle(BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER);
     for (i = 0; i < 2; i++)
     {
         gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1];
@@ -65,7 +66,7 @@ static void sub_811C04C(void)
     SetMainCallback2(CB2_InitBattle);
 }
 
-static void sub_811C0E0(u8 windowId, const u8 * str, u8 x, u8 y, s32 speed)
+static void UnionRoomBattle_CreateTextPrinter(u8 windowId, const u8 * str, u8 x, u8 y, s32 speed)
 {
     s32 letterSpacing = 1;
     s32 lineSpacing = 1;
@@ -73,13 +74,13 @@ static void sub_811C0E0(u8 windowId, const u8 * str, u8 x, u8 y, s32 speed)
     AddTextPrinterParameterized4(windowId, 3, x, y, letterSpacing, lineSpacing, gUnknown_84571A8, speed, str);
 }
 
-static bool32 sub_811C150(s16 * state, const u8 * str, s32 speed)
+static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s32 speed)
 {
     switch (*state)
     {
     case 0:
         DrawTextBorderOuter(0, 0x001, 0xD);
-        sub_811C0E0(0, str, 0, 2, speed);
+        UnionRoomBattle_CreateTextPrinter(0, str, 0, 2, speed);
         PutWindowTilemap(0);
         CopyWindowToVram(0, 3);
         (*state)++;
@@ -95,27 +96,27 @@ static bool32 sub_811C150(s16 * state, const u8 * str, s32 speed)
     return FALSE;
 }
 
-static void sub_811C1B4(void)
+static void VBlankCB_UnionRoomBattle(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_811C1C8(void)
+void CB2_UnionRoomBattle(void)
 {
     switch (gMain.state)
     {
     case 0:
         SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
-        gUnknown_203B08C = AllocZeroed(sizeof(struct UnkStruct_203B08C));
+        sWork = AllocZeroed(sizeof(struct UnionRoomBattleWork));
         ResetSpriteData();
         FreeAllSpritePalettes();
         ResetTasks();
         ResetBgsAndClearDma3BusyFlags(0);
-        InitBgsFromTemplates(0, gUnknown_8457194, 1);
+        InitBgsFromTemplates(0, sBgTemplates, 1);
         ResetTempTileDataBuffers();
-        if (!InitWindows(gUnknown_8457198))
+        if (!InitWindows(sWindowTemplates))
         {
             return;
         }
@@ -126,11 +127,11 @@ void sub_811C1C8(void)
         FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF);
         TextWindow_SetStdFrame0_WithPal(0, 1, 0xD0);
         Menu_LoadStdPal();
-        SetVBlankCallback(sub_811C1B4);
+        SetVBlankCallback(VBlankCB_UnionRoomBattle);
         gMain.state++;
         break;
     case 1:
-        if (sub_811C150(&gUnknown_203B08C->a0, gText_CommStandbyAwaitingOtherPlayer, 0))
+        if (UnionRoomBattle_PrintTextOnWindow0(&sWork->textState, gText_CommStandbyAwaitingOtherPlayer, 0))
         {
             gMain.state++;
         }
@@ -146,11 +147,11 @@ void sub_811C1C8(void)
             memset(gBlockSendBuffer, 0, 0x20);
             if (gSelectedOrderFromParty[0] == -gSelectedOrderFromParty[1])
             {
-                gBlockSendBuffer[0] = 0x52;
+                gBlockSendBuffer[0] = ACTIVITY_DECLINE | 0x40;
             }
             else
             {
-                gBlockSendBuffer[0] = 0x51;
+                gBlockSendBuffer[0] = ACTIVITY_ACCEPT | 0x40;
             }
             SendBlock(0, gBlockSendBuffer, 0x20);
             gMain.state++;
@@ -159,15 +160,15 @@ void sub_811C1C8(void)
     case 4:
         if (GetBlockReceivedStatus() == 3)
         {
-            if (gBlockRecvBuffer[0][0] == 0x51 && gBlockRecvBuffer[1][0] == 0x51)
+            if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | 0x40) && gBlockRecvBuffer[1][0] == (ACTIVITY_ACCEPT | 0x40))
             {
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
                 gMain.state = 50;
             }
             else
             {
-                sub_800AAC0();
-                if (gBlockRecvBuffer[GetMultiplayerId()][0] == 0x52)
+                Link_TryStartSend5FFF();
+                if (gBlockRecvBuffer[GetMultiplayerId()][0] == (ACTIVITY_DECLINE | 0x40))
                 {
                     gMain.state = 6;
                 }
@@ -182,14 +183,14 @@ void sub_811C1C8(void)
     case 50:
         if (!UpdatePaletteFade())
         {
-            sub_800AB9C();
+            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
             gMain.state++;
         }
         break;
     case 51:
         if (IsLinkTaskFinished())
         {
-            SetMainCallback2(sub_811C04C);
+            SetMainCallback2(SetUpPartiesAndStartBattle);
         }
         break;
     case 6:
@@ -199,7 +200,7 @@ void sub_811C1C8(void)
         }
         break;
     case 7:
-        if (sub_811C150(&gUnknown_203B08C->a0, gText_RefusedBattle, 1))
+        if (UnionRoomBattle_PrintTextOnWindow0(&sWork->textState, gText_RefusedBattle, 1))
         {
             SetMainCallback2(CB2_ReturnToField);
         }
@@ -211,7 +212,7 @@ void sub_811C1C8(void)
         }
         break;
     case 9:
-        if (sub_811C150(&gUnknown_203B08C->a0, gText_BattleWasRefused, 1))
+        if (UnionRoomBattle_PrintTextOnWindow0(&sWork->textState, gText_BattleWasRefused, 1))
         {
             SetMainCallback2(CB2_ReturnToField);
         }
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 15601c028..167da514a 100644
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -207,7 +207,7 @@ void EnterUnionRoomChat(void)
     sWork = Alloc(sizeof(struct UnionRoomChat));
     InitChatWork(sWork);
     gKeyRepeatStartDelay = 20;
-    sub_812B4AC();
+    HelpSystem_DisableToggleWithRButton();
     SetVBlankCallback(NULL);
     SetMainCallback2(CB2_LoadInterface);
 }
@@ -587,7 +587,7 @@ static void ChatEntryRoutine_ExitChat(void)
     case 5:
         if (IsLinkTaskFinished() && !GetRfuUnkCE8())
         {
-            sub_800AAC0();
+            Link_TryStartSend5FFF();
             sWork->exitDelayTimer = 0;
             sWork->routineState++;
         }
@@ -622,7 +622,7 @@ static void ChatEntryRoutine_Drop(void)
     case 1:
         if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !GetRfuUnkCE8())
         {
-            sub_800AAC0();
+            Link_TryStartSend5FFF();
             sWork->exitDelayTimer = 0;
             sWork->routineState++;
         }
@@ -668,7 +668,7 @@ static void ChatEntryRoutine_Disbanded(void)
     case 2:
         if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !GetRfuUnkCE8())
         {
-            sub_800AAC0();
+            Link_TryStartSend5FFF();
             sWork->exitDelayTimer = 0;
             sWork->routineState++;
         }
@@ -893,7 +893,7 @@ static void ChatEntryRoutine_SaveAndExit(void)
     case 13:
         if (!gPaletteFade.active)
         {
-            sub_812B4B8();
+            HelpSystem_EnableToggleWithRButton();
             UnionRoomChat_FreeGraphicsWork();
             FreeChatWork();
             SetMainCallback2(CB2_ReturnToField);
@@ -914,7 +914,7 @@ static bool32 TypeChatMessage_HandleDPad(void)
     {
         if (JOY_REPT(DPAD_UP))
         {
-            if (sWork->currentRow)
+            if (sWork->currentRow > 0)
                 sWork->currentRow--;
             else
                 sWork->currentRow = sKeyboardPageMaxRow[sWork->currentPage];
@@ -938,7 +938,7 @@ static bool32 TypeChatMessage_HandleDPad(void)
         {
             if (JOY_REPT(DPAD_LEFT))
             {
-                if (sWork->currentCol)
+                if (sWork->currentCol > 0)
                     sWork->currentCol--;
                 else
                     sWork->currentCol = 4;
diff --git a/src/union_room_message.c b/src/union_room_message.c
index 9ca5aa15b..1d26d1968 100644
--- a/src/union_room_message.c
+++ b/src/union_room_message.c
@@ -1,10 +1,11 @@
 #include "global.h"
 #include "union_room_message.h"
 #include "mevent_server.h"
+#include "constants/union_room.h"
 
-ALIGNED(4) const u8 gUnknown_84571AC[] = _("");
+ALIGNED(4) const u8 gUnionRoomActivity_Blank[] = _("");
 ALIGNED(4) const u8 gUnknown_84571B0[] = _(":");
-ALIGNED(4) const u8 gUnknown_84571B4[] = _("{EXTRA 7}");
+ALIGNED(4) const u8 gUnknown_84571B4[] = _("{ID}");
 ALIGNED(4) const u8 gUnknown_84571B8[] = _("Please start over from the beginning.");
 ALIGNED(4) const u8 gUnknown_84571E0[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled.");
 ALIGNED(4) const u8 gUnref_845721C[] = _("ともだちからの れんらくを\nまっています");
@@ -124,6 +125,7 @@ const u8 *const gUnknown_8457754[] = {
 
 ALIGNED(4) const u8 gUnknown_845777C[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been established.");
 ALIGNED(4) const u8 gUnknown_84577BC[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been dropped…");
+
 ALIGNED(4) const u8 gUnknown_84577F8[] = _("The link with your friend has been\ndropped…");
 ALIGNED(4) const u8 gUnknown_8457824[] = _("{STR_VAR_1} replied, “No…”");
 
@@ -150,11 +152,12 @@ const u8 *const gUnknown_8457898[] = {
 
 ALIGNED(4) const u8 gUnknown_84578A0[] = _("はなしかけています…\nしょうしょう おまちください");
 ALIGNED(4) const u8 gUnknown_84578BC[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…");
+
 ALIGNED(4) const u8 gUnknown_84578E4[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
 ALIGNED(4) const u8 gUnknown_8457950[] = _("Communicating with {STR_VAR_1}{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
 ALIGNED(4) const u8 gUnknown_84579BC[] = _("Please wait a while{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
 
-const u8 *const gUnknown_8457A34[] = {
+const u8 *const gURText_PleaseWaitMsgs[] = {
     gUnknown_84578E4,
     gUnknown_8457950,
     gUnknown_84579BC
@@ -165,7 +168,7 @@ ALIGNED(4) const u8 gUnknown_8457A70[] = _("Hello!\nWould you like to do somethi
 ALIGNED(4) const u8 gUnknown_8457A98[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?");
 ALIGNED(4) const u8 gUnknown_8457AD0[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?");
 
-const u8 *const gUnknown_8457B04[][2] = {
+const u8 *const gURText_FriendPromptsForActivity[][2] = {
     {
         gUnknown_8457A40,
         gUnknown_8457A70
@@ -237,6 +240,7 @@ const u8 *const gUnknown_8457F80[][2] = {
 };
 
 ALIGNED(4) const u8 gUnknown_8457F90[] = _("……\nThe TRAINER appears to be busy…\p");
+
 ALIGNED(4) const u8 gUnknown_8457FB4[] = _("A battle, huh?\nAll right, just give me some time.");
 ALIGNED(4) const u8 gUnknown_8457FE8[] = _("You want to chat, huh?\nSure, just wait a little.");
 ALIGNED(4) const u8 gUnknown_845801C[] = _("Sure thing! As my “Greetings,”\nhere's my TRAINER CARD.");
@@ -244,7 +248,7 @@ ALIGNED(4) const u8 gUnknown_8458054[] = _("A battle? Of course, but I need\ntim
 ALIGNED(4) const u8 gUnknown_8458088[] = _("Did you want to chat?\nOkay, but please wait a moment.");
 ALIGNED(4) const u8 gUnknown_84580C0[] = _("As my introduction, I'll show you\nmy TRAINER CARD.");
 
-const u8 *const gUnknown_84580F4[][4] = {
+const u8 *const gResponseToURoomActivityInviteStringPtrs[][4] = {
     {
         gUnknown_8457FB4,
         gUnknown_8457FE8,
@@ -415,7 +419,8 @@ ALIGNED(4) const u8 gUnknown_8458AB8[] = _("Welcome to the TRADING BOARD.\pYou m
 ALIGNED(4) const u8 gUnknown_8458B44[] = _("This TRADING BOARD is used for\noffering a POKéMON for a trade.\pAll you need to do is register a\nPOKéMON for a trade.\pAnother TRAINER may offer a party\nPOKéMON in return for the trade.\pWe hope you will register POKéMON\nand trade them with many, many\lother TRAINERS.\pWould you like to register one of\nyour POKéMON?");
 ALIGNED(4) const u8 gUnref_ThankYouForComing_JP[] = _("こうかんけいじばん の とうろくが\nかんりょう しました\pごりよう ありがとう\nございました！\p");
 ALIGNED(4) const u8 gUnref_NoOneRegisteredMon[] = _("けいじばんに だれも ポケモンを\nとうろく していません\p\n");
-ALIGNED(4) const u8 gUnknown_8458CD4[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n");
+
+ALIGNED(4) const u8 gURText_PleaseChooseTypeOfMon[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n");
 ALIGNED(4) const u8 gUnknown_8458D1C[] = _("Which of your party POKéMON will\nyou offer in trade?\p");
 ALIGNED(4) const u8 gUnknown_8458D54[] = _("Registration has been canceled.\p");
 ALIGNED(4) const u8 gUnknown_8458D78[] = _("Registration has been completed.\p");
@@ -439,9 +444,10 @@ const u8 *const gUnknown_8458F94[] = {
 };
 
 ALIGNED(4) const u8 gUnknown_8458F9C[] = _("Your trade offer was rejected.\p");
-ALIGNED(4) const u8 gUnknown_8458FBC[] = _("EGG TRADE");
+ALIGNED(4) const u8 gText_EggTrade[] = _("EGG TRADE");
 ALIGNED(4) const u8 gUnknown_8458FC8[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
 ALIGNED(4) const u8 gUnknown_8458FE4[] = _("Please choose a TRAINER.");
+
 ALIGNED(4) const u8 gUnknown_8459000[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
 ALIGNED(4) const u8 gUnknown_8459030[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
 ALIGNED(4) const u8 gUnknown_8459060[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
@@ -453,15 +459,15 @@ ALIGNED(4) const u8 gUnknown_8459160[] = _("BERRY CRUSH!\nPlease choose the LEAD
 ALIGNED(4) const u8 gUnknown_8459188[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
 
 const u8 *const gUnknown_84591B8[] = {
-    gUnknown_8459000,
-    gUnknown_8459030,
-    gUnknown_8459060,
-    gUnknown_8459090,
-    gUnknown_845912C,
-    gUnknown_8459160,
-    gUnknown_8459188,
-    gUnknown_84590BC,
-    gUnknown_84590F4
+    [LINK_GROUP_SINGLE_BATTLE] = gUnknown_8459000,
+    [LINK_GROUP_DOUBLE_BATTLE] = gUnknown_8459030,
+    [LINK_GROUP_MULTI_BATTLE]  = gUnknown_8459060,
+    [LINK_GROUP_TRADE]         = gUnknown_8459090,
+    [LINK_GROUP_POKEMON_JUMP]  = gUnknown_845912C,
+    [LINK_GROUP_BERRY_CRUSH]   = gUnknown_8459160,
+    [LINK_GROUP_BERRY_PICKING] = gUnknown_8459188,
+    [LINK_GROUP_WONDER_CARD]   = gUnknown_84590BC,
+    [LINK_GROUP_WONDER_NEWS]   = gUnknown_84590F4
 };
 
 ALIGNED(4) const u8 gUnknown_84591DC[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait...");
@@ -470,6 +476,7 @@ ALIGNED(4) const u8 gUnknown_8459238[] = _("Awaiting {STR_VAR_1}'s response…")
 ALIGNED(4) const u8 gUnknown_8459250[] = _("{STR_VAR_1} has been asked to register\nyou as a member. Please wait.");
 ALIGNED(4) const u8 gUnknown_845928C[] = _("Awaiting a response from the\nWIRELESS COMMUNICATION SYSTEM.");
 ALIGNED(4) const u8 gUnref_PlsWaitLittleWHile[] = _("ほかの さんかしゃが そろうまで\nしょうしょう おまちください");
+
 ALIGNED(4) const u8 gUnknown_84592E8[] = _("No CARDS appear to be shared \nright now.");
 ALIGNED(4) const u8 gUnknown_8459314[] = _("No NEWS appears to be shared\nright now.");
 
@@ -482,23 +489,26 @@ ALIGNED(4) const u8 gUnknown_8459344[] = _("BATTLE");
 ALIGNED(4) const u8 gUnknown_845934C[] = _("CHAT");
 ALIGNED(4) const u8 gUnknown_8459354[] = _("GREETINGS");
 ALIGNED(4) const u8 gUnknown_8459360[] = _("EXIT");
+
 ALIGNED(4) const u8 gUnknown_8459368[] = _("EXIT");
 ALIGNED(4) const u8 gUnknown_8459370[] = _("INFO");
 ALIGNED(4) const u8 gUnknown_8459378[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV.");
-ALIGNED(4) const u8 gUnknown_8459394[] = _("SINGLE BATTLE");
-ALIGNED(4) const u8 gUnknown_84593A4[] = _("DOUBLE BATTLE");
-ALIGNED(4) const u8 gUnknown_84593B4[] = _("MULTI BATTLE");
-ALIGNED(4) const u8 gUnknown_84593C4[] = _("POKéMON TRADES");
-ALIGNED(4) const u8 gUnknown_84593D4[] = _("CHAT");
-ALIGNED(4) const u8 gUnknown_84593DC[] = _("CARDS");
-ALIGNED(4) const u8 gUnknown_84593E4[] = _("WONDER CARDS");
-ALIGNED(4) const u8 gUnknown_84593F4[] = _("WONDER NEWS");
-ALIGNED(4) const u8 gUnknown_8459400[] = _("POKéMON JUMP");
-ALIGNED(4) const u8 gUnknown_8459410[] = _("BERRY CRUSH");
-ALIGNED(4) const u8 gUnknown_845941C[] = _("BERRY-PICKING");
-ALIGNED(4) const u8 gUnknown_845942C[] = _("SEARCH");
-ALIGNED(4) const u8 gUnknown_8459434[] = _("ぐるぐるこうかん");
-ALIGNED(4) const u8 gUnknown_8459440[] = _("アイテムトレード");
+
+ALIGNED(4) const u8 gUnionRoomActivity_SingleBattle[] = _("SINGLE BATTLE");
+ALIGNED(4) const u8 gUnionRoomActivity_DoubleBattle[] = _("DOUBLE BATTLE");
+ALIGNED(4) const u8 gUnionRoomActivity_MultiBattle[] = _("MULTI BATTLE");
+ALIGNED(4) const u8 gUnionRoomActivity_PokemonTrades[] = _("POKéMON TRADES");
+ALIGNED(4) const u8 gUnionRoomActivity_Chat[] = _("CHAT");
+ALIGNED(4) const u8 gUnionRoomActivity_Cards[] = _("CARDS");
+ALIGNED(4) const u8 gUnionRoomActivity_WonderCards[] = _("WONDER CARDS");
+ALIGNED(4) const u8 gunionRoomActivity_WonderNews[] = _("WONDER NEWS");
+ALIGNED(4) const u8 gUnionRoomActivity_PokemonJump[] = _("POKéMON JUMP");
+ALIGNED(4) const u8 gUnionRoomActivity_BerryCrush[] = _("BERRY CRUSH");
+ALIGNED(4) const u8 gUnionRoomActivity_BerryPicking[] = _("BERRY-PICKING");
+ALIGNED(4) const u8 gUnionRoomActivity_Search[] = _("SEARCH");
+ALIGNED(4) const u8 gUnionRoomActivity_SpinTradeJP[] = _("ぐるぐるこうかん");
+ALIGNED(4) const u8 gUnionRoomActivity_ItemTradeJP[] = _("アイテムトレード");
+
 ALIGNED(4) const u8 gUnknown_845944C[] = _("It's a NORMAL CARD.");
 ALIGNED(4) const u8 gUnknown_8459460[] = _("It's a BRONZE CARD!");
 ALIGNED(4) const u8 gUnknown_8459474[] = _("It's a COPPER CARD!");
@@ -515,6 +525,7 @@ const u8 *const gUnknown_84594B0[] = {
 
 ALIGNED(4) const u8 gUnknown_84594C4[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
 ALIGNED(4) const u8 gUnknown_8459504[] = _("BATTLES: {SPECIAL_F7 0x00} WINS  {SPECIAL_F7 0x02} LOSSES\nTRADES:  {SPECIAL_F7 0x03} TIMES\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p");
+
 ALIGNED(4) const u8 gUnknown_8459544[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}");
 ALIGNED(4) const u8 gUnknown_8459564[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}");
 
diff --git a/src/unk_815C980.c b/src/unk_815C980.c
deleted file mode 100644
index 09b92c834..000000000
--- a/src/unk_815C980.c
+++ /dev/null
@@ -1,437 +0,0 @@
-#include "global.h"
-#include "malloc.h"
-#include "decompress.h"
-#include "unk_815C980.h"
-#include "main.h"
-#include "battle.h"
-
-struct UnkStruct2
-{
-    bool8 isActive;
-    u8 firstOamId;
-    u8 field_2;
-    u8 oamCount;
-    u8 palTagIndex;
-    u8 size;
-    u8 shape;
-    u8 priority;
-    u8 xDelta;
-    u8 field_9;
-    u16 tileStart;
-    s16 x;
-    s16 y;
-    u16 tileTag;
-    u16 palTag;
-    u32 field_14;
-    s32 field_18;
-};
-
-struct UnkStruct1
-{
-    u32 count;
-    struct UnkStruct2 *array;
-};
-
-// this file's functions
-static u8 sub_815D244(u8 arg0);;
-static void sub_815CC28(struct UnkStruct2 *arg0);
-static void sub_815CDDC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_815CE90(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_815CFEC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static bool32 SharesTileWithAnyActive(u32 id);
-static bool32 SharesPalWithAnyActive(u32 id);
-static void sub_8035648(void);
-static u8 sub_815D324(u32 shape, u32 size);
-
-// ewram
-static EWRAM_DATA struct UnkStruct1 *gUnknown_203F454 = {0};
-
-// const rom data
-static const u8 gUnknown_8479658[][4] =
-{
-    {0x01, 0x04, 0x10, 0x40},
-    {0x02, 0x04, 0x08, 0x20},
-    {0x02, 0x04, 0x08, 0x20},
-    {0x00, 0x00, 0x00, 0x00}
-};
-
-// code
-bool32 sub_815C980(u32 count)
-{
-    u32 i;
-
-    if (gUnknown_203F454 != NULL)
-        sub_815C9F4();
-
-    gUnknown_203F454 = Alloc(sizeof(*gUnknown_203F454));
-    if (gUnknown_203F454 == NULL)
-        return FALSE;
-
-    gUnknown_203F454->array = Alloc(sizeof(struct UnkStruct2) * count);
-    if (gUnknown_203F454->array == NULL)
-    {
-        Free(gUnknown_203F454);
-        return FALSE;
-    }
-
-    gUnknown_203F454->count = count;
-    for (i = 0; i < count; i++)
-    {
-        gUnknown_203F454->array[i].isActive = FALSE;
-        gUnknown_203F454->array[i].firstOamId = 0xFF;
-    }
-
-    return TRUE;
-}
-
-void sub_815C9F4(void)
-{
-    if (gUnknown_203F454 != NULL)
-    {
-        if (gUnknown_203F454->array != NULL)
-        {
-            u32 i;
-
-            for (i = 0; i < gUnknown_203F454->count; i++)
-                sub_815D108(i);
-
-            Free(gUnknown_203F454->array);
-        }
-
-        FREE_AND_SET_NULL(gUnknown_203F454);
-    }
-}
-
-bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2)
-{
-    u32 i;
-
-    if (gUnknown_203F454 == NULL)
-        return FALSE;
-    if (gUnknown_203F454->array[id].isActive)
-        return FALSE;
-
-    gUnknown_203F454->array[id].firstOamId = sub_815D244(arg2->field_1);
-    if (gUnknown_203F454->array[id].firstOamId == 0xFF)
-        return FALSE;
-
-    gUnknown_203F454->array[id].tileStart = GetSpriteTileStartByTag(arg2->spriteSheet->tag);
-    if (gUnknown_203F454->array[id].tileStart == 0xFFFF)
-    {
-        if (arg2->spriteSheet->size != 0)
-        {
-            gUnknown_203F454->array[id].tileStart = LoadSpriteSheet(arg2->spriteSheet);
-        }
-        else
-        {
-            struct CompressedSpriteSheet compObjectPic;
-
-            compObjectPic = *(struct CompressedSpriteSheet*)(arg2->spriteSheet);
-            compObjectPic.size = GetDecompressedDataSize(arg2->spriteSheet->data);
-            gUnknown_203F454->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic);
-        }
-
-        if (gUnknown_203F454->array[id].tileStart == 0xFFFF)
-            return FALSE;
-    }
-
-    gUnknown_203F454->array[id].palTagIndex = IndexOfSpritePaletteTag(arg2->spritePal->tag);
-    if (gUnknown_203F454->array[id].palTagIndex == 0xFF)
-        gUnknown_203F454->array[id].palTagIndex = LoadSpritePalette(arg2->spritePal);
-
-    gUnknown_203F454->array[id].field_2 = arg2->field_0_0;
-    gUnknown_203F454->array[id].oamCount = arg2->field_1;
-    gUnknown_203F454->array[id].x = arg2->x;
-    gUnknown_203F454->array[id].y = arg2->y;
-    gUnknown_203F454->array[id].shape = arg2->shape;
-    gUnknown_203F454->array[id].size = arg2->size;
-    gUnknown_203F454->array[id].priority = arg2->priority;
-    gUnknown_203F454->array[id].xDelta = arg2->xDelta;
-    gUnknown_203F454->array[id].field_9 = sub_815D324(arg2->shape, arg2->size);
-    gUnknown_203F454->array[id].tileTag = arg2->spriteSheet->tag;
-    gUnknown_203F454->array[id].palTag = arg2->spritePal->tag;
-    gUnknown_203F454->array[id].isActive = TRUE;
-    gUnknown_203F454->array[id].field_14 = 1;
-
-    for (i = 1; i < arg2->field_1; i++)
-        gUnknown_203F454->array[id].field_14 *= 10;
-
-    sub_815CC28(&gUnknown_203F454->array[id]);
-    sub_815CD70(id, arg1);
-
-    return TRUE;
-}
-
-static void sub_815CC28(struct UnkStruct2 *arg0)
-{
-    u32 i;
-    u32 oamId = arg0->firstOamId;
-    u32 x = arg0->x;
-    u32 oamCount = arg0->oamCount + 1;
-
-    CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
-    for (i = 0, oamId = arg0->firstOamId; i < oamCount; i++, oamId++)
-    {
-        gMain.oamBuffer[oamId].y = arg0->y;
-        gMain.oamBuffer[oamId].x = x;
-        gMain.oamBuffer[oamId].shape = arg0->shape;
-        gMain.oamBuffer[oamId].size = arg0->size;
-        gMain.oamBuffer[oamId].tileNum = arg0->tileStart;
-        gMain.oamBuffer[oamId].priority = arg0->priority;
-        gMain.oamBuffer[oamId].paletteNum = arg0->palTagIndex;
-
-        x += arg0->xDelta;
-    }
-
-    oamId--;
-    gMain.oamBuffer[oamId].x = arg0->x - arg0->xDelta;
-    gMain.oamBuffer[oamId].affineMode = 2;
-    gMain.oamBuffer[oamId].tileNum = arg0->tileStart + (arg0->field_9 * 10);
-}
-
-void sub_815CD70(u32 id, s32 arg1)
-{
-    bool32 r2;
-
-    if (gUnknown_203F454 == NULL)
-        return;
-    if (!gUnknown_203F454->array[id].isActive)
-        return;
-
-    gUnknown_203F454->array[id].field_18 = arg1;
-    if (arg1 < 0)
-    {
-        r2 = TRUE;
-        arg1 *= -1;
-    }
-    else
-    {
-        r2 = FALSE;
-    }
-
-    switch (gUnknown_203F454->array[id].field_2)
-    {
-    case 0:
-    default:
-        sub_815CDDC(&gUnknown_203F454->array[id], arg1, r2);
-        break;
-    case 1:
-        sub_815CE90(&gUnknown_203F454->array[id], arg1, r2);
-        break;
-    case 2:
-        sub_815CFEC(&gUnknown_203F454->array[id], arg1, r2);
-        break;
-    }
-}
-
-static void sub_815CDDC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    u32 oamId = arg0->firstOamId;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-        oamId++;
-    }
-
-    if (arg2)
-        gMain.oamBuffer[oamId].affineMode = 0;
-    else
-        gMain.oamBuffer[oamId].affineMode = 2;
-}
-
-static void sub_815CE90(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    static int gUnknown_3002078;
-    static int gUnknown_300207C;
-    static int gUnknown_3002080;
-
-    gUnknown_3002078 = arg0->firstOamId;
-    gUnknown_300207C = 0;
-    gUnknown_3002080 = -1;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        if (r4 != 0 || gUnknown_3002080 != -1 || r5 == 0)
-        {
-            gMain.oamBuffer[gUnknown_3002078].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[gUnknown_3002078].affineMode = 0;
-
-            if (gUnknown_3002080 == -1)
-                gUnknown_3002080 = gUnknown_300207C;
-        }
-        else
-        {
-            gMain.oamBuffer[gUnknown_3002078].affineMode = 2;
-        }
-
-        gUnknown_3002078++;
-        gUnknown_300207C++;
-    }
-
-    if (arg2)
-    {
-        gMain.oamBuffer[gUnknown_3002078].affineMode = 0;
-        gMain.oamBuffer[gUnknown_3002078].x = arg0->x + ((gUnknown_3002080 - 1) * arg0->xDelta);
-    }
-    else
-    {
-        gMain.oamBuffer[gUnknown_3002078].affineMode = 2;
-    }
-}
-
-static void sub_815CFEC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    u32 oamId = arg0->firstOamId;
-    u32 var_28 = 0;
-    s32 r9 = 0;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        if (r4 != 0 || var_28 != 0 || r5 == 0)
-        {
-            var_28 = 1;
-            gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[oamId].affineMode = 0;
-
-            oamId++;
-            r9++;
-        }
-    }
-
-    while (r9 < arg0->oamCount)
-    {
-        gMain.oamBuffer[oamId].affineMode = 2;
-        oamId++;
-        r9++;
-    }
-
-    if (arg2)
-        gMain.oamBuffer[oamId].affineMode = 0;
-    else
-        gMain.oamBuffer[oamId].affineMode = 2;
-}
-
-void sub_815D108(u32 id)
-{
-    s32 oamId, oamCount, i;
-
-    if (gUnknown_203F454 == NULL)
-        return;
-    if (!gUnknown_203F454->array[id].isActive)
-        return;
-
-    oamCount = gUnknown_203F454->array[id].oamCount + 1;
-    oamId = gUnknown_203F454->array[id].firstOamId;
-
-    for (i = 0; i < oamCount; i++, oamId++)
-        gMain.oamBuffer[oamId].affineMode = 2;
-
-    if (!SharesTileWithAnyActive(id))
-        FreeSpriteTilesByTag(gUnknown_203F454->array[id].tileTag);
-    if (!SharesPalWithAnyActive(id))
-        FreeSpritePaletteByTag(gUnknown_203F454->array[id].palTag);
-
-    gUnknown_203F454->array[id].isActive = FALSE;
-}
-
-void sub_815D1A8(u32 id, bool32 arg1)
-{
-    s32 oamId, oamCount, i;
-
-    if (gUnknown_203F454 == NULL)
-        return;
-    if (!gUnknown_203F454->array[id].isActive)
-        return;
-
-    oamCount = gUnknown_203F454->array[id].oamCount + 1;
-    oamId = gUnknown_203F454->array[id].firstOamId;
-    if (arg1)
-    {
-        for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = 2;
-    }
-    else
-    {
-        for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = 0;
-
-        sub_815CD70(id, gUnknown_203F454->array[id].field_18);
-    }
-}
-
-static u8 sub_815D244(u8 arg0)
-{
-    u32 i;
-    u16 oamCount = 64;
-
-    for (i = 0; i < gUnknown_203F454->count; i++)
-    {
-        if (!gUnknown_203F454->array[i].isActive)
-        {
-            if (gUnknown_203F454->array[i].firstOamId != 0xFF && gUnknown_203F454->array[i].oamCount <= arg0)
-                return gUnknown_203F454->array[i].firstOamId;
-        }
-        else
-        {
-            oamCount += 1 + gUnknown_203F454->array[i].oamCount;
-        }
-    }
-
-    if (oamCount + arg0 + 1 > 128)
-        return 0xFF;
-    else
-        return oamCount;
-}
-
-static bool32 SharesTileWithAnyActive(u32 id)
-{
-    u32 i;
-
-    for (i = 0; i < gUnknown_203F454->count; i++)
-    {
-        if (gUnknown_203F454->array[i].isActive && i != id
-            && gUnknown_203F454->array[i].tileTag == gUnknown_203F454->array[id].tileTag)
-        {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-static bool32 SharesPalWithAnyActive(u32 id)
-{
-    u32 i;
-
-    for (i = 0; i < gUnknown_203F454->count; i++)
-    {
-        if (gUnknown_203F454->array[i].isActive && i != id
-            && gUnknown_203F454->array[i].palTag == gUnknown_203F454->array[id].palTag)
-        {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-static u8 sub_815D324(u32 shape, u32 size)
-{
-    return gUnknown_8479658[shape][size];
-}
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index b35b6143e..9c9a4d67f 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -22,7 +22,6 @@
 #include "field_player_avatar.h"
 #include "event_object_80688E4.h"
 #include "event_object_8097404.h"
-#include "unk_810c3a4.h"
 #include "vs_seeker.h"
 #include "constants/movement_commands.h"
 #include "constants/object_events.h"
@@ -598,7 +597,7 @@ static void sub_810C3B8(u8 taskId)
         {
             if (sub_810CF04(i) == TRUE)
             {
-                if (gObjectEvents[i].mapobj_bit_1)
+                if (gObjectEvents[i].singleMovementActive)
                     return;
                 FreezeObjectEvent(&gObjectEvents[i]);
             }
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index 9be2823aa..7267d4ace 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -13,40 +13,32 @@
 #include "dynamic_placeholder_text_util.h"
 #include "overworld.h"
 #include "sound.h"
+#include "strings.h"
 #include "menu.h"
 #include "librfu.h"
 #include "link_rfu.h"
 #include "union_room.h"
 #include "constants/songs.h"
+#include "constants/union_room.h"
 
 struct WirelessCommunicationStatusScreenStruct
 {
-    u32 field_00[4];
-    u32 field_10[4];
-    u32 field_20[16];
-    u8 field_60;
-    u8 field_61;
+    u32 counts[4];
+    u32 lastCounts[4];
+    u32 activities[16];
+    u8 taskId;
+    u8 rfuTaskId;
     u8 filler_62[0xA];
 };
 
-struct WirelessCommunicationStatusScreenStruct * gUnknown_3002040;
+static struct WirelessCommunicationStatusScreenStruct * sWCSS;
 
-extern const u8 gUnknown_841E2B4[];
-extern const u8 gUnknown_841E2BF[];
-extern const u8 gUnknown_841E2C9[];
-extern const u8 gUnknown_841E2D4[];
-extern const u8 gUnknown_841E245[];
-extern const u8 gUnknown_841E263[];
-extern const u8 gUnknown_841E273[];
-extern const u8 gUnknown_841E284[];
-extern const u8 gUnknown_841E29E[];
+static void CB2_InitWirelessCommunicationScreen(void);
+static void Task_WirelessCommunicationScreen(u8 taskId);
+static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx);
+static bool32 UpdateCommunicationCounts(u32 * counts, u32 * lastCounts, u32 * activities, u8 taskId);
 
-void sub_814F1E4(void);
-void sub_814F46C(u8 taskId);
-void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx);
-bool32 sub_814F7E4(u32 * a0, u32 * a1, u32 * a2, u8 taskId);
-
-const u16 gUnknown_846F4D0[][16] = {
+static const u16 sWCSS_Palettes[][16] = {
     INCBIN_U16("graphics/misc/unk_846f4d0.gbapal"),
     INCBIN_U16("graphics/misc/unk_846f4f0.gbapal"),
     INCBIN_U16("graphics/misc/unk_846f510.gbapal"),
@@ -65,10 +57,10 @@ const u16 gUnknown_846F4D0[][16] = {
     INCBIN_U16("graphics/misc/unk_846f6b0.gbapal")
 };
 
-const u32 gUnknown_846F6D0[] = INCBIN_U32("graphics/misc/unk_846f6d0.4bpp.lz");
-const u16 gUnknown_846F8E0[] = INCBIN_U16("graphics/misc/unk_846f8e0.bin");
+static const u32 sBgTilesGfx[] = INCBIN_U32("graphics/misc/unk_846f6d0.4bpp.lz");
+static const u16 sBgTilemap[] = INCBIN_U16("graphics/misc/unk_846f8e0.bin");
 
-const struct BgTemplate gUnknown_846FA74[] = {
+static const struct BgTemplate sBGTemplates[] = {
     {
         .bg = 0,
         .charBaseIndex = 2,
@@ -88,7 +80,7 @@ const struct BgTemplate gUnknown_846FA74[] = {
     }
 };
 
-const struct WindowTemplate gUnknown_846FA7C[] = {
+static const struct WindowTemplate sWindowTemplates[] = {
     {
         .bg = 0x00,
         .tilemapLeft = 0x03,
@@ -116,47 +108,51 @@ const struct WindowTemplate gUnknown_846FA7C[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-const u8 *const gUnknown_846FA9C[] = {
+static const u8 *const gUnknown_846FA9C[] = {
     gUnknown_841E2B4,
     gUnknown_841E2BF,
     gUnknown_841E2C9,
     gUnknown_841E2D4
 };
-const u8 *const gUnknown_846FAAC[] = {
-    gUnknown_841E245,
-    gUnknown_841E263,
-    gUnknown_841E273,
-    gUnknown_841E284,
-    gUnknown_841E29E
+
+static const u8 *const sHeaderTextPtrs[] = {
+    gText_WirelessCommunicationStatus,
+    gText_PeopleTrading,
+    gText_PeopleBattling,
+    gText_PeopleInUnionRoom,
+    gText_PeopleCommunicating
 };
 
-const u8 gUnknown_846FAC0[][3] = {
-    {0x01, 0x01, 0x02},
-    {0x02, 0x01, 0x02},
-    {0x03, 0x01, 0x04},
-    {0x04, 0x00, 0x02},
-    {0x15, 0x03, 0x02},
-    {0x16, 0x03, 0x02},
-    {0x09, 0x04, 0x00},
-    {0x0a, 0x04, 0x00},
-    {0x0b, 0x04, 0x00},
-    {0x0c, 0xff, 0x00},
-    {0x0d, 0x00, 0x00},
-    {0x0e, 0xff, 0x00},
-    {0x0f, 0x04, 0x00},
-    {0x10, 0xff, 0x00},
-    {0x40, 0x02, 0x01},
-    {0x41, 0x02, 0x02},
-    {0x44, 0x02, 0x02},
-    {0x45, 0x02, 0x00},
-    {0x48, 0x02, 0x02},
-    {0x54, 0x02, 0x01},
-    {0x53, 0x02, 0x02},
-    {0x51, 0x02, 0x01},
-    {0x52, 0x02, 0x01}
+static const u8 sCountParams[][3] = {
+    // activity,         count idx, by
+    // by=0 means count all
+    // UB: no check for count idx == -1
+    {ACTIVITY_BATTLE,            1, 2},
+    {ACTIVITY_DBLBATTLE,         1, 2},
+    {ACTIVITY_MLTBATTLE,         1, 4},
+    {ACTIVITY_TRADE,             0, 2},
+    {ACTIVITY_WCARD2,            3, 2},
+    {ACTIVITY_WNEWS2,            3, 2},
+    {ACTIVITY_PJUMP,             4, 0},
+    {ACTIVITY_BCRUSH,            4, 0},
+    {ACTIVITY_BPICK,             4, 0},
+    {ACTIVITY_SEARCH,           -1, 0},
+    {ACTIVITY_SPINTRADE,         0, 0},
+    {ACTIVITY_ITEMTRADE,        -1, 0},
+    {0x0f,                       4, 0},
+    {0x10,                      -1, 0},
+    {0x40,                       2, 1},
+    {ACTIVITY_BATTLE | 0x40,     2, 2},
+    {ACTIVITY_TRADE | 0x40,      2, 2},
+    {ACTIVITY_CHAT | 0x40,       2, 0},
+    {ACTIVITY_CARD | 0x40,       2, 2},
+    {20 | 0x40,                  2, 1},
+    {19 | 0x40,                  2, 2},
+    {ACTIVITY_ACCEPT | 0x40,     2, 1},
+    {ACTIVITY_DECLINE | 0x40,    2, 1}
 };
 
-void sub_814F19C(void)
+static void CB2_RunWirelessCommunicationScreen(void)
 {
     if (!IsDma3ManagerBusyWithBgCopy())
     {
@@ -168,50 +164,50 @@ void sub_814F19C(void)
     }
 }
 
-void sub_814F1C0(void)
+static void VBlankCB_WirelessCommunicationScreen(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_814F1D4(void)
+void Special_WirelessCommunicationScreen(void)
 {
-    SetMainCallback2(sub_814F1E4);
+    SetMainCallback2(CB2_InitWirelessCommunicationScreen);
 }
 
-void sub_814F1E4(void)
+static void CB2_InitWirelessCommunicationScreen(void)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
-    gUnknown_3002040 = AllocZeroed(sizeof(*gUnknown_3002040));
+    sWCSS = AllocZeroed(sizeof(*sWCSS));
     SetVBlankCallback(NULL);
-    ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_846FA74, NELEMS(gUnknown_846FA74));
+    ResetBgsAndClearDma3BusyFlags(FALSE);
+    InitBgsFromTemplates(0, sBGTemplates, NELEMS(sBGTemplates));
     SetBgTilemapBuffer(1, Alloc(0x800));
     SetBgTilemapBuffer(0, Alloc(0x800));
-    DecompressAndLoadBgGfxUsingHeap(1, gUnknown_846F6D0, 0, 0, 0);
-    CopyToBgTilemapBuffer(1, gUnknown_846F8E0, 0, 0);
-    InitWindows(gUnknown_846FA7C);
+    DecompressAndLoadBgGfxUsingHeap(1, sBgTilesGfx, 0, 0, 0);
+    CopyToBgTilemapBuffer(1, sBgTilemap, 0, 0);
+    InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
     ResetPaletteFade();
     ResetSpriteData();
     ResetTasks();
     ScanlineEffect_Stop();
     m4aSoundVSyncOn();
-    SetVBlankCallback(sub_814F1C0);
-    gUnknown_3002040->field_60 = CreateTask(sub_814F46C, 0);
-    gUnknown_3002040->field_61 = sub_8116DE0();
-    gUnknown_3002040->field_10[3] = 1;
+    SetVBlankCallback(VBlankCB_WirelessCommunicationScreen);
+    sWCSS->taskId = CreateTask(Task_WirelessCommunicationScreen, 0);
+    sWCSS->rfuTaskId = CreateTask_ListenToWireless();
+    sWCSS->lastCounts[3] = 1;
     ChangeBgX(0, 0, 0);
     ChangeBgY(0, 0, 0);
     ChangeBgX(1, 0, 0);
     ChangeBgY(1, 0, 0);
-    LoadPalette(gUnknown_846F4D0, 0, 0x20);
+    LoadPalette(sWCSS_Palettes, 0, 0x20);
     Menu_LoadStdPalAt(0xf0);
     DynamicPlaceholderTextUtil_Reset();
     FillBgTilemapBufferRect(0, 0x000, 0, 0, 32, 32, 0xF);
     CopyBgTilemapBufferToVram(1);
-    SetMainCallback2(sub_814F19C);
+    SetMainCallback2(CB2_RunWirelessCommunicationScreen);
     RunTasks();
     RunTextPrinters();
     AnimateSprites();
@@ -219,7 +215,7 @@ void sub_814F1E4(void)
     UpdatePaletteFade();
 }
 
-void sub_814F32C(void)
+static void ExitWirelessCommunicationStatusScreen(void)
 {
     s32 i;
 
@@ -228,55 +224,55 @@ void sub_814F32C(void)
     {
         Free(GetBgTilemapBuffer(i));
     }
-    Free(gUnknown_3002040);
+    Free(sWCSS);
     SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
-void sub_814F364(s16 * unk0, s16 * unk1)
+static void WCSS_CyclePalette(s16 * frameCtr_p, s16 * palIdx_p)
 {
     s32 idx;
-    (*unk0)++;
-    if (*unk0 > 5)
+    (*frameCtr_p)++;
+    if (*frameCtr_p > 5)
     {
-        (*unk1)++;
-        if (*unk1 == 14)
+        (*palIdx_p)++;
+        if (*palIdx_p == 14)
         {
-            *unk1 = 0;
+            *palIdx_p = 0;
         }
-        *unk0 = 0;
+        *frameCtr_p = 0;
     }
-    idx = *unk1 + 2;
-    LoadPalette(gUnknown_846F4D0[idx], 0, 16);
+    idx = *palIdx_p + 2;
+    LoadPalette(sWCSS_Palettes[idx], 0, 16);
 }
 
-void sub_814F3A8(void)
+static void PrintHeaderTexts(void)
 {
     s32 i;
     u32 width;
 
-    FillWindowPixelBuffer(0, 0);
-    FillWindowPixelBuffer(1, 0);
-    FillWindowPixelBuffer(2, 0);
-    width = 0xC0 - GetStringWidth(3, gUnknown_846FAAC[0], 0);
-    sub_814F65C(0, 3, gUnknown_846FAAC[0], width / 2, 6, 3);
+    FillWindowPixelBuffer(0, PIXEL_FILL(0));
+    FillWindowPixelBuffer(1, PIXEL_FILL(0));
+    FillWindowPixelBuffer(2, PIXEL_FILL(0));
+    width = 0xC0 - GetStringWidth(3, sHeaderTextPtrs[0], 0);
+    WCSS_AddTextPrinterParameterized(0, 3, sHeaderTextPtrs[0], width / 2, 6, 3);
     for (i = 0; i < 3; i++)
     {
-        sub_814F65C(1, 3, gUnknown_846FAAC[i + 1], 0, 30 * i + 10, 1);
+        WCSS_AddTextPrinterParameterized(1, 3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 1);
     }
-    sub_814F65C(1, 3, gUnknown_846FAAC[i + 1], 0, 30 * i + 10, 2);
+    WCSS_AddTextPrinterParameterized(1, 3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 2);
     PutWindowTilemap(0);
     CopyWindowToVram(0, 2);
     PutWindowTilemap(1);
     CopyWindowToVram(1, 2);
 }
 
-void sub_814F46C(u8 taskId)
+static void Task_WirelessCommunicationScreen(u8 taskId)
 {
     s32 i;
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        sub_814F3A8();
+        PrintHeaderTexts();
         gTasks[taskId].data[0]++;
         break;
     case 1:
@@ -291,16 +287,16 @@ void sub_814F46C(u8 taskId)
             gTasks[taskId].data[0]++;
         break;
     case 3:
-        if (sub_814F7E4(gUnknown_3002040->field_00, gUnknown_3002040->field_10, gUnknown_3002040->field_20, gUnknown_3002040->field_61))
+        if (UpdateCommunicationCounts(sWCSS->counts, sWCSS->lastCounts, sWCSS->activities, sWCSS->rfuTaskId))
         {
-            FillWindowPixelBuffer(2, 0x00);
+            FillWindowPixelBuffer(2, PIXEL_FILL(0));
             for (i = 0; i < 4; i++)
             {
-                ConvertIntToDecimalStringN(gStringVar4, gUnknown_3002040->field_00[i], STR_CONV_MODE_RIGHT_ALIGN, 2);
+                ConvertIntToDecimalStringN(gStringVar4, sWCSS->counts[i], STR_CONV_MODE_RIGHT_ALIGN, 2);
                 if (i != 3)
-                    sub_814F65C(2, 3, gStringVar4, 4, 30 * i + 10, 1);
+                    WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 30 * i + 10, 1);
                 else
-                    sub_814F65C(2, 3, gStringVar4, 4, 100, 2);
+                    WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 100, 2);
             }
             PutWindowTilemap(2);
             CopyWindowToVram(2, 3);
@@ -308,10 +304,10 @@ void sub_814F46C(u8 taskId)
         if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
         {
             PlaySE(SE_SELECT);
-            gTasks[gUnknown_3002040->field_61].data[15] = 0xFF;
+            gTasks[sWCSS->rfuTaskId].data[15] = 0xFF;
             gTasks[taskId].data[0]++;
         }
-        sub_814F364(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
+        WCSS_CyclePalette(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
         break;
     case 4:
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
@@ -320,117 +316,117 @@ void sub_814F46C(u8 taskId)
     case 5:
         if (!gPaletteFade.active)
         {
-            SetMainCallback2(sub_814F32C);
+            SetMainCallback2(ExitWirelessCommunicationStatusScreen);
             DestroyTask(taskId);
         }
         break;
     }
 }
 
-void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx)
+static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx)
 {
     u8 textColor[3];
     switch (palIdx)
     {
     case 0:
-        textColor[0] = 0;
-        textColor[1] = 2;
-        textColor[2] = 3;
+        textColor[0] = TEXT_COLOR_TRANSPARENT;
+        textColor[1] = TEXT_COLOR_DARK_GREY;
+        textColor[2] = TEXT_COLOR_LIGHT_GREY;
         break;
     case 1:
-        textColor[0] = 0;
-        textColor[1] = 1;
-        textColor[2] = 3;
+        textColor[0] = TEXT_COLOR_TRANSPARENT;
+        textColor[1] = TEXT_COLOR_WHITE;
+        textColor[2] = TEXT_COLOR_LIGHT_GREY;
         break;
     case 2:
-        textColor[0] = 0;
-        textColor[1] = 4;
-        textColor[2] = 5;
+        textColor[0] = TEXT_COLOR_TRANSPARENT;
+        textColor[1] = TEXT_COLOR_RED;
+        textColor[2] = TEXT_COLOR_LIGHT_RED;
         break;
     case 3:
-        textColor[0] = 0;
-        textColor[1] = 7;
-        textColor[2] = 6;
+        textColor[0] = TEXT_COLOR_TRANSPARENT;
+        textColor[1] = TEXT_COLOR_LIGHT_GREEN;
+        textColor[2] = TEXT_COLOR_GREEN;
         break;
     case 4:
-        textColor[0] = 0;
-        textColor[1] = 1;
-        textColor[2] = 2;
+        textColor[0] = TEXT_COLOR_TRANSPARENT;
+        textColor[1] = TEXT_COLOR_WHITE;
+        textColor[2] = TEXT_COLOR_DARK_GREY;
         break;
     // default: UB
     }
     AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, textColor, -1, str);
 }
 
-u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1)
+static u32 CountMembersInGroup(struct UnkStruct_x20 * unk20, u32 * counts)
 {
-    u32 r8 = unk20->unk.gname.unk_0a_0;
+    u32 activity = unk20->gname_uname.gname.activity;
     s32 i, j, k;
 
-    for (i = 0; i < NELEMS(gUnknown_846FAC0); i++)
+    for (i = 0; i < NELEMS(sCountParams); i++)
     {
-        if (r8 == gUnknown_846FAC0[i][0] && unk20->field_1A_0 == 1)
+        if (activity == sCountParams[i][0] && unk20->groupScheduledAnim == UNION_ROOM_SPAWN_IN)
         {
-            if (gUnknown_846FAC0[i][2] == 0)
+            if (sCountParams[i][2] == 0)
             {
                 k = 0;
-                for (j = 0; j < 4; j++)
+                for (j = 0; j < RFU_CHILD_MAX; j++)
                 {
-                    if (unk20->unk.gname.unk_04[j] != 0) k++;
+                    if (unk20->gname_uname.gname.child_sprite_gender[j] != 0) k++;
                 }
                 k++;
-                arg1[gUnknown_846FAC0[i][1]] += k;
+                counts[sCountParams[i][1]] += k;
             }
             else
             {
-                arg1[gUnknown_846FAC0[i][1]] += gUnknown_846FAC0[i][2];
+                counts[sCountParams[i][1]] += sCountParams[i][2];
             }
         }
     }
 
-    return r8;
+    return activity;
 }
 
-bool32 sub_814F7BC(const u32 * ptr0, const u32 * ptr1)
+static bool32 HaveCountsChanged(const u32 * newCounts, const u32 * prevCounts)
 {
     s32 i;
 
     for (i = 0; i < 4; i++)
     {
-        if (ptr0[i] != ptr1[i])
+        if (newCounts[i] != prevCounts[i])
             return TRUE;
     }
 
     return FALSE;
 }
 
-bool32 sub_814F7E4(u32 * a0, u32 * a1, u32 * a2, u8 taskId)
+static bool32 UpdateCommunicationCounts(u32 * counts, u32 * lastCounts, u32 * activities, u8 taskId)
 {
-    bool32 r8 = FALSE;
-    u32 sp0[4] = {0, 0, 0, 0};
+    bool32 activitiesUpdated = FALSE;
+    u32 buffer[4] = {0, 0, 0, 0};
     struct UnkStruct_Group * group = (void *)gTasks[taskId].data;
     s32 i;
 
     for (i = 0; i < 16; i++)
     {
-        u32 r1 = sub_814F714(&group->field_0->arr[i], sp0);
-        if (r1 != a2[i])
+        u32 activity = CountMembersInGroup(&group->field_0->arr[i], buffer);
+        if (activity != activities[i])
         {
-            a2[i] = r1;
-            r8 = TRUE;
+            activities[i] = activity;
+            activitiesUpdated = TRUE;
         }
     }
 
-    if (sub_814F7BC(sp0, a1) == FALSE)
+    if (HaveCountsChanged(buffer, lastCounts) == FALSE)
     {
-        if (r8 == TRUE)
+        if (activitiesUpdated == TRUE)
             return TRUE;
         else
             return FALSE;
     }
 
-    memcpy(a0, sp0, sizeof(sp0));
-    memcpy(a1, sp0, sizeof(sp0));
-    a0[3] = a0[0] + a0[1] + a0[2];
+    memcpy(counts, buffer, sizeof(buffer));
+    memcpy(lastCounts, buffer, sizeof(buffer));
+    counts[3] = counts[0] + counts[1] + counts[2];
     return TRUE;
 }
diff --git a/sym_bss.txt b/sym_bss.txt
index 5651e3366..ec3d7d947 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -86,9 +86,10 @@ gUnknown_3002030: @ 3002030
 gUnknown_3002038: @ 3002038
 	.space 0x8
 
-gUnknown_3002040: @ 3002040
-	.space 0x4
+	.align 2
+	.include "src/wireless_communication_status_screen.o"
 
+	.align 2
 gUnknown_3002044: @ 3002044
 	.space 0x4
 
@@ -96,14 +97,15 @@ gUnknown_3002044: @ 3002044
 	.include "src/ereader_helpers.o"
 
 	.align 3
-	.include "src/unk_815C980.o"
+	.include "src/digit_obj_util.o"
 
 	.align 3
 	.include "asm/m4a_1.o"
+	.align 3
 	.include "src/agb_flash.o"
-
-	.space 0x4 @ This isn't needed for Ruby/Sapphire or Emerald.
-
+	.align 3
 	.include "*libgcc.a:dp-bit.o"
+	.align 3
 	.include "*libgcc.a:fp-bit.o"
+	.align 3
 	.include "*libc.a:syscalls.o"
diff --git a/sym_common.txt b/sym_common.txt
index d71df5ce2..e729f5515 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -91,7 +91,7 @@ gUnknown_3005078: @ 3005078
 	.align 4
 	.include "link_rfu_2.o"
 	.align 4
-	.include "link_rfu.o"
+	.include "AgbRfu_LinkManager.o"
 	.align 4
 	.include "list_menu.o"
 	.align 2
diff --git a/sym_ewram.txt b/sym_ewram.txt
index b9b7063d0..32229ac11 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -443,7 +443,9 @@ gUnknown_203B170: @ 203B170
 	.align 2
 	.include "src/mevent_server.o"
 	.align 2
-	.include "src/mevent_8145654.o"
+	.include "src/mevent_show_card.o"
+	.align 2
+	.include "src/mevent_show_news.o"
 	.align 2
 	.include "src/seagallop.o"
 
@@ -481,7 +483,7 @@ gUnknown_203F440: @ 203F440
 	.align 2
 	.include "src/teachy_tv.o"
 	.align 2
-	.include "src/unk_815C980.o"
+	.include "src/digit_obj_util.o"
 	.align 2
 	.include "src/trainer_tower.o"
 	.align 2
diff --git a/tileset_rules.mk b/tileset_rules.mk
index 7e994e24f..f20a6dca3 100644
--- a/tileset_rules.mk
+++ b/tileset_rules.mk
@@ -1,202 +1,202 @@
 TILESETGFXDIR := data/tilesets
 
-$(TILESETGFXDIR)/primary/82D4BB4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 640
 
-$(TILESETGFXDIR)/primary/82D4A94/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/primary/general/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 640
 
-$(TILESETGFXDIR)/secondary/82D4AAC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pallet_town/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 76
 
-$(TILESETGFXDIR)/secondary/82D4B0C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/lavender_town/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4B6C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cinnabar_island/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 128
 
-$(TILESETGFXDIR)/secondary/82D4BE4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 376
 
-$(TILESETGFXDIR)/secondary/82D4C44/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cable_club/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 632
 
-$(TILESETGFXDIR)/secondary/82D4CA4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fuchsia_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 92
 
-$(TILESETGFXDIR)/secondary/82D4D04/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pewter_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 207
 
-$(TILESETGFXDIR)/secondary/82D4D64/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/saffron_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 82
 
-$(TILESETGFXDIR)/secondary/82D4DC4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 101
 
-$(TILESETGFXDIR)/secondary/82D4E24/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 318
 
-$(TILESETGFXDIR)/secondary/82D4E84/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/generic_building2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 152
 
-$(TILESETGFXDIR)/secondary/82D4EE4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 50
 
-$(TILESETGFXDIR)/secondary/82D4F44/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/restaurant_hotel/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 76
 
-$(TILESETGFXDIR)/secondary/82D4FA4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/burgled_house/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 172
 
-$(TILESETGFXDIR)/secondary/82D5004/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/berry_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 101
 
-$(TILESETGFXDIR)/secondary/82D5064/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_45/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50C4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_league/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 340
 
-$(TILESETGFXDIR)/secondary/82D4AC4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 112
 
-$(TILESETGFXDIR)/secondary/82D4B24/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/vermilion_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 140
 
-$(TILESETGFXDIR)/secondary/82D4B84/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/indigo_plateau/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 247
 
-$(TILESETGFXDIR)/secondary/82D4BFC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4C5C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/bike_shop/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 60
 
-$(TILESETGFXDIR)/secondary/82D4CBC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 90
 
-$(TILESETGFXDIR)/secondary/82D4D1C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 119
 
-$(TILESETGFXDIR)/secondary/82D4D7C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 146
 
-$(TILESETGFXDIR)/secondary/82D4DDC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/unused_gatehouse1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 144
 
-$(TILESETGFXDIR)/secondary/82D4E3C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/unused_gatehouse2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 144
 
-$(TILESETGFXDIR)/secondary/82D4E9C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 80
 
-$(TILESETGFXDIR)/secondary/82D4EFC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 128
 
-$(TILESETGFXDIR)/secondary/82D4F5C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 50
 
-$(TILESETGFXDIR)/secondary/82D4FBC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy3/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D501C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 282
 
-$(TILESETGFXDIR)/secondary/82D507C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_67/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50DC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/hall_of_fame/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 208
 
-$(TILESETGFXDIR)/secondary/82D4ADC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pewter_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 280
 
-$(TILESETGFXDIR)/secondary/82D4B3C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 244
 
-$(TILESETGFXDIR)/secondary/82D4B9C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 262
 
-$(TILESETGFXDIR)/secondary/82D4C14/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D4C74/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/generic_building1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
-$(TILESETGFXDIR)/secondary/82D4CD4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 383
 
-$(TILESETGFXDIR)/secondary/82D4D34/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/vermilion_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 247
 
-$(TILESETGFXDIR)/secondary/82D4D94/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/ss_anne/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 245
 
-$(TILESETGFXDIR)/secondary/82D4DF4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/rock_tunnel/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4E54/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 246
 
-$(TILESETGFXDIR)/secondary/82D4EB4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sea_cottage/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 68
 
-$(TILESETGFXDIR)/secondary/82D4F14/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 90
 
-$(TILESETGFXDIR)/secondary/82D4F74/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 85
 
-$(TILESETGFXDIR)/secondary/82D4FD4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy4/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D5034/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 74
 
-$(TILESETGFXDIR)/secondary/82D5094/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/trainer_tower/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 343
 
-$(TILESETGFXDIR)/secondary/82D4AF4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 158
 
-$(TILESETGFXDIR)/secondary/82D4B54/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fuchsia_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 191
 
-$(TILESETGFXDIR)/secondary/82D4BCC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/mart/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 36
 
-$(TILESETGFXDIR)/secondary/82D4C2C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/museum/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 137
 
-$(TILESETGFXDIR)/secondary/82D4C8C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 102
 
-$(TILESETGFXDIR)/secondary/82D4CEC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 171
 
-$(TILESETGFXDIR)/secondary/82D4D4C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 103
 
-$(TILESETGFXDIR)/secondary/82D4DAC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D4E0C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 248
 
-$(TILESETGFXDIR)/secondary/82D4E6C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/department_store/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 201
 
-$(TILESETGFXDIR)/secondary/82D4F2C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 350
 
-$(TILESETGFXDIR)/secondary/82D4F8C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/condominiums/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 384
 
-$(TILESETGFXDIR)/secondary/82D4FEC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/mt_ember/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 288
 
-$(TILESETGFXDIR)/secondary/82D504C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_123/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50AC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 165