Merge branch 'master' into doc-ttower

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

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

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
+	thumb_func_start StartBerryCrush
-sub_814B754: @ 814B754
+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

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

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

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

asm/dodrio_berry_picking.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_81507FC
+	thumb_func_start StartDodrioBerryPicking
-sub_81507FC: @ 81507FC
+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

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

asm/easy_chat_2.s

@@ -334,8 +334,8 @@ sub_80FEE24: @ 80FEE24
 	bx r0
 	thumb_func_end sub_80FEE24
 
-	thumb_func_start sub_80FEE44
+	thumb_func_start ShowEasyChatScreen
-sub_80FEE44: @ 80FEE44
+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

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

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

asm/field_screen_effect.s

@@ -1,306 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_807F3A4
-sub_807F3A4: @ 807F3A4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x14
-	mov r8, r1
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 24
-	lsrs r2, 24
-	mov r10, r2
-	lsls r3, 24
-	lsrs r3, 24
-	mov r9, r3
-	ldr r2, _0807F3DC @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-	ldrb r7, [r4, 0xA]
-	movs r0, 0xC
-	ldrsh r6, [r4, r0]
-	cmp r6, 0
-	beq _0807F3E0
-	cmp r6, 0x1
-	beq _0807F430
-	b _0807F448
-	.align 2, 0
-_0807F3DC: .4byte gTasks
-_0807F3E0:
-	adds r0, r7, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	ldr r5, _0807F424 @ =gStringVar4
-	adds r0, r5, 0
-	mov r1, r8
-	bl StringExpandPlaceholders
-	movs r0, 0x1
-	mov r8, r0
-	str r0, [sp]
-	str r6, [sp, 0x4]
-	ldr r0, _0807F428 @ =gUnknown_83C68EC
-	str r0, [sp, 0x8]
-	mov r0, r8
-	str r0, [sp, 0xC]
-	str r5, [sp, 0x10]
-	adds r0, r7, 0
-	movs r1, 0x2
-	mov r2, r10
-	mov r3, r9
-	bl AddTextPrinterParameterized4
-	ldr r2, _0807F42C @ =gTextFlags
-	ldrb r1, [r2]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-	mov r0, r8
-	strh r0, [r4, 0xC]
-	b _0807F448
-	.align 2, 0
-_0807F424: .4byte gStringVar4
-_0807F428: .4byte gUnknown_83C68EC
-_0807F42C: .4byte gTextFlags
-_0807F430:
-	bl RunTextPrinters
-	adds r0, r7, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	bne _0807F448
-	strh r0, [r4, 0xC]
-	movs r0, 0x1
-	b _0807F44A
-_0807F448:
-	movs r0, 0
-_0807F44A:
-	add sp, 0x14
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_807F3A4
-
-	thumb_func_start sub_807F45C
-sub_807F45C: @ 807F45C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r1, _0807F484 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0x8
-	ldrsh r0, [r0, r2]
-	adds r2, r1, 0
-	cmp r0, 0x6
-	bls _0807F478
-	b _0807F5E4
-_0807F478:
-	lsls r0, 2
-	ldr r1, _0807F488 @ =_0807F48C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0807F484: .4byte gTasks
-_0807F488: .4byte _0807F48C
-	.align 2, 0
-_0807F48C:
-	.4byte _0807F4A8
-	.4byte _0807F538
-	.4byte _0807F588
-	.4byte _0807F5B6
-	.4byte _0807F540
-	.4byte _0807F588
-	.4byte _0807F5D0
-_0807F4A8:
-	ldr r0, _0807F518 @ =gUnknown_83C68E4
-	bl AddWindow
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _0807F51C @ =gTasks
-	lsls r4, r6, 2
-	adds r0, r4, r6
-	lsls r0, 3
-	adds r7, r0, r1
-	strh r5, [r7, 0xA]
-	movs r0, 0xF0
-	bl Menu_LoadStdPalAt
-	adds r0, r5, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r0, r5, 0
-	bl PutWindowTilemap
-	adds r0, r5, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	movs r0, 0x1
-	bl GetHealLocationPointer
-	adds r3, r0, 0
-	ldr r0, _0807F520 @ =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldrh r0, [r2, 0x1C]
-	ldrh r5, [r3]
-	cmp r0, r5
-	bne _0807F524
-	movs r1, 0x1E
-	ldrsb r1, [r2, r1]
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	bne _0807F524
-	movs r0, 0x20
-	ldrsh r1, [r2, r0]
-	movs r5, 0x2
-	ldrsh r0, [r3, r5]
-	cmp r1, r0
-	bne _0807F524
-	movs r0, 0x22
-	ldrsh r1, [r2, r0]
-	movs r2, 0x4
-	ldrsh r0, [r3, r2]
-	cmp r1, r0
-	bne _0807F524
-	movs r0, 0x4
-	strh r0, [r7, 0x8]
-	b _0807F5E4
-	.align 2, 0
-_0807F518: .4byte gUnknown_83C68E4
-_0807F51C: .4byte gTasks
-_0807F520: .4byte gSaveBlock1Ptr
-_0807F524:
-	ldr r0, _0807F534 @ =gTasks
-	adds r1, r4, r6
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x1
-	strh r0, [r1, 0x8]
-	b _0807F5E4
-	.align 2, 0
-_0807F534: .4byte gTasks
-_0807F538:
-	ldr r1, _0807F53C @ =gUnknown_841B554
-	b _0807F542
-	.align 2, 0
-_0807F53C: .4byte gUnknown_841B554
-_0807F540:
-	ldr r1, _0807F578 @ =gUnknown_841B5B6
-_0807F542:
-	adds r0, r6, 0
-	movs r2, 0x2
-	movs r3, 0x8
-	bl sub_807F3A4
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807F5E4
-	ldr r0, _0807F57C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0807F580 @ =gObjectEvents
-	adds r0, r1
-	movs r1, 0x2
-	bl ObjectEventTurn
-	ldr r1, _0807F584 @ =gTasks
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	b _0807F5E4
-	.align 2, 0
-_0807F578: .4byte gUnknown_841B5B6
-_0807F57C: .4byte gPlayerAvatar
-_0807F580: .4byte gObjectEvents
-_0807F584: .4byte gTasks
-_0807F588:
-	lsls r4, r6, 2
-	adds r4, r6
-	lsls r4, 3
-	adds r4, r2
-	ldrb r5, [r4, 0xA]
-	adds r0, r5, 0
-	bl ClearWindowTilemap
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl CopyWindowToVram
-	adds r0, r5, 0
-	bl RemoveWindow
-	bl palette_bg_faded_fill_black
-	bl sub_807DC00
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _0807F5E4
-_0807F5B6:
-	bl sub_807E418
-	cmp r0, 0x1
-	bne _0807F5E4
-	adds r0, r6, 0
-	bl DestroyTask
-	ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal
-	bl ScriptContext1_SetupScript
-	b _0807F5E4
-	.align 2, 0
-_0807F5CC: .4byte EventScript_AfterWhiteOutHeal
-_0807F5D0:
-	bl sub_807E418
-	cmp r0, 0x1
-	bne _0807F5E4
-	adds r0, r6, 0
-	bl DestroyTask
-	ldr r0, _0807F5EC @ =EventScript_MomHeal
-	bl ScriptContext1_SetupScript
-_0807F5E4:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807F5EC: .4byte EventScript_MomHeal
-	thumb_func_end sub_807F45C
-
-	thumb_func_start sub_807F5F0
-sub_807F5F0: @ 807F5F0
-	push {lr}
-	bl ScriptContext2_Enable
-	bl palette_bg_faded_fill_black
-	ldr r0, _0807F618 @ =sub_807F45C
-	movs r1, 0xA
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _0807F61C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0x8]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807F618: .4byte sub_807F45C
-_0807F61C: .4byte gTasks
-	thumb_func_end sub_807F5F0
-
-	.align 2, 0 @ Don't pad with nop.

asm/librfu_intr.s

@@ -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

asm/macros/event.inc

@@ -652,7 +652,7 @@
 			.4byte \pointer2 @ text
 			.4byte \pointer3 @ text
 			.4byte \pointer4 @ event script
-		.elseif \type == TRAINER_BATTLE_TUTORIAL
+		.elseif \type == TRAINER_BATTLE_EARLY_RIVAL
 			.4byte \pointer1 @ text
 			.4byte \pointer2 @ text
 		.endif
@@ -699,9 +699,9 @@
 	trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text
 	.endm
 
-	@
+	@ Starts a trainer battle with victory text if the player loses. If flags is nonzero, the player will be healed after battle (and its assumed to be the tutorial battle)
-	.macro trainerbattle_tutorial trainer:req, unk:req, intro_text:req, lose_text:req
+	.macro trainerbattle_earlyrival trainer:req, flags:req, defeat_text:req, victory_text:req
-	trainerbattle TRAINER_BATTLE_TUTORIAL, \trainer, \unk, \intro_text, \lose_text
+	trainerbattle TRAINER_BATTLE_EARLY_RIVAL, \trainer, \flags, \defeat_text, \victory_text
 	.endm
 
 	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.

asm/overworld.s

@@ -2247,7 +2247,7 @@ _08055CEC: .4byte gSaveBlock1Ptr
 _08055CF0:
 	ldr r0, _08055D00 @ =gSaveBlock1Ptr
 	ldr r0, [r0]
-	ldr r1, _08055D04 @ =gUnknown_83C68E0
+	ldr r1, _08055D04 @ =gMaxFlashLevel
 	ldr r1, [r1]
 _08055CF8:
 	adds r0, 0x30
@@ -2257,7 +2257,7 @@ _08055CFA:
 	bx r0
 	.align 2, 0
 _08055D00: .4byte gSaveBlock1Ptr
-_08055D04: .4byte gUnknown_83C68E0
+_08055D04: .4byte gMaxFlashLevel
 	thumb_func_end sub_8055CB8
 
 	thumb_func_start Overworld_SetFlashLevel
@@ -2266,7 +2266,7 @@ Overworld_SetFlashLevel: @ 8055D08
 	adds r1, r0, 0
 	cmp r1, 0
 	blt _08055D18
-	ldr r0, _08055D28 @ =gUnknown_83C68E0
+	ldr r0, _08055D28 @ =gMaxFlashLevel
 	ldr r0, [r0]
 	cmp r1, r0
 	ble _08055D1A
@@ -2280,7 +2280,7 @@ _08055D1A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08055D28: .4byte gUnknown_83C68E0
+_08055D28: .4byte gMaxFlashLevel
 _08055D2C: .4byte gSaveBlock1Ptr
 	thumb_func_end Overworld_SetFlashLevel
 
@@ -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
+	thumb_func_start IsMapTypeIndoors
-is_light_level_8_or_9: @ 805621C
+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
+	thumb_func_start GetSavedWarpRegionMapSectionId
-sav1_saved_warp2_map_get_name: @ 8056238
+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
+	thumb_func_start GetCurrentMapBattleScene
-sav1_map_get_battletype: @ 8056288
+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
+	thumb_func_start InitOverworldBgs
-sub_80562B0: @ 80562B0
+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
+	thumb_func_start SetMainCallback1
-sub_80565E0: @ 80565E0
+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
+	thumb_func_start CB2_ReturnToFieldCableClub
-sub_8056788: @ 8056788
+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,7 +3836,7 @@ _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
@@ -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
+	thumb_func_start FieldClearVBlankHBlankCallbacks
-sub_80569BC: @ 80569BC
+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
+	thumb_func_start map_loading_iteration_3
-sub_8056A5C: @ 8056A5C
+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 InitOverworldBgs
-	bl sub_80569BC
+	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 InitOverworldBgs
-	bl sub_80569BC
+	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 InitOverworldBgs
-	bl sub_80569BC
+	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
@@ -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

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

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

asm/pokemon_jump_2.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8147AA8
+	thumb_func_start StartPokemonJump
-sub_8147AA8: @ 8147AA8
+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

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:

asm/smokescreen.s

@@ -1,225 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start SmokescreenImpact
-SmokescreenImpact: @ 804A76C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 16
-	lsrs r6, r0, 16
-	lsls r1, 16
-	lsrs r7, r1, 16
-	lsls r2, 24
-	lsrs r4, r2, 24
-	ldr r5, _0804A8A4 @ =gUnknown_825098C
-	ldrh r0, [r5, 0x6]
-	bl GetSpriteTileStartByTag
-	lsls r0, 16
-	ldr r1, _0804A8A8 @ =0xffff0000
-	cmp r0, r1
-	bne _0804A79E
-	adds r0, r5, 0
-	bl LoadCompressedSpriteSheetUsingHeap
-	ldr r0, _0804A8AC @ =gUnknown_8250994
-	bl LoadCompressedSpritePaletteUsingHeap
-_0804A79E:
-	ldr r0, _0804A8B0 @ =sub_804A8C0
-	bl CreateInvisibleSpriteWithCallback
-	mov r8, r0
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r5, r0, 4
-	add r5, r8
-	lsls r5, 2
-	ldr r0, _0804A8B4 @ =gSprites
-	adds r5, r0
-	strh r4, [r5, 0x30]
-	ldr r0, _0804A8B8 @ =gUnknown_82509F4
-	mov r9, r0
-	lsls r6, 16
-	asrs r0, r6, 16
-	mov r10, r0
-	ldr r0, _0804A8BC @ =0xfff00000
-	adds r6, r0
-	asrs r6, 16
-	lsls r4, r7, 16
-	asrs r7, r4, 16
-	adds r4, r0
-	asrs r4, 16
-	mov r0, r9
-	adds r1, r6, 0
-	adds r2, r4, 0
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _0804A8B4 @ =gSprites
-	adds r1, r0
-	mov r0, r8
-	strh r0, [r1, 0x2E]
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r1, 0
-	bl AnimateSprite
-	mov r0, r9
-	mov r1, r10
-	adds r2, r4, 0
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _0804A8B4 @ =gSprites
-	adds r4, r0
-	mov r0, r8
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-	adds r0, r4, 0
-	bl AnimateSprite
-	mov r0, r9
-	adds r1, r6, 0
-	adds r2, r7, 0
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _0804A8B4 @ =gSprites
-	adds r4, r0
-	mov r0, r8
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl StartSpriteAnim
-	adds r0, r4, 0
-	bl AnimateSprite
-	mov r0, r9
-	mov r1, r10
-	adds r2, r7, 0
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _0804A8B4 @ =gSprites
-	adds r4, r0
-	mov r0, r8
-	strh r0, [r4, 0x2E]
-	ldrh r0, [r5, 0x2E]
-	adds r0, 0x1
-	strh r0, [r5, 0x2E]
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl StartSpriteAnim
-	adds r0, r4, 0
-	bl AnimateSprite
-	mov r0, r8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804A8A4: .4byte gUnknown_825098C
-_0804A8A8: .4byte 0xffff0000
-_0804A8AC: .4byte gUnknown_8250994
-_0804A8B0: .4byte sub_804A8C0
-_0804A8B4: .4byte gSprites
-_0804A8B8: .4byte gUnknown_82509F4
-_0804A8BC: .4byte 0xfff00000
-	thumb_func_end SmokescreenImpact
-
-	thumb_func_start sub_804A8C0
-sub_804A8C0: @ 804A8C0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0804A8F8
-	ldr r0, _0804A8EC @ =gUnknown_825098C
-	ldrh r0, [r0, 0x6]
-	bl FreeSpriteTilesByTag
-	ldr r0, _0804A8F0 @ =gUnknown_8250994
-	ldrh r0, [r0, 0x4]
-	bl FreeSpritePaletteByTag
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0804A8F4
-	adds r0, r4, 0
-	bl DestroySprite
-	b _0804A8F8
-	.align 2, 0
-_0804A8EC: .4byte gUnknown_825098C
-_0804A8F0: .4byte gUnknown_8250994
-_0804A8F4:
-	ldr r0, _0804A900 @ =SpriteCallbackDummy
-	str r0, [r4, 0x1C]
-_0804A8F8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A900: .4byte SpriteCallbackDummy
-	thumb_func_end sub_804A8C0
-
-	thumb_func_start sub_804A904
-sub_804A904: @ 804A904
-	push {lr}
-	adds r3, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _0804A92E
-	ldr r2, _0804A934 @ =gSprites
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrh r1, [r0, 0x2E]
-	subs r1, 0x1
-	strh r1, [r0, 0x2E]
-	adds r0, r3, 0
-	bl DestroySprite
-_0804A92E:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804A934: .4byte gSprites
-	thumb_func_end sub_804A904
-
-	.align 2, 0 @ Don't pad with nop.

common_syms/AgbRfu_LinkManager.txt

@@ -0,0 +1 @@
+lman

common_syms/help_system_812B1E0.txt

@@ -1,2 +1,2 @@
-gUnknown_3005E9C
+sHelpSystemState
 gSomeVariableBackup

common_syms/link.txt

@@ -10,11 +10,11 @@ gFiller_3003EC0
 gLinkHeldKeys
 gRecvCmds
 gLinkStatus
-gUnknown_3003F24
+gLinkAllAcked5FFF
 gUnknown_3003F28
-gUnknown_3003F2C
+gLinkCommand2FFEAck
-gUnknown_3003F30
+gLinkCommand5FFFAck
-gUnknown_3003F34
+gLinkCmd5FFFparam
 gSuppressLinkErrorMessage
 gWirelessCommType
 gSavedLinkPlayerCount

common_syms/link_rfu.txt

@@ -1 +0,0 @@
-gUnknown_3005E10

common_syms/mevent.txt

@@ -1 +1 @@
-gUnknown_3005ED0
+sMEventSendToEReaderManager

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
+gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
-	.byte 9, 2, 8
+	@ 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
+	.2byte 0x9c, 0x00 @ x, y
-	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
-	.4byte gUnknown_846F320 + 0x10
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
-	.byte 8, 2, 8
+	@ 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
+	.2byte 0xb4, 0x00 @ x, y
-	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
-	.4byte gUnknown_846F320 + 0x10
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
-	.byte 8, 2, 8
+	@ 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
+	.2byte 0xcc, 0x00 @ x, y
-	.4byte gUnknown_846F2F8 + 0x18
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
-	.4byte gUnknown_846F320 + 0x10
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
 
 gUnknown_846F4B8:: @ 846F4B8
 	.4byte gUnknown_841D034

data/data_8479668.s

@@ -75,64 +75,64 @@ gUnknown_847AA8F::
 gUnknown_847AAA8::
 	.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
 
-gUnknown_847AAC1::
+gText_UnionRoomChatKeyboard_ABCDE::
 	.string "ABCDE$"
 
-gUnknown_847AAC7::
+gText_UnionRoomChatKeyboard_FGHIJ::
 	.string "FGHIJ$"
 
-gUnknown_847AACD::
+gText_UnionRoomChatKeyboard_KLMNO::
 	.string "KLMNO$"
 
-gUnknown_847AAD3::
+gText_UnionRoomChatKeyboard_PQRST::
 	.string "PQRST$"
 
-gUnknown_847AAD9::
+gText_UnionRoomChatKeyboard_UVWXY::
 	.string "UVWXY$"
 
-gUnknown_847AADF::
+gText_UnionRoomChatKeyboard_Z::
 	.string "Z    $"
 
-gUnknown_847AAE5::
+gText_UnionRoomChatKeyboard_01234Upper::
 	.string "01234$"
 
-gUnknown_847AAEB::
+gText_UnionRoomChatKeyboard_56789Upper::
 	.string "56789$"
 
-gUnknown_847AAF1::
+gText_UnionRoomChatKeyboard_PunctuationUpper::
 	.string ".,!? $"
 
-gUnknown_847AAF7::
+gText_UnionRoomChatKeyboard_SymbolsUpper::
 	.string "-/&… $"
 
-gUnknown_847AAFD::
+gText_UnionRoomChatKeyboard_abcde::
 	.string "abcde$"
 
-gUnknown_847AB03::
+gText_UnionRoomChatKeyboard_fghij::
 	.string "fghij$"
 
-gUnknown_847AB09::
+gText_UnionRoomChatKeyboard_klmno::
 	.string "klmno$"
 
-gUnknown_847AB0F::
+gText_UnionRoomChatKeyboard_pqrst::
 	.string "pqrst$"
 
-gUnknown_847AB15::
+gText_UnionRoomChatKeyboard_uvwxy::
 	.string "uvwxy$"
 
-gUnknown_847AB1B::
+gText_UnionRoomChatKeyboard_z::
 	.string "z    $"
 
-gUnknown_847AB21::
+gText_UnionRoomChatKeyboard_01234Lower::
 	.string "01234$"
 
-gUnknown_847AB27::
+gText_UnionRoomChatKeyboard_56789Lower::
 	.string "56789$"
 
-gUnknown_847AB2D::
+gText_UnionRoomChatKeyboard_PunctuationLower::
 	.string ".,!? $"
 
-gUnknown_847AB33::
+gText_UnionRoomChatKeyboard_SymbolsLower::
 	.string "-/&… $"
 
 	.string "$"
@@ -144,82 +144,40 @@ gUnknown_847AB33::
 	.string "$"
 	.string "$"
 
-gUnknown_847AB41::
+gText_UnionRoomChatKeyboard_Emoji1::
 	.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
 
-gUnknown_847AB4C::
+gText_UnionRoomChatKeyboard_Emoji2::
 	.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
 
-gUnknown_847AB57::
+gText_UnionRoomChatKeyboard_Emoji3::
 	.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
 
-gUnknown_847AB62::
+gText_UnionRoomChatKeyboard_Emoji4::
 	.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
 
-gUnknown_847AB6B::
+gText_UnionRoomChatKeyboard_Emoji5::
 	.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
 
-gUnknown_847AB76::
+gText_UnionRoomChatKeyboard_Emoji6::
 	.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
 
-gUnknown_847AB81::
+gText_UnionRoomChatKeyboard_Emoji7::
 	.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
 
-gUnknown_847AB8C::
+gText_UnionRoomChatKeyboard_Emoji8::
 	.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
 
-gUnknown_847AB97::
+gText_UnionRoomChatKeyboard_Emoji9::
 	.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
 
-gUnknown_847ABA2::
+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

data/event_object_80688E4.s

@@ -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"

data/event_scripts.s

@@ -31,6 +31,7 @@
 #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
@@ -638,6 +639,8 @@ gStdScriptsEnd::
 	.include "data/maps/Route18/text.inc"
 	.include "data/maps/Route19/text.inc"
 	.include "data/maps/Route20/text.inc"
+	.include "data/maps/Route21_North/text.inc"
+	.include "data/maps/Route21_South/text.inc"
 	.include "data/maps/Route22/text.inc"
 	.include "data/maps/Route23/text.inc"
 	.include "data/maps/Route24/text.inc"
@@ -690,6 +693,7 @@ gStdScriptsEnd::
 	.include "data/maps/VermilionCity_House1/text.inc"
 	.include "data/maps/VermilionCity_PokemonCenter_1F/text.inc"
 	.include "data/maps/VermilionCity_PokemonFanClub/text.inc"
+	.include "data/maps/VermilionCity_House2/text.inc"
 	.include "data/maps/VermilionCity_Mart/text.inc"
 	.include "data/maps/VermilionCity_Gym/text.inc"
 	.include "data/maps/VermilionCity_House3/text.inc"
@@ -941,23 +945,7 @@ Text_DugUpItemFromGround:: @ 81A5700
 	.string "from deep in the ground.$"
 
 	.include "data/text/route23.inc"
-
+	.include "data/text/aide.inc"
-Text_1A58A7:: @ 81A58A7
-	.string "Let's see…\n"
-	.string "Uh-oh! You have caught only\l"
-	.string "{STR_VAR_3} kinds of POKéMON!\p"
-	.string "You need {STR_VAR_1} kinds\n"
-	.string "if you want the {STR_VAR_2}.$"
-
-Text_1A5909:: @ 81A5909
-	.string "…Oh. I see.\p"
-	.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
-	.string "come back for the {STR_VAR_2}.$"
-
-Text_1A594D:: @ 81A594D
-	.string "Oh! I see you don't have any\n"
-	.string "room for the {STR_VAR_2}.$"
-
 	.include "data/text/ingame_trade.inc"
 
 Text_CardKeyOpenedDoor:: @ 81A5B88
@@ -1077,13 +1065,7 @@ Text_FoundTMHMContainsMove:: @ 81A63E8
 	.string "{PLAYER} found a {STR_VAR_2}!\n"
 	.string "It contains {STR_VAR_1}.$"
 
-Text_1A6407:: @ 81A6407
+	.include "data/text/seagallop.inc"
-	.string "おつかれさん！\n"
-	.string "どこに　いきたいんだ？$"
-
-Text_1A641B:: @ 81A641B
-	.string "All right!\n"
-	.string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"
 
 @ Call for legendary bird trio
 Text_Gyaoo:: @ 81A6448
@@ -1189,10 +1171,9 @@ EventScript_ResetEliteFour:: @ 81A6551
 	.include "data/scripts/obtain_item.inc"
 	.include "data/scripts/pc.inc"
 
-@ DoEasyChatScreen?
+Common_ShowEasyChatScreen:: @ 81A6AC0
-EventScript_1A6AC0:: @ 81A6AC0
 	fadescreen FADE_TO_BLACK
-	special sub_80FEE44
+	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
@@ -1352,8 +1333,8 @@ gUnknown_81A7702:: @ 81A7702
 	msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1A778A
-	setvar VAR_0x8004, 14
+	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
-	call EventScript_1A6AC0
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1431,20 +1412,7 @@ EventScript_GetElevatorFloor:: @ 81A7AB9
 	special Special_GetElevatorFloor
 	return
 
-EventScript_1A7ABD:: @ 81A7ABD
+	.include "data/scripts/aide.inc"
-	msgbox Text_1A58A7
-	release
-	end
-
-EventScript_1A7AC7:: @ 81A7AC7
-	msgbox Text_1A594D
-	release
-	end
-
-EventScript_1A7AD1:: @ 81A7AD1
-	msgbox Text_1A5909
-	release
-	end
 
 gUnknown_81A7ADB:: @ 81A7ADB
 	special sub_80CADC4
@@ -1526,21 +1494,21 @@ Common_EventScript_DirectCornerAttendant:: @ 81A8D02
 	call CableClub_EventScript_DirectCornerAttendant
 	end
 
-VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
+VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F
+	goto_if_set FLAG_GOT_VS_SEEKER, VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker
-	msgbox Text_194234
+	msgbox VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain
 	setflag FLAG_GOT_VS_SEEKER
 	giveitem ITEM_VS_SEEKER
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
-	msgbox Text_19430F
+	msgbox VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches
 	release
 	end
 
-EventScript_1A8D3F:: @ 81A8D3F
+VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F
-	msgbox Text_194381
+	msgbox VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker
 	release
 	end
 

data/field_screen_effect.s

@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83C68E0:: @ 83C68E0
-	.4byte 4
-
-gUnknown_83C68E4:: @ 83C68E4
-	.byte 0, 0, 5, 30, 11, 15
-	.2byte 0x001
-
-gUnknown_83C68EC:: @ 83C68EC
-	.byte 0, 1, 2

data/graphics.s

@@ -16374,16 +16374,16 @@ gFameCheckerBg3Tilemap:: @ 8EA0700
 gFameCheckerBg2Tilemap:: @ 8EA0F00
 	.incbin "data/graphics/fame_checker_tilemap2.bin"
 
-gUnknown_8EA1700:: @ 8EA1700
+gLinkMiscMenu_Pal:: @ 8EA1700
 	.incbin "graphics/interface/union_room_chat.gbapal"
 
-gUnknown_8EA1720:: @ 8EA1720
+gLinkMiscMenu_Gfx:: @ 8EA1720
 	.incbin "graphics/interface/union_room_chat.4bpp.lz"
 
-gUnknown_8EA1958:: @ 8EA1958
+gLinkMiscMenu_Tilemap:: @ 8EA1958
 	.incbin "graphics/interface/union_room_chat.bin.lz"
 
-gUnknown_8EA1A50:: @ 8EA1A50
+gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
@@ -16508,13 +16508,13 @@ gTilesetPalettes_8EA9D88:: @ 8EA9D88
 gTilesetTiles_8EA9F88:: @ 8EA9F88
 	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
 
-gUnknown_8EAA9F0:: @ 8EAA9F0
+gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
 
-gUnknown_8EAAA10:: @ 8EAAA10
+gUnionRoomChatPanelBgTiles:: @ 8EAAA10
 	.incbin "graphics/interface/union_room_chat_panel.4bpp.lz"
 
-gUnknown_8EAAA6C:: @ 8EAAA6C
+gUnionRoomChatPanelBgMap:: @ 8EAAA6C
 	.incbin "graphics/interface/union_room_chat_panel.bin.lz"
 
 gCreditsMonBackdropPals:: @ 8EAAB18

data/maps/CinnabarIsland/scripts.inc

@@ -213,7 +213,7 @@ CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6
 	setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
 	setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
 	setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
 
 CinnabarIsland_EventScript_ApproachShore:: @ 8167142

data/maps/FiveIsland_Harbor/scripts.inc

@@ -7,5 +7,5 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end

data/maps/FourIsland_Harbor/scripts.inc

@@ -7,5 +7,5 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND
-	goto EventScript_1A900F
+	goto EventScript_ChooseDestFromIsland
 	end

data/maps/LavenderTown_Mart/text.inc

@@ -18,3 +18,8 @@ LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1
     .string "If that happens, you have to send\n"
     .string "out two POKéMON to battle, too.$"
 
+LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: @ 8193E82
+    .string "この　あいだ　やまおくで\n"
+    .string "きんのたまを　ひろい　ましてね！\p"
+    .string "つかえない　しなもの　ですが\n"
+    .string "うったら　なんと　5000¥でした$"

data/maps/OneIsland_Harbor/scripts.inc

@@ -38,5 +38,5 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD
 	message Text_WhereDoYouWantToSail
 	waitmessage
 	setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
-	goto EventScript_1A8EC5
+	goto EventScript_ChooseDestFromOneIsland
 	end

data/maps/OneIsland_PokemonCenter_1F/scripts.inc

@@ -503,7 +503,7 @@ EventScript_1711DA:: @ 81711DA
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3
 	setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND
 	setvar VAR_0x8006, SEAGALLOP_CINNABAR_ISLAND
-	goto EventScript_1A90DA
+	goto EventScript_SetSail
 	end
 
 EventScript_1712E4:: @ 81712E4

data/maps/PalletTown_ProfessorOaksLab/scripts.inc

@@ -346,7 +346,7 @@ EventScript_16939C:: @ 816939C
 	end
 
 EventScript_1693AC:: @ 81693AC
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 
@@ -402,7 +402,7 @@ EventScript_169414:: @ 8169414
 	end
 
 EventScript_169424:: @ 8169424
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 
@@ -461,7 +461,7 @@ EventScript_16948F:: @ 816948F
 	end
 
 EventScript_16949F:: @ 816949F
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 

data/maps/PalletTown_ProfessorOaksLab/text.inc

@@ -36,7 +36,8 @@ Text_18DDEA:: @ 818DDEA
     .string "Unbelievable!\l"
     .string "I picked the wrong POKéMON!$"
 
-Text_18DE1A:: @ 818DE1A
+@ Also used for early Route 22 battle
+Text_RivalVictory:: @ 818DE1A
     .string "{RIVAL}: Yeah!\n"
     .string "Am I great or what?$"
 

data/maps/Route1/map.json

@@ -34,7 +34,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route1_EventScript_167EFE",
+      "script": "Route1_EventScript_MartClerk",
       "flag": "0"
     },
     {
@@ -47,7 +47,7 @@
       "movement_range_y": 3,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route1_EventScript_167F52",
+      "script": "Route1_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "x": 9,
       "y": 31,
       "elevation": 0,
-      "script": "Route1_EventScript_167F5B"
+      "script": "Route1_EventScript_RouteSign"
     }
   ]
 }

data/maps/Route1/scripts.inc

@@ -1,11 +1,11 @@
 Route1_MapScripts:: @ 8167EFD
 	.byte 0
 
-Route1_EventScript_167EFE:: @ 8167EFE
+Route1_EventScript_MartClerk:: @ 8167EFE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48
+	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
-	msgbox gUnknown_818329D
+	msgbox Route1_Text_WorkAtPokeMartTakeSample
 	textcolor 3
 	checkitemspace ITEM_POTION, 1
 	compare VAR_RESULT, FALSE
@@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE
 	waitmessage
 	waitfanfare
 	additem ITEM_POTION
-	msgbox gUnknown_8183387
+	msgbox Route1_Text_PutPotionAway
 	call EventScript_1A6675
 	setflag FLAG_GOT_POTION_ON_ROUTE_1
 	release
 	end
 
-EventScript_167F48:: @ 8167F48
+Route1_EventScript_AlreadyGotPotion:: @ 8167F48
-	msgbox gUnknown_8183347
+	msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls
 	release
 	end
 
-Route1_EventScript_167F52:: @ 8167F52
+Route1_EventScript_Boy:: @ 8167F52
-	msgbox gUnknown_81833B9, MSGBOX_NPC
+	msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC
 	end
 
-Route1_EventScript_167F5B:: @ 8167F5B
+Route1_EventScript_RouteSign:: @ 8167F5B
-	msgbox gUnknown_818343A, MSGBOX_SIGN
+	msgbox Route1_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/Route1/text.inc

@@ -1,4 +1,4 @@
-gUnknown_818329D:: @ 818329D
+Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
     .string "Hi!\n"
     .string "I work at a POKéMON MART.\p"
     .string "It's part of a convenient chain\n"
@@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D
     .string "I know, I'll give you a sample.\n"
     .string "Here you go!$"
 
-gUnknown_8183347:: @ 8183347
+Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347
     .string "Please come see us if you need\n"
     .string "POKé BALLS for catching POKéMON.$"
 
-gUnknown_8183387:: @ 8183387
+Route1_Text_PutPotionAway:: @ 8183387
     .string "{PLAYER} put the POTION away in\n"
     .string "the BAG's ITEMS POCKET.$"
 
-gUnknown_81833B9:: @ 81833B9
+Route1_Text_CanJumpFromLedges:: @ 81833B9
     .string "See those ledges along the road?\p"
     .string "It's a bit scary, but you can jump\n"
     .string "from them.\p"
     .string "You can get back to PALLET TOWN\n"
     .string "quicker that way.$"
 
-gUnknown_818343A:: @ 818343A
+Route1_Text_RouteSign:: @ 818343A
     .string "ROUTE 1\n"
     .string "PALLET TOWN - VIRIDIAN CITY$"
 

data/maps/Route10_PokemonCenter_1F/scripts.inc

@@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
 	goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
 	msgbox gUnknown_819E5FB, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_16FCF1
 	compare VAR_0x8006, 20
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819E733
 	checkitemspace ITEM_EVERSTONE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
 	setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
 	msgbox gUnknown_819E7AF

data/maps/Route11_EastEntrance_2F/scripts.inc

@@ -61,17 +61,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
 	goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A
 	msgbox gUnknown_819E9E5, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_16FE64
 	compare VAR_0x8006, 30
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819EAE4
 	checkitemspace ITEM_ITEMFINDER, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
 	setflag FLAG_GOT_ITEMFINDER
 	msgbox gUnknown_819EB59

data/maps/Route15_WestEntrance_2F/scripts.inc

@@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
 	goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
 	msgbox gUnknown_819F5AB, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_170145
 	compare VAR_0x8006, 50
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819F6AA
 	checkitemspace ITEM_EXP_SHARE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
 	setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
 	msgbox gUnknown_819F71F

data/maps/Route16_NorthEntrance_2F/scripts.inc

@@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
 	goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
 	msgbox gUnknown_819FB0E, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_17036F
 	compare VAR_0x8006, 40
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819FC15
 	checkitemspace ITEM_AMULET_COIN, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
 	setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
 	msgbox gUnknown_819FC93

data/maps/Route2/map.json

@@ -195,14 +195,14 @@
       "x": 14,
       "y": 12,
       "elevation": 0,
-      "script": "Route2_EventScript_167F6E"
+      "script": "Route2_EventScript_DiglettsCaveSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 73,
       "elevation": 0,
-      "script": "Route2_EventScript_167F65"
+      "script": "Route2_EventScript_RouteSign"
     }
   ]
 }

data/maps/Route2/scripts.inc

@@ -1,10 +1,10 @@
 Route2_MapScripts:: @ 8167F64
 	.byte 0
 
-Route2_EventScript_167F65:: @ 8167F65
+Route2_EventScript_RouteSign:: @ 8167F65
-	msgbox gUnknown_818345E, MSGBOX_SIGN
+	msgbox Route2_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route2_EventScript_167F6E:: @ 8167F6E
+Route2_EventScript_DiglettsCaveSign:: @ 8167F6E
-	msgbox gUnknown_8183482, MSGBOX_SIGN
+	msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN
 	end

data/maps/Route2/text.inc

@@ -1,7 +1,7 @@
-gUnknown_818345E:: @ 818345E
+Route2_Text_RouteSign:: @ 818345E
     .string "ROUTE 2\n"
     .string "VIRIDIAN CITY - PEWTER CITY$"
 
-gUnknown_8183482:: @ 8183482
+Route2_Text_DiglettsCave:: @ 8183482
     .string "DIGLETT'S CAVE$"
 

data/maps/Route21_North/text.inc

@@ -0,0 +1,48 @@
+Text_1882E1:: @ 81882E1
+	.string "Strong TRAINERS and WATER POKéMON\n"
+	.string "are common sights in these parts.\p"
+	.string "They say that MISTY of the\n"
+	.string "CERULEAN GYM trains here.$"
+
+Text_18835A:: @ 818835A
+	.string "You want to know if the fish are\n"
+	.string "biting?$"
+
+Text_188383:: @ 8188383
+	.string "Dang!$"
+
+Text_188389:: @ 8188389
+	.string "I can't catch anything good.\n"
+	.string "Not one good POKéMON to be had!$"
+
+Text_1883C6:: @ 81883C6
+	.string "I got a big haul!\n"
+	.string "Wanna go for it?$"
+
+Text_1883E9:: @ 81883E9
+	.string "Heheh, MAGIKARP just don't make\n"
+	.string "the grade, do they?$"
+
+Text_18841D:: @ 818841D
+	.string "I seem to only catch MAGIKARP!$"
+
+Text_18843C:: @ 818843C
+	.string "The sea cleanses my body and soul!$"
+
+Text_18845F:: @ 818845F
+	.string "Ayah!$"
+
+Text_188465:: @ 8188465
+	.string "The sea is great and all, but I\n"
+	.string "like the mountains, too.$"
+
+Text_18849E:: @ 818849E
+	.string "おれだって　たまには\n"
+	.string "およぎに　くるぜ！$"
+
+Text_1884B3:: @ 81884B3
+	.string "ぐわわ！$"
+
+Text_1884B8:: @ 81884B8
+	.string "うきやすそう　だと？\n"
+	.string "うるせー　おおきな　おせわだッ！$"

data/maps/Route21_South/text.inc

@@ -0,0 +1,87 @@
+Text_1884D4:: @ 81884D4
+	.string "I caught my POKéMON at sea.$"
+
+Text_1884F0:: @ 81884F0
+	.string "Diver!!\n"
+	.string "Down!!$"
+
+Text_1884FF:: @ 81884FF
+	.string "Where'd you catch your POKéMON?$"
+
+Text_18851F:: @ 818851F
+	.string "Right now, I'm in a triathlon meet.$"
+
+Text_188543:: @ 8188543
+	.string "Pant…\n"
+	.string "Pant… Pant…$"
+
+Text_188555:: @ 8188555
+	.string "I'm beat! But, I still have the\n"
+	.string "bike race and marathon left!$"
+
+Text_188592:: @ 8188592
+	.string "Ahh!\n"
+	.string "Feel the sun and the wind!$"
+
+Text_1885B2:: @ 81885B2
+	.string "Yow!\n"
+	.string "I lost!$"
+
+Text_1885BF:: @ 81885BF
+	.string "I'm sunburnt to a crisp!$"
+
+Text_1885D8:: @ 81885D8
+	.string "Hey, don't scare away the fish!$"
+
+Text_1885F8:: @ 81885F8
+	.string "Sorry! I'm just so frustrated from\n"
+	.string "not catching anything.$"
+
+Text_188632:: @ 8188632
+	.string "Sheesh, I haven't caught a thing.\n"
+	.string "Could this place actually be a\l"
+	.string "giant pool or something?$"
+
+Text_18868C:: @ 818868C
+	.string "Keep me company till I get a hit.$"
+
+Text_1886AE:: @ 81886AE
+	.string "That burned some time.$"
+
+Text_1886C5:: @ 81886C5
+	.string "Oh wait!\n"
+	.string "I got a bite! Yeah!$"
+
+Text_1886E2:: @ 81886E2
+	.string "LIL: Huh? A battle?\n"
+	.string "IAN, can't you do it alone?$"
+
+Text_188712:: @ 8188712
+	.string "LIL: Oh, see?\n"
+	.string "We lost. Happy now?$"
+
+Text_188734:: @ 8188734
+	.string "LIL: I'm tired.\n"
+	.string "Can't we go home already?$"
+
+Text_18875E:: @ 818875E
+	.string "LIL: Huh? A battle?\n"
+	.string "I can't be bothered to do it alone.\l"
+	.string "Bring two POKéMON, won't you?$"
+
+Text_1887B4:: @ 81887B4
+	.string "IAN: My sis doesn't get enough\n"
+	.string "exercise, so I made her come.$"
+
+Text_1887F1:: @ 81887F1
+	.string "IAN: Awww, Sis!\n"
+	.string "Get it together!$"
+
+Text_188812:: @ 8188812
+	.string "IAN: Come on, Sis!\p"
+	.string "You're not going to lose weight\n"
+	.string "like this!$"
+
+Text_188850:: @ 8188850
+	.string "IAN: We want a two-on-two battle.\n"
+	.string "So can you bring two POKéMON?$"

data/maps/Route22/map.json

@@ -62,7 +62,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_16828C"
+      "script": "Route22_EventScript_EarlyRivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -71,7 +71,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_168298"
+      "script": "Route22_EventScript_EarlyRivalTriggerMid"
     },
     {
       "type": "trigger",
@@ -80,7 +80,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_1682AB"
+      "script": "Route22_EventScript_EarlyRivalTriggerBottom"
     },
     {
       "type": "trigger",
@@ -89,7 +89,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_1683ED"
+      "script": "Route22_EventScript_LateRivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -98,7 +98,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_1683F9"
+      "script": "Route22_EventScript_LateRivalTriggerMid"
     },
     {
       "type": "trigger",
@@ -107,7 +107,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_16840C"
+      "script": "Route22_EventScript_LateRivalTriggerBottom"
     }
   ],
   "bg_events": [
@@ -116,7 +116,7 @@
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "Route22_EventScript_1684E2"
+      "script": "Route22_EventScript_LeagueGateSign"
     }
   ]
 }

data/maps/Route22/scripts.inc

@@ -1,100 +1,94 @@
 Route22_MapScripts:: @ 816828B
 	.byte 0
 
-Route22_EventScript_16828C:: @ 816828C
+Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1682BE
+	goto Route22_EventScript_EarlyRival
-
-EventScript_168297:: @ 8168297
 	end
 
-Route22_EventScript_168298:: @ 8168298
+Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
+	goto Route22_EventScript_EarlyRival
-
-EventScript_1682AA:: @ 81682AA
 	end
 
-Route22_EventScript_1682AB:: @ 81682AB
+Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
+	goto Route22_EventScript_EarlyRival
-
-EventScript_1682BD:: @ 81682BD
 	end
 
-EventScript_1682BE:: @ 81682BE
+Route22_EventScript_EarlyRival:: @ 81682BE
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16835B
+	call_if_eq Route22_EventScript_EarlyRivalApproachBottom
 	delay 6
-	msgbox gUnknown_8188890
+	msgbox Route22_Text_EarlyRivalIntro
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_16836D
+	call_if_eq Route22_EventScript_EarlyRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_16837C
+	call_if_eq Route22_EventScript_EarlyRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_16838B
+	call_if_eq Route22_EventScript_EarlyRivalCharmander
-	msgbox gUnknown_8188974
+	msgbox Route22_Text_EarlyRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1683A5
+	call_if_eq Route22_EventScript_EarlyRivalExitBottom
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_ROUTE22, 2
 	releaseall
 	end
 
-EventScript_168350:: @ 8168350
+Route22_EventScript_EarlyRivalApproach:: @ 8168350
-	applymovement 1, Movement_1683D1
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_16835B:: @ 816835B
+Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
-	applymovement 1, Movement_1683D9
+	applymovement 1, Route22_Movement_RivalApproachBottom
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_16836D:: @ 816836D
+Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16837C:: @ 816837C
+Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16838B:: @ 816838B
+Route22_EventScript_EarlyRivalCharmander:: @ 816838B
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16839A:: @ 816839A
+Route22_EventScript_EarlyRivalExit:: @ 816839A
-	applymovement 1, Movement_1683B8
+	applymovement 1, Route22_Movement_EarlyRivalExit
 	waitmovement 0
 	return
 
-EventScript_1683A5:: @ 81683A5
+Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
-	applymovement 1, Movement_1683C5
+	applymovement 1, Route22_Movement_EarlyRivalExitBottom
 	waitmovement 0
 	return
 
-Movement_1683B0:: @ 8
+Route22_Movement_UnusedRivalExit:: @ 8
 	walk_right
 	walk_right
 	walk_right
@@ -104,7 +98,7 @@ Movement_1683B0:: @ 8
 	walk_right
 	step_end
 
-Movement_1683B8:: @ 81683B8
+Route22_Movement_EarlyRivalExit:: @ 81683B8
 	walk_down
 	walk_right
 	walk_right
@@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8
 	walk_down
 	step_end
 
-Movement_1683C5:: @ 81683C5
+Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
 	walk_right
 	walk_right
 	walk_right
@@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5
 	walk_down
 	step_end
 
-Movement_1683D1:: @ 81683D1
+Route22_Movement_RivalApproach:: @ 81683D1
 	walk_right
 	walk_right
 	walk_right
@@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1
 	walk_right
 	step_end
 
-Movement_1683D9:: @ 81683D9
+Route22_Movement_RivalApproachBottom:: @ 81683D9
 	walk_right
 	walk_right
 	walk_right
@@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9
 	walk_in_place_fastest_down
 	step_end
 
-Movement_1683E3:: @ 81683E3
+Route22_Movement_PlayerFaceRival:: @ 81683E3
 	delay_16
 	delay_16
 	delay_16
@@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3
 	walk_in_place_fastest_up
 	step_end
 
-Route22_EventScript_1683ED:: @ 81683ED
+Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16841F
+	goto Route22_EventScript_LateRival
-
-EventScript_1683F8:: @ 81683F8
 	end
 
-Route22_EventScript_1683F9:: @ 81683F9
+Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
+	goto Route22_EventScript_LateRival
-
-EventScript_16840B:: @ 816840B
 	end
 
-Route22_EventScript_16840C:: @ 816840C
+Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
+	goto Route22_EventScript_LateRival
-
-EventScript_16841E:: @ 816841E
 	end
 
-EventScript_16841F:: @ 816841F
+Route22_EventScript_LateRival:: @ 816841F
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1684A7
+	call_if_eq Route22_EventScript_LateRivalApproachBottom
-	msgbox gUnknown_8188A3C
+	msgbox Route22_Text_LateRivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_1684B9
+	call_if_eq Route22_EventScript_LateRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_1684C4
+	call_if_eq Route22_EventScript_LateRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_1684CF
+	call_if_eq Route22_EventScript_LateRivalCharmander
-	msgbox gUnknown_8188B29
+	msgbox Route22_Text_LateRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
-	applymovement 1, Movement_1684DA
+	applymovement 1, Route22_Movement_LateRivalExit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 1
@@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F
 	releaseall
 	end
 
-EventScript_16849C:: @ 816849C
+Route22_EventScript_LateRivalApproach:: @ 816849C
-	applymovement 1, Movement_1683D1
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_1684A7:: @ 81684A7
+Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
-	applymovement 1, Movement_1683D9
+	applymovement 1, Route22_Movement_RivalApproachBottom
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_1684B9:: @ 81684B9
+Route22_EventScript_LateRivalSquirtle:: @ 81684B9
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684C4:: @ 81684C4
+Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684CF:: @ 81684CF
+Route22_EventScript_LateRivalCharmander:: @ 81684CF
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
 	return
 
-Movement_1684DA:: @ 81684DA
+Route22_Movement_LateRivalExit:: @ 81684DA
 	walk_left
 	walk_left
 	walk_left
@@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA
 	walk_left
 	step_end
 
-Route22_EventScript_1684E2:: @ 81684E2
+Route22_EventScript_LeagueGateSign:: @ 81684E2
-	msgbox gUnknown_8188BFF, MSGBOX_SIGN
+	msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
 	end

data/maps/Route22/text.inc

@@ -1,201 +1,66 @@
-Text_1882E1:: @ 81882E1
+Route22_Text_EarlyRivalIntro:: @ 8188890
-    .string "Strong TRAINERS and WATER POKéMON\n"
+	.string "{RIVAL}: Hey! {PLAYER}!\p"
-    .string "are common sights in these parts.\p"
+	.string "You're off to the POKéMON LEAGUE?\n"
-    .string "They say that MISTY of the\n"
+	.string "Forget about it!\p"
-    .string "CERULEAN GYM trains here.$"
+	.string "You probably don't have any\n"
+	.string "BADGES, do you?\p"
+	.string "The guard won't let you through\n"
+	.string "without them.\p"
+	.string "By the way, did your POKéMON get\n"
+	.string "any stronger?$"
 
-Text_18835A:: @ 818835A
+Route22_Text_EarlyRivalDefeat:: @ 8188959
-    .string "You want to know if the fish are\n"
+	.string "Awww!\n"
-    .string "biting?$"
+	.string "You just lucked out!$"
 
-Text_188383:: @ 8188383
+Route22_Text_EarlyRivalPostBattle:: @ 8188974
-    .string "Dang!$"
+	.string "I heard the POKéMON LEAGUE is\n"
+	.string "crawling with tough TRAINERS.\p"
+	.string "I have to figure out how to get\n"
+	.string "past them.\p"
+	.string "You should quit dawdling and get a\n"
+	.string "move on!$"
 
-Text_188389:: @ 8188389
+@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!"
-    .string "I can't catch anything good.\n"
+Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07
-    .string "Not one good POKéMON to be had!$"
+	.string "{RIVAL}“なんだ？\n"
+	.string "ポケモン　2ひきも\l"
+	.string "もってるの　なぜか　だって？\p"
+	.string "おまえも\n"
+	.string "つかまえれば　いい　じゃん！$"
 
-Text_1883C6:: @ 81883C6
+Route22_Text_LateRivalIntro:: @ 8188A3C
-    .string "I got a big haul!\n"
+	.string "{RIVAL}: What? {PLAYER}!\n"
-    .string "Wanna go for it?$"
+	.string "What a surprise to see you here!\p"
+	.string "So you're going to the POKéMON\n"
+	.string "LEAGUE?\p"
+	.string "You collected all the BADGES, too?\n"
+	.string "That's cool!\p"
+	.string "Then I'll whip you, {PLAYER}, as a\n"
+	.string "warm-up for the POKéMON LEAGUE!\p"
+	.string "Come on!$"
 
-Text_1883E9:: @ 81883E9
+Route22_Text_LateRivalDefeat:: @ 8188B08
-    .string "Heheh, MAGIKARP just don't make\n"
+	.string "What!?\p"
-    .string "the grade, do they?$"
+	.string "I was just careless, you!$"
 
-Text_18841D:: @ 818841D
+Route22_Text_LateRivalPostBattle:: @ 8188B29
-    .string "I seem to only catch MAGIKARP!$"
+	.string "That loosened me up.\n"
+	.string "I'm ready for the POKéMON LEAGUE!\p"
+	.string "{PLAYER}, you need more practice.\p"
+	.string "But hey, you know that!\n"
+	.string "I'm out of here. Smell ya!$"
 
-Text_18843C:: @ 818843C
+@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!"
-    .string "The sea cleanses my body and soul!$"
+Route22_Text_LateRivalVictory:: @ 8188BAF
+	.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
+	.string "それで　がんばってるのかよ！\l"
+	.string "おれの　さいのうに　くらべりゃ\l"
+	.string "{PLAYER}は　まだまだ　だな！\p"
+	.string "もっと　れんしゅう　こいよ！\n"
+	.string "あははーッ！$"
 
-Text_18845F:: @ 818845F
+Route22_Text_LeagueGateSign:: @ 8188BFF
-    .string "Ayah!$"
+	.string "POKéMON LEAGUE\n"
-
+	.string "Front Gate$"
-Text_188465:: @ 8188465
-    .string "The sea is great and all, but I\n"
-    .string "like the mountains, too.$"
-
-Text_18849E:: @ 818849E
-    .string "おれだって　たまには\n"
-    .string "およぎに　くるぜ！$"
-
-Text_1884B3:: @ 81884B3
-    .string "ぐわわ！$"
-
-Text_1884B8:: @ 81884B8
-    .string "うきやすそう　だと？\n"
-    .string "うるせー　おおきな　おせわだッ！$"
-
-Text_1884D4:: @ 81884D4
-    .string "I caught my POKéMON at sea.$"
-
-Text_1884F0:: @ 81884F0
-    .string "Diver!!\n"
-    .string "Down!!$"
-
-Text_1884FF:: @ 81884FF
-    .string "Where'd you catch your POKéMON?$"
-
-Text_18851F:: @ 818851F
-    .string "Right now, I'm in a triathlon meet.$"
-
-Text_188543:: @ 8188543
-    .string "Pant…\n"
-    .string "Pant… Pant…$"
-
-Text_188555:: @ 8188555
-    .string "I'm beat! But, I still have the\n"
-    .string "bike race and marathon left!$"
-
-Text_188592:: @ 8188592
-    .string "Ahh!\n"
-    .string "Feel the sun and the wind!$"
-
-Text_1885B2:: @ 81885B2
-    .string "Yow!\n"
-    .string "I lost!$"
-
-Text_1885BF:: @ 81885BF
-    .string "I'm sunburnt to a crisp!$"
-
-Text_1885D8:: @ 81885D8
-    .string "Hey, don't scare away the fish!$"
-
-Text_1885F8:: @ 81885F8
-    .string "Sorry! I'm just so frustrated from\n"
-    .string "not catching anything.$"
-
-Text_188632:: @ 8188632
-    .string "Sheesh, I haven't caught a thing.\n"
-    .string "Could this place actually be a\l"
-    .string "giant pool or something?$"
-
-Text_18868C:: @ 818868C
-    .string "Keep me company till I get a hit.$"
-
-Text_1886AE:: @ 81886AE
-    .string "That burned some time.$"
-
-Text_1886C5:: @ 81886C5
-    .string "Oh wait!\n"
-    .string "I got a bite! Yeah!$"
-
-Text_1886E2:: @ 81886E2
-    .string "LIL: Huh? A battle?\n"
-    .string "IAN, can't you do it alone?$"
-
-Text_188712:: @ 8188712
-    .string "LIL: Oh, see?\n"
-    .string "We lost. Happy now?$"
-
-Text_188734:: @ 8188734
-    .string "LIL: I'm tired.\n"
-    .string "Can't we go home already?$"
-
-Text_18875E:: @ 818875E
-    .string "LIL: Huh? A battle?\n"
-    .string "I can't be bothered to do it alone.\l"
-    .string "Bring two POKéMON, won't you?$"
-
-Text_1887B4:: @ 81887B4
-    .string "IAN: My sis doesn't get enough\n"
-    .string "exercise, so I made her come.$"
-
-Text_1887F1:: @ 81887F1
-    .string "IAN: Awww, Sis!\n"
-    .string "Get it together!$"
-
-Text_188812:: @ 8188812
-    .string "IAN: Come on, Sis!\p"
-    .string "You're not going to lose weight\n"
-    .string "like this!$"
-
-Text_188850:: @ 8188850
-    .string "IAN: We want a two-on-two battle.\n"
-    .string "So can you bring two POKéMON?$"
-
-gUnknown_8188890:: @ 8188890
-    .string "{RIVAL}: Hey! {PLAYER}!\p"
-    .string "You're off to the POKéMON LEAGUE?\n"
-    .string "Forget about it!\p"
-    .string "You probably don't have any\n"
-    .string "BADGES, do you?\p"
-    .string "The guard won't let you through\n"
-    .string "without them.\p"
-    .string "By the way, did your POKéMON get\n"
-    .string "any stronger?$"
-
-Text_188959:: @ 8188959
-    .string "Awww!\n"
-    .string "You just lucked out!$"
-
-gUnknown_8188974:: @ 8188974
-    .string "I heard the POKéMON LEAGUE is\n"
-    .string "crawling with tough TRAINERS.\p"
-    .string "I have to figure out how to get\n"
-    .string "past them.\p"
-    .string "You should quit dawdling and get a\n"
-    .string "move on!$"
-
-Text_188A07:: @ 8188A07
-    .string "{RIVAL}“なんだ？\n"
-    .string "ポケモン　2ひきも\l"
-    .string "もってるの　なぜか　だって？\p"
-    .string "おまえも\n"
-    .string "つかまえれば　いい　じゃん！$"
-
-gUnknown_8188A3C:: @ 8188A3C
-    .string "{RIVAL}: What? {PLAYER}!\n"
-    .string "What a surprise to see you here!\p"
-    .string "So you're going to the POKéMON\n"
-    .string "LEAGUE?\p"
-    .string "You collected all the BADGES, too?\n"
-    .string "That's cool!\p"
-    .string "Then I'll whip you, {PLAYER}, as a\n"
-    .string "warm-up for the POKéMON LEAGUE!\p"
-    .string "Come on!$"
-
-Text_188B08:: @ 8188B08
-    .string "What!?\p"
-    .string "I was just careless, you!$"
-
-gUnknown_8188B29:: @ 8188B29
-    .string "That loosened me up.\n"
-    .string "I'm ready for the POKéMON LEAGUE!\p"
-    .string "{PLAYER}, you need more practice.\p"
-    .string "But hey, you know that!\n"
-    .string "I'm out of here. Smell ya!$"
-
-Text_188BAF:: @ 8188BAF
-    .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
-    .string "それで　がんばってるのかよ！\l"
-    .string "おれの　さいのうに　くらべりゃ\l"
-    .string "{PLAYER}は　まだまだ　だな！\p"
-    .string "もっと　れんしゅう　こいよ！\n"
-    .string "あははーッ！$"
-
-gUnknown_8188BFF:: @ 8188BFF
-    .string "POKéMON LEAGUE\n"
-    .string "Front Gate$"
 

data/maps/Route2_EastBuilding/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F67F",
+      "script": "Route2_EastBuilding_EventScript_Aide",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F714",
+      "script": "Route2_EastBuilding_EventScript_Rocker",
       "flag": "0"
     }
   ],

data/maps/Route2_EastBuilding/scripts.inc

@@ -1,40 +1,42 @@
+.equ REQUIRED_SEEN_MONS, 10
+
 Route2_EastBuilding_MapScripts:: @ 816F67E
 	.byte 0
 
-Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
+Route2_EastBuilding_EventScript_Aide:: @ 816F67F
 	lock
 	faceplayer
-	call EventScript_16F70B
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
-	goto_if_set FLAG_GOT_HM05, EventScript_16F701
+	goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
-	msgbox gUnknown_819D64F, MSGBOX_YESNO
+	msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_16F70B
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
-	compare VAR_0x8006, 10
+	compare VAR_0x8006, REQUIRED_SEEN_MONS
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
-	msgbox gUnknown_819D74E
+	msgbox Route2_EastBuilding_Text_GreatHereYouGo
 	checkitemspace ITEM_HM05, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
-	giveitem_msg gUnknown_819D7A1, ITEM_HM05
+	giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
 	setflag FLAG_GOT_HM05
-	msgbox gUnknown_819D7C1
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F701:: @ 816F701
+Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701
-	msgbox gUnknown_819D7C1
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F70B:: @ 816F70B
+Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B
-	getnumberstring 0, 10
+	getnumberstring 0, REQUIRED_SEEN_MONS
 	getitemname 1, ITEM_HM05
 	return
 
-Route2_EastBuilding_EventScript_16F714:: @ 816F714
+Route2_EastBuilding_EventScript_Rocker:: @ 816F714
-	msgbox gUnknown_819D81E, MSGBOX_NPC
+	msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC
 	end

data/maps/Route2_EastBuilding/text.inc

@@ -1,4 +1,4 @@
-gUnknown_819D64F:: @ 819D64F
+Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F
     .string "Hi! Remember me?\n"
     .string "I'm one of PROF. OAK's AIDES.\p"
     .string "If your POKéDEX has complete data\n"
@@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F
     .string "Have you gathered data on at least\n"
     .string "ten kinds of POKéMON?$"
 
-gUnknown_819D74E:: @ 819D74E
+Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819D7A1:: @ 819D7A1
+Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1
     .string "{PLAYER} received HM05\n"
     .string "from the AIDE.$"
 
-gUnknown_819D7C1:: @ 819D7C1
+Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1
     .string "HM05 contains the hidden move\n"
     .string "FLASH.\p"
     .string "FLASH lights up even the darkest\n"
     .string "of caves and dungeons.$"
 
-gUnknown_819D81E:: @ 819D81E
+Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E
     .string "Once a POKéMON learns FLASH, you\n"
     .string "can get through ROCK TUNNEL.$"
 

data/maps/Route2_House/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_House_EventScript_16F5F9",
+      "script": "Route2_House_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_House_EventScript_16F602",
+      "script": "Route2_House_EventScript_Reyley",
       "flag": "0"
     }
   ],

data/maps/Route2_House/scripts.inc

@@ -1,43 +1,43 @@
 Route2_House_MapScripts:: @ 816F5F8
 	.byte 0
 
-Route2_House_EventScript_16F5F9:: @ 816F5F9
+Route2_House_EventScript_Scientist:: @ 816F5F9
-	msgbox gUnknown_819D5E7, MSGBOX_NPC
+	msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC
 	end
 
-Route2_House_EventScript_16F602:: @ 816F602
+Route2_House_EventScript_Reyley:: @ 816F602
 	lock
 	faceplayer
 	setvar VAR_0x8008, INGAME_TRADE_MR_MIME
 	call EventScript_GetInGameTradeSpeciesInfo
-	goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
+	goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16F65C
+	goto_if_eq Route2_House_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
 	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge EventScript_16F65C
+	goto_if_ge Route2_House_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne EventScript_16F666
+	goto_if_ne Route2_House_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MIMIEN_TRADE
 	release
 	end
 
-EventScript_16F65C:: @ 816F65C
+Route2_House_EventScript_DeclineTrade:: @ 816F65C
 	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
-EventScript_16F666:: @ 816F666
+Route2_House_EventScript_NotRequestedMon:: @ 816F666
 	getspeciesname 0, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
-EventScript_16F674:: @ 816F674
+Route2_House_EventScript_AlreadyTraded:: @ 816F674
 	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end

data/maps/Route2_House/text.inc

@@ -1,4 +1,4 @@
-gUnknown_819D5E7:: @ 819D5E7
+Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7
     .string "A fainted POKéMON just has no\n"
     .string "energy left to battle.\p"
     .string "It can still use moves like CUT\n"

data/maps/Route2_ViridianForest_NorthEntrance/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF",
       "flag": "0"
     }
   ],

data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc

@@ -1,14 +1,14 @@
 Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D
 	.byte 0
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
+Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E
-	msgbox gUnknown_819D85C, MSGBOX_NPC
+	msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
+Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727
-	msgbox gUnknown_819D8D0, MSGBOX_NPC
+	msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
+Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730
-	msgbox gUnknown_819D93B, MSGBOX_NPC
+	msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC
 	end

data/maps/Route2_ViridianForest_NorthEntrance/text.inc

@@ -1,16 +1,16 @@
-gUnknown_819D85C:: @ 819D85C
+Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C
     .string "Many POKéMON live only in forests \n"
     .string "and caves.\p"
     .string "You need to be persistent and look\n"
     .string "everywhere to get different kinds.$"
 
-gUnknown_819D8D0:: @ 819D8D0
+Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0
     .string "Have you noticed the skinny trees\n"
     .string "on the roadside?\p"
     .string "They can be cut down by a special\n"
     .string "POKéMON move, I hear.$"
 
-gUnknown_819D93B:: @ 819D93B
+Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B
     .string "Do you know the evolution-cancel\n"
     .string "technique?\p"
     .string "When a POKéMON is evolving, you\n"

data/maps/Route2_ViridianForest_SouthEntrance/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6",
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF",
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2",
       "flag": "0"
     }
   ],

data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc

@@ -1,10 +1,10 @@
 Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5
 	.byte 0
 
-Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6
+Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6
-	msgbox gUnknown_819D52C, MSGBOX_NPC
+	msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF
+Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF
-	msgbox gUnknown_819D58B, MSGBOX_NPC
+	msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC
 	end

data/maps/Route2_ViridianForest_SouthEntrance/text.inc

@@ -1,9 +1,9 @@
-gUnknown_819D52C:: @ 819D52C
+Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C
     .string "Are you going to VIRIDIAN FOREST?\n"
     .string "It's a natural maze in there.\l"
     .string "Be careful you don't get lost.$"
 
-gUnknown_819D58B:: @ 819D58B
+Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B
     .string "RATTATA may be small, but don't\n"
     .string "underestimate its wicked bite.\p"
     .string "Have you caught one already?$"

data/maps/SSAnne_1F_Corridor/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Corridor_EventScript_1608D5",
+      "script": "SSAnne_1F_Corridor_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Corridor_EventScript_1608CC",
+      "script": "SSAnne_1F_Corridor_EventScript_WorkerM",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Corridor/scripts.inc

@@ -1,10 +1,10 @@
 SSAnne_1F_Corridor_MapScripts:: @ 81608CB
 	.byte 0
 
-SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC
+SSAnne_1F_Corridor_EventScript_WorkerM:: @ 81608CC
-	msgbox gUnknown_8172EE7, MSGBOX_NPC
+	msgbox SSAnne_1F_Corridor_Text_LeStrongSilentType, MSGBOX_NPC
 	end
 
-SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5
+SSAnne_1F_Corridor_EventScript_Sailor:: @ 81608D5
-	msgbox gUnknown_8172F60, MSGBOX_NPC
+	msgbox SSAnne_1F_Corridor_Text_PassengersAreRestless, MSGBOX_NPC
 	end

data/maps/SSAnne_1F_Corridor/text.inc

@@ -1,4 +1,4 @@
-gUnknown_8172EE7:: @ 8172EE7
+SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7
     .string "Bonjour!\n"
     .string "I am le waiter on this ship!\p"
     .string "I will be happy to serve you\n"
@@ -6,7 +6,7 @@ gUnknown_8172EE7:: @ 8172EE7
     .string "… … …\n"
     .string "Ah! Le strong silent type!$"
 
-gUnknown_8172F60:: @ 8172F60
+SSAnne_1F_Corridor_Text_PassengersAreRestless:: @ 8172F60
     .string "The passengers are restless from\n"
     .string "this long voyage.\p"
     .string "You might be challenged by the\n"

data/maps/SSAnne_1F_Room1/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room1_EventScript_160BDC",
+      "script": "SSAnne_1F_Room1_EventScript_Gentleman",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room1/scripts.inc

@@ -1,6 +1,6 @@
 SSAnne_1F_Room1_MapScripts:: @ 8160BDB
 	.byte 0
 
-SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC
+SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC
-	msgbox gUnknown_817393B, MSGBOX_NPC
+	msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC
 	end

data/maps/SSAnne_1F_Room1/text.inc

@@ -1,4 +1,4 @@
-gUnknown_817393B:: @ 817393B
+SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B
     .string "Ssh…!\n"
     .string "I'm a GLOBAL POLICE agent.\p"
     .string "I'm on the trail of TEAM ROCKET.\n"

data/maps/SSAnne_1F_Room2/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_1F_Room2_EventScript_160BEF",
+      "script": "SSAnne_1F_Room2_EventScript_Ann",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_1F_Room2_EventScript_160C06",
+      "script": "SSAnne_1F_Room2_EventScript_Tyler",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SSAnne_1F_Room2_EventScript_160BE6",
+      "script": "SSAnne_1F_Room2_EventScript_Woman",
       "flag": "0"
     },
     {

data/maps/SSAnne_1F_Room2/scripts.inc

@@ -1,16 +1,16 @@
 SSAnne_1F_Room2_MapScripts:: @ 8160BE5
 	.byte 0
 
-SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6
+SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6
-	msgbox gUnknown_8173AC5, MSGBOX_NPC
+	msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC
 	end
 
-SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF
+SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF
-	trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F
+	trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat
-	msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06
+SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06
-	trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1
+	trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat
-	msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SSAnne_1F_Room2/text.inc

@@ -1,31 +1,31 @@
-Text_173999:: @ 8173999
+SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999
     .string "I love POKéMON!\n"
     .string "Do you?$"
 
-Text_1739B1:: @ 81739B1
+SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1
     .string "Wow! \n"
     .string "You're great!$"
 
-gUnknown_81739C5:: @ 81739C5
+SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5
     .string "Listen, listen!\n"
     .string "Let me be your friend, okay?\p"
     .string "Then we can trade POKéMON and\n"
     .string "do stuff.$"
 
-Text_173A1A:: @ 8173A1A
+SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A
     .string "I collected these POKéMON\n"
     .string "from all around the world!$"
 
-Text_173A4F:: @ 8173A4F
+SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F
     .string "Oh, no!\n"
     .string "I went around the world for these!$"
 
-gUnknown_8173A7A:: @ 8173A7A
+SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A
     .string "You hurt my poor POKéMON!\p"
     .string "I demand that you heal them at a\n"
     .string "POKéMON CENTER!$"
 
-gUnknown_8173AC5:: @ 8173AC5
+SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5
     .string "We are cruising around the world,\n"
     .string "my children and I.$"
 

data/maps/SSAnne_1F_Room3/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 3,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C1E",
+      "script": "SSAnne_1F_Room3_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C30",
+      "script": "SSAnne_1F_Room3_EventScript_Wigglytuff",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room3_EventScript_160C27",
+      "script": "SSAnne_1F_Room3_EventScript_BaldingMan",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room3/scripts.inc

@@ -1,20 +1,20 @@
 SSAnne_1F_Room3_MapScripts:: @ 8160C1D
 	.byte 0
 
-SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E
+SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E
-	msgbox gUnknown_8173B21, MSGBOX_NPC
+	msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC
 	end
 
-SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27
+SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27
-	msgbox gUnknown_8173AFA, MSGBOX_NPC
+	msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC
 	end
 
-SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30
+SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WIGGLYTUFF, 0
-	msgbox gUnknown_8173B61
+	msgbox SSAnne_1F_Room3_Text_Wigglytuff
 	waitmoncry
 	release
 	end

data/maps/SSAnne_1F_Room3/text.inc

@@ -1,11 +1,11 @@
-gUnknown_8173AFA:: @ 8173AFA
+SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA
     .string "A world cruise is so elegant yet\n"
     .string "cozy!$"
 
-gUnknown_8173B21:: @ 8173B21
+SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21
     .string "I always travel with WIGGLYTUFF.\n"
     .string "I never leave home without it.$"
 
-gUnknown_8173B61:: @ 8173B61
+SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61
     .string "WIGGLYTUFF: Puup pupuu!$"
 

data/maps/SSAnne_1F_Room4/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room4_EventScript_160C44",
+      "script": "SSAnne_1F_Room4_EventScript_Woman",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room4/scripts.inc

@@ -1,17 +1,17 @@
 SSAnne_1F_Room4_MapScripts:: @ 8160C43
 	.byte 0
 
-SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44
+SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_160C5C
+	goto_if_eq SSAnne_1F_Room4_EventScript_WomanPlayerMale
-	msgbox gUnknown_8173BA4
+	msgbox SSAnne_1F_Room4_Text_WaitressCherryPiePlease
 	release
 	end
 
-EventScript_160C5C:: @ 8160C5C
+SSAnne_1F_Room4_EventScript_WomanPlayerMale:: @ 8160C5C
-	msgbox gUnknown_8173B79
+	msgbox SSAnne_1F_Room4_Text_WaiterCherryPiePlease
 	release
 	end

data/maps/SSAnne_1F_Room4/text.inc

@@ -1,8 +1,8 @@
-gUnknown_8173B79:: @ 8173B79
+SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: @ 8173B79
     .string "Waiter, I would like a cherry pie,\n"
     .string "please!$"
 
-gUnknown_8173BA4:: @ 8173BA4
+SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: @ 8173BA4
     .string "Waitress, I would like a cherry\n"
     .string "pie, please!$"
 

data/maps/SSAnne_1F_Room5/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SSAnne_1F_Room5_EventScript_160C67",
+      "script": "SSAnne_1F_Room5_EventScript_Arthur",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room5/scripts.inc

@@ -1,7 +1,7 @@
 SSAnne_1F_Room5_MapScripts:: @ 8160C66
 	.byte 0
 
-SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67
+SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67
-	trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA
+	trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat
-	msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SSAnne_1F_Room5/text.inc

@@ -1,12 +1,12 @@
-Text_173BD1:: @ 8173BD1
+SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1
     .string "You insolent pup!\n"
     .string "How dare you barge in!$"
 
-Text_173BFA:: @ 8173BFA
+SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA
     .string "Humph! You rude child!\n"
     .string "You have no sense of courtesy!$"
 
-gUnknown_8173C30:: @ 8173C30
+SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30
     .string "I wish to be left alone!\n"
     .string "Get out!$"
 

data/maps/SSAnne_1F_Room6/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_1F_Room6_EventScript_160DF3",
+      "script": "SSAnne_1F_Room6_EventScript_Woman",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room6/scripts.inc

@@ -1,27 +1,27 @@
 SSAnne_1F_Room6_MapScripts:: @ 8160DF2
 	.byte 0
 
-SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
+SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3
 	lock
 	faceplayer
-	msgbox gUnknown_817445B, MSGBOX_YESNO
+	msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_160E18
+	goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHeal
 	closemessage
 	call EventScript_OutOfCenterPartyHeal
-	msgbox gUnknown_8174490
+	msgbox SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed
 	release
 	end
 
-EventScript_160E18:: @ 8160E18
+SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_160E2E
+	goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale
-	msgbox gUnknown_8174515
+	msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMySister
 	release
 	end
 
-EventScript_160E2E:: @ 8160E2E
+SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E
-	msgbox gUnknown_81744D0
+	msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother
 	release
 	end

data/maps/SSAnne_1F_Room6/text.inc

@@ -1,16 +1,16 @@
-gUnknown_817445B:: @ 817445B
+SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B
     .string "You look tired. Would you like to\n"
     .string "take a short rest?$"
 
-gUnknown_8174490:: @ 8174490
+SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490
     .string "I'm glad to see that everyone is\n"
     .string "looking refreshed and chipper.$"
 
-gUnknown_81744D0:: @ 81744D0
+SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0
     .string "Oh, I'm sorry for fussing over you.\n"
     .string "You look like my little brother…$"
 
-gUnknown_8174515:: @ 8174515
+SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515
     .string "Oh, I'm sorry for fussing over you.\n"
     .string "You look like my little sister…$"
 

data/maps/SSAnne_1F_Room7/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_1F_Room7_EventScript_160C7F",
+      "script": "SSAnne_1F_Room7_EventScript_Thomas",
       "flag": "0"
     }
   ],

data/maps/SSAnne_1F_Room7/scripts.inc

@@ -1,7 +1,7 @@
 SSAnne_1F_Room7_MapScripts:: @ 8160C7E
 	.byte 0
 
-SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F
+SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F
-	trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4
+	trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat
-	msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SSAnne_1F_Room7/text.inc

@@ -1,11 +1,11 @@
-Text_173C52:: @ 8173C52
+SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52
     .string "I am but a solitary traveler…\p"
     .string "My sole companions and friends are\n"
     .string "POKéMON I caught on my journeys…$"
 
-Text_173CB4:: @ 8173CB4
+SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4
     .string "My, my friends…$"
 
-gUnknown_8173CC4:: @ 8173CC4
+SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4
     .string "You should be nice to friends!$"
 

data/maps/SSAnne_2F_Corridor/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_160A54",
+      "script": "SSAnne_2F_Corridor_EventScript_Sailor",
       "flag": "0"
     }
   ],
@@ -113,7 +113,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
       "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608DF"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerLeft"
     },
     {
       "type": "trigger",
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
       "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608EB"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerMid"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR",
       "var_value": 0,
-      "script": "SSAnne_2F_Corridor_EventScript_1608F7"
+      "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerRight"
     }
   ],
   "bg_events": []

data/maps/SSAnne_2F_Corridor/scripts.inc

@@ -1,31 +1,25 @@
 SSAnne_2F_Corridor_MapScripts:: @ 81608DE
 	.byte 0
 
-SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF
+SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
-
-EventScript_1608EA:: @ 81608EA
 	end
 
-SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB
+SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
-
-EventScript_1608F6:: @ 81608F6
 	end
 
-SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7
+SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_160903
+	goto SSAnne_2F_Corridor_EventScript_RivalTrigger
-
-EventScript_160902:: @ 8160902
 	end
 
-EventScript_160903:: @ 8160903
+SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903
 	textcolor 0
 	playse SE_KAIDAN
 	delay 5
@@ -36,80 +30,80 @@ EventScript_160903:: @ 8160903
 	waitmovement 0
 	delay 20
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_1609AD
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_1609B8
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1609CA
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight
-	msgbox gUnknown_8173035
+	msgbox SSAnne_2F_Corridor_Text_RivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_1609DC
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_1609E7
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_1609F2
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalCharmander
-	msgbox gUnknown_8173164
+	msgbox SSAnne_2F_Corridor_Text_RivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_1609FD
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_160A08
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_160A13
+	call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
 	releaseall
 	end
 
-EventScript_1609AD:: @ 81609AD
+SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD
-	applymovement 1, Movement_160A2A
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachLeft
 	waitmovement 0
 	return
 
-EventScript_1609B8:: @ 81609B8
+SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8
-	applymovement 1, Movement_160A2E
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachMid
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
 	waitmovement 0
 	return
 
-EventScript_1609CA:: @ 81609CA
+SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E
+	applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
-	applymovement 1, Movement_160A34
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachRight
 	waitmovement 0
 	return
 
-EventScript_1609DC:: @ 81609DC
+SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
 
-EventScript_1609E7:: @ 81609E7
+SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
 
-EventScript_1609F2:: @ 81609F2
+SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2
-	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110
+	trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat
 	return
 
-EventScript_1609FD:: @ 81609FD
+SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD
-	applymovement 1, Movement_160A3B
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitLeft
 	waitmovement 0
 	return
 
-EventScript_160A08:: @ 8160A08
+SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08
-	applymovement 1, Movement_160A44
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitMid
 	waitmovement 0
 	return
 
-EventScript_160A13:: @ 8160A13
+SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13
-	applymovement 1, Movement_160A4C
+	applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitRight
 	waitmovement 0
 	return
 
-Movement_160A1E:: @ 8160A1E
+SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E
 	delay_16
 	delay_16
 	delay_16
@@ -117,7 +111,7 @@ Movement_160A1E:: @ 8160A1E
 	walk_in_place_fastest_left
 	step_end
 
-Movement_160A24:: @ 8160A24
+SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24
 	delay_16
 	delay_16
 	delay_16
@@ -125,13 +119,13 @@ Movement_160A24:: @ 8160A24
 	walk_in_place_fastest_left
 	step_end
 
-Movement_160A2A:: @ 8160A2A
+SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-Movement_160A2E:: @ 8160A2E
+SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E
 	walk_down
 	walk_down
 	walk_down
@@ -139,7 +133,7 @@ Movement_160A2E:: @ 8160A2E
 	walk_in_place_fastest_right
 	step_end
 
-Movement_160A34:: @ 8160A34
+SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34
 	walk_down
 	walk_down
 	walk_down
@@ -148,7 +142,7 @@ Movement_160A34:: @ 8160A34
 	delay_4
 	step_end
 
-Movement_160A3B:: @ 8160A3B
+SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B
 	walk_right
 	walk_down
 	walk_down
@@ -159,7 +153,7 @@ Movement_160A3B:: @ 8160A3B
 	walk_down
 	step_end
 
-Movement_160A44:: @ 8160A44
+SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44
 	walk_down
 	walk_down
 	walk_down
@@ -169,7 +163,7 @@ Movement_160A44:: @ 8160A44
 	walk_down
 	step_end
 
-Movement_160A4C:: @ 8160A4C
+SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C
 	walk_down
 	walk_down
 	walk_down
@@ -179,6 +173,6 @@ Movement_160A4C:: @ 8160A4C
 	walk_down
 	step_end
 
-SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54
+SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54
-	msgbox gUnknown_8172FC3, MSGBOX_NPC
+	msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC
 	end

data/maps/SSAnne_2F_Corridor/text.inc

@@ -1,10 +1,10 @@
-gUnknown_8172FC3:: @ 8172FC3
+SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3
     .string "This ship, she is a luxury liner for\n"
     .string "TRAINERS of the world!\p"
     .string "At every port, we hold parties with\n"
     .string "invited TRAINERS.$"
 
-gUnknown_8173035:: @ 8173035
+SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035
     .string "{RIVAL}: Bonjour!\n"
     .string "{PLAYER}!\p"
     .string "Imagine seeing you here!\n"
@@ -15,18 +15,18 @@ gUnknown_8173035:: @ 8173035
     .string "Crawl around in grassy areas, and\n"
     .string "look hard for them.$"
 
-Text_173110:: @ 8173110
+SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110
     .string "Humph!\p"
     .string "At least you're raising your\n"
     .string "POKéMON!$"
 
-Text_17313D:: @ 817313D
+SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D
     .string "{PLAYER}‥！\n"
     .string "ふなよい　してるのか！\p"
     .string "もっと　からだ\n"
     .string "きたえた　ほうが　いいぜ！$"
 
-gUnknown_8173164:: @ 8173164
+SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164
     .string "{RIVAL}: I heard there was a CUT\n"
     .string "master on board.\p"
     .string "But he was just a seasick old man!\p"

data/maps/SSAnne_2F_Room1/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SSAnne_2F_Room1_EventScript_160C97",
+      "script": "SSAnne_2F_Room1_EventScript_Gentleman",
       "flag": "0"
     }
   ],

data/maps/SSAnne_2F_Room1/scripts.inc

@@ -1,10 +1,10 @@
 SSAnne_2F_Room1_MapScripts:: @ 8160C96
 	.byte 0
 
-SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
+SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
 	lock
 	faceplayer
-	message Text_173CE3
+	message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
 	waitmessage
 	setvar VAR_0x8004, SPECIES_SNORLAX
 	special Special_SetSeenMon

data/maps/SSAnne_2F_Room1/text.inc

@@ -1,4 +1,4 @@
-Text_173CE3:: @ 8173CE3
+SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3
     .string "I've journeyed far and wide, but in\n"
     .string "all my travels I've never seen\l"
     .string "any POKéMON sleep like this one!\p"

data/maps/SSAnne_2F_Room2/map.json

@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SSAnne_2F_Room2_EventScript_160CB1",
+      "script": "SSAnne_2F_Room2_EventScript_Dale",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SSAnne_2F_Room2_EventScript_160CC8",
+      "script": "SSAnne_2F_Room2_EventScript_Brooks",
       "flag": "0"
     },
     {

data/maps/SSAnne_2F_Room2/scripts.inc

@@ -1,12 +1,12 @@
 SSAnne_2F_Room2_MapScripts:: @ 8160CB0
 	.byte 0
 
-SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1
+SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1
-	trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7
+	trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat
-	msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8
+SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8
-	trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92
+	trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat
-	msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE
+	msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE
 	end