Merge pull request #17 from yenatch/master

most of the incbins in data/event_scripts.s

13 files changed, 1400 insertions, 374 deletions

diff --git a/asm/macros/event.s b/asm/macros/event.s
index d29e72e97..e3caa0c4f 100644
--- a/asm/macros/event.s
+++ b/asm/macros/event.s
@@ -938,8 +938,9 @@
 	.endm
 
 	@ In FireRed, this command is a nop.
-	.macro event_8a
+	.macro event_8a byte1, byte2, byte3
 	.byte 0x8a
+	.byte \byte1, \byte2, \byte3
 	.endm
 
 	@ In FireRed, this command sets the byte at 0x03000EA8 to 0x01. I do not know what that means.
diff --git a/asm/rom4.s b/asm/rom4.s
index 5aeb726e8..497e1d9ef 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -47941,7 +47941,7 @@ sub_8068500: @ 8068500
 	ldr r0, _08068520
 	b _080686EE
 	.align 2, 0
-_08068520: .4byte gUnknown_081A6E72
+_08068520: .4byte Event_TV
 _08068524:
 	adds r0, r5, 0
 	bl MetatileBehavior_IsPC
@@ -48007,7 +48007,7 @@ _0806859C:
 	ldr r0, _080685B0
 	b _080686EE
 	.align 2, 0
-_080685B0: .4byte gUnknown_081A02D6
+_080685B0: .4byte Event_WorldMap
 _080685B4:
 	adds r0, r5, 0
 	bl sub_805791C
@@ -48018,7 +48018,7 @@ _080685B4:
 	ldr r0, _080685C8
 	b _080686EE
 	.align 2, 0
-_080685C8: .4byte gUnknown_081B6E5A
+_080685C8: .4byte Event_RunningShoesManual
 _080685CC:
 	adds r0, r5, 0
 	bl sub_8057930
@@ -48374,7 +48374,7 @@ _0806888C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08068890: .4byte gUnknown_081C6BC5
+_08068890: .4byte GraniteCave_B1F_EventScript_1C6BC5
 	thumb_func_end sub_8068870
 
 	thumb_func_start sub_8068894
@@ -48401,7 +48401,7 @@ _080688B4:
 	ldr r0, _080688C8
 	b _080688E8
 	.align 2, 0
-_080688C8: .4byte gUnknown_081B25BC
+_080688C8: .4byte Event_EggHatch
 _080688CC:
 	bl safari_step
 	lsls r0, 24
diff --git a/asm/rom5.s b/asm/rom5.s
index 7fa210b99..35115ceb5 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -21808,7 +21808,7 @@ sub_8085558: @ 8085558
 	b _08085592
 	.align 2, 0
 _08085588: .4byte 0x00004021
-_0808558C: .4byte gUnknown_081C33E6
+_0808558C: .4byte Event_RepelWoreOff
 _08085590:
 	movs r0, 0
 _08085592:
@@ -89669,7 +89669,7 @@ _080A6D8A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080A6D94: .4byte gUnknown_081A14AF
+_080A6D94: .4byte Event_NoRegisteredItem
 	thumb_func_end sub_80A6D1C
 
 	thumb_func_start sub_80A6D98
@@ -135221,70 +135221,70 @@ sub_80BCCE8: @ 80BCCE8
 	b _080BCD72
 	.align 2, 0
 _080BCD08: .4byte 0x00004054
-_080BCD0C: .4byte gUnknown_081A1BB2
+_080BCD0C: .4byte UnknownString_81A1BB2
 _080BCD10:
 	cmp r0, 0x1
 	bne _080BCD1C
 	ldr r0, _080BCD18
 	b _080BCD72
 	.align 2, 0
-_080BCD18: .4byte gUnknown_081A1F67
+_080BCD18: .4byte UnknownString_81A1F67
 _080BCD1C:
 	cmp r0, 0x2
 	bne _080BCD28
 	ldr r0, _080BCD24
 	b _080BCD72
 	.align 2, 0
-_080BCD24: .4byte gUnknown_081A2254
+_080BCD24: .4byte UnknownString_81A2254
 _080BCD28:
 	cmp r0, 0x3
 	bne _080BCD34
 	ldr r0, _080BCD30
 	b _080BCD72
 	.align 2, 0
-_080BCD30: .4byte gUnknown_081A25C3
+_080BCD30: .4byte UnknownString_81A25C3
 _080BCD34:
 	cmp r0, 0x4
 	bne _080BCD40
 	ldr r0, _080BCD3C
 	b _080BCD72
 	.align 2, 0
-_080BCD3C: .4byte gUnknown_081A2925
+_080BCD3C: .4byte UnknownString_81A2925
 _080BCD40:
 	cmp r0, 0x5
 	bne _080BCD4C
 	ldr r0, _080BCD48
 	b _080BCD72
 	.align 2, 0
-_080BCD48: .4byte gUnknown_081A1D74
+_080BCD48: .4byte UnknownString_81A1D74
 _080BCD4C:
 	cmp r0, 0x6
 	bne _080BCD58
 	ldr r0, _080BCD54
 	b _080BCD72
 	.align 2, 0
-_080BCD54: .4byte gUnknown_081A20C9
+_080BCD54: .4byte UnknownString_81A20C9
 _080BCD58:
 	cmp r0, 0x7
 	bne _080BCD64
 	ldr r0, _080BCD60
 	b _080BCD72
 	.align 2, 0
-_080BCD60: .4byte gUnknown_081A2439
+_080BCD60: .4byte UnknownString_81A2439
 _080BCD64:
 	cmp r1, 0x8
 	beq _080BCD70
 	ldr r0, _080BCD6C
 	b _080BCD72
 	.align 2, 0
-_080BCD6C: .4byte gUnknown_081A2B2A
+_080BCD6C: .4byte UnknownString_81A2B2A
 _080BCD70:
 	ldr r0, _080BCD78
 _080BCD72:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080BCD78: .4byte gUnknown_081A2754
+_080BCD78: .4byte UnknownString_81A2754
 	thumb_func_end sub_80BCCE8
 
 	thumb_func_start unref_sub_80BCD7C
@@ -152785,7 +152785,7 @@ _080C57F4:
 	strh r0, [r4]
 	b _080C581A
 	.align 2, 0
-_080C5808: .4byte gUnknown_081A1132
+_080C5808: .4byte UnknownString_81A1132
 _080C580C:
 	ldr r0, _080C5820
 	strh r1, [r0]
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 96025a725..b597acc30 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -7,7 +7,24 @@
 	.include "data/script_cmd_table.s"
 
 gUnknown_0814B14C::
-	.incbin "baserom.gba", 0x0014b14c, 0x48
+	.4byte 0x202e8c4
+	.4byte 0x202e8c6
+	.4byte 0x202e8c8
+	.4byte 0x202e8ca
+	.4byte 0x202e8cc
+	.4byte 0x202e8ce
+	.4byte 0x202e8d0
+	.4byte 0x202e8d2
+	.4byte 0x202e8d4
+	.4byte 0x202e8d6
+	.4byte 0x202e8d8
+	.4byte 0x202e8da
+	.4byte 0x202e8e0
+	.4byte 0x202e8dc
+	.4byte 0x203855e
+	.4byte 0x202e8de
+	.4byte 0x203869e
+	.4byte 0x203869c
 
 	.include "data/specials.s"
 
@@ -361,29 +378,173 @@ gStdScripts_End::
 	.include "data/maps/scripts/SecretBase_YellowCave3.s"
 	.include "data/maps/scripts/SecretBase_YellowCave4.s"
 
-	.global gUnknown_0815F36C
-gUnknown_0815F36C: @ 815F36C
-	.incbin "baserom.gba", 0x0015f36c, 0x2d
+gUnknown_0815F36C:: @ 815F36C
+	lockall
+	playsfx 2
+	message UnknownString_81A3A72
+	doanimation 61
+	waitstate
+	waittext
+	waitbutton
+	playsfx 5
+	jump EventScript_15F384
+	end
+
+EventScript_15F384:
+	message UnknownString_81A3A87
+	waittext
+	checkflag 268
+	jumpeq EventScript_15F3A0
+	jump EventScript_15F3E2
+	end
+
+gUnknown_0815F399:: @ 815F399
+	lockall
+	jump EventScript_15F384
+	end
+
+EventScript_15F3A0:
+	multichoice 0, 0, 6, 0
+	switch RESULT
+	case 0, EventScript_15F432
+	case 1, EventScript_15F419
+	case 2, EventScript_15F436
+	case 3, EventScript_15F51D
+	case 127, EventScript_15F51D
+	end
+
+EventScript_15F3E2:
+	multichoice 0, 0, 5, 0
+	switch RESULT
+	case 0, EventScript_15F432
+	case 1, EventScript_15F419
+	case 2, EventScript_15F51D
+	case 127, EventScript_15F51D
+	end
+
+EventScript_15F419:
+	msgbox UnknownString_81A38FB, 5
+	compare RESULT, 0
+	jumpeq EventScript_15F384
+	closebutton
+	special 10
+	releaseall
+	end
+
+EventScript_15F432:
+	special 14
+	end
+
+EventScript_15F436:
+	special 15
+	end
+
+gUnknown_0815F43A:: @ 815F43A
+	lockall
+	message UnknownString_81A3A72
+	playsfx 2
+	doanimation 61
+	waitstate
+	waittext
+	waitbutton
+	playsfx 5
+	jump EventScript_15F452
+	end
+
+EventScript_15F452:
+	message UnknownString_81A3A87
+	waittext
+	multichoice 0, 0, 7, 0
+	switch RESULT
+	case 0, EventScript_15F4A1
+	case 1, EventScript_15F436
+	case 2, EventScript_15F511
+	case 3, EventScript_15F51D
+	case 127, EventScript_15F51D
+	end
+
+gUnknown_0815F49A:: @ 815F49A
+	lockall
+	jump EventScript_15F452
+	end
+
+EventScript_15F4A1:
+	special 12
+	compare RESULT, 1
+	jumpeq EventScript_15F4E0
+	compare RESULT, 2
+	jumpeq EventScript_15F503
+	special 303
+	msgbox UnknownString_81A3958, 5
+	compare RESULT, 0
+	jumpeq EventScript_15F452
+	msgbox UnknownString_81A3A22, 3
+	special 13
+	special 26
+	releaseall
+	end
+
+EventScript_15F4E0:
+	msgbox UnknownString_81A3982, 5
+	compare RESULT, 0
+	jumpeq EventScript_15F452
+	msgbox UnknownString_81A3A3A, 3
+	special 13
+	special 26
+	releaseall
+	end
+
+EventScript_15F503:
+	msgbox UnknownString_81A39C0, 3
+	special 26
+	closebutton
+	releaseall
+	end
 
-	.global gUnknown_0815F399
-gUnknown_0815F399: @ 815F399
-	.incbin "baserom.gba", 0x0015f399, 0xa1
+EventScript_15F511:
+	message UnknownString_81A3AA2
+	waittext
+	jump EventScript_15F452
+	end
 
-	.global gUnknown_0815F43A
-gUnknown_0815F43A: @ 815F43A
-	.incbin "baserom.gba", 0x0015f43a, 0x60
+EventScript_15F51D:
+	special 26
+	closebutton
+	releaseall
+	end
 
-	.global gUnknown_0815F49A
-gUnknown_0815F49A: @ 815F49A
-	.incbin "baserom.gba", 0x0015f49a, 0x89
+gUnknown_0815F523:: @ 815F523
+	doanimation 52
+	waitstate
+	end
 
-	.global gUnknown_0815F523
-gUnknown_0815F523: @ 815F523
-	.incbin "baserom.gba", 0x0015f523, 0x5
+gUnknown_0815F528:: @ 815F528
+	special 307
+	compare RESULT, 0
+	jumpeq EventScript_15F558
+	compare RESULT, 1
+	jumpeq EventScript_15F561
+	compare RESULT, 2
+	jumpeq EventScript_15F56A
+	compare RESULT, 3
+	jumpeq EventScript_15F573
+	end
+
+EventScript_15F558:
+	msgbox UnknownString_81A3B5B, 3
+	end
 
-	.global gUnknown_0815F528
-gUnknown_0815F528: @ 815F528
-	.incbin "baserom.gba", 0x15f528, 0x54
+EventScript_15F561:
+	msgbox UnknownString_81A3BA4, 3
+	end
+
+EventScript_15F56A:
+	msgbox UnknownString_81A3BE8, 3
+	end
+
+EventScript_15F573:
+	msgbox UnknownString_81A3C31, 3
+	end
 
 	.include "data/maps/scripts/SingleBattleColosseum.s"
 	.include "data/maps/scripts/TradeCenter.s"
@@ -655,6 +816,9 @@ gUnknown_0815F528: @ 815F528
 	.include "data/maps/text/VictoryRoad_1F.s"
 	.include "data/maps/text/VictoryRoad_B1F.s"
 	.include "data/maps/text/VictoryRoad_B2F.s"
+	.include "data/maps/text/ShoalCave_LowTideEntranceRoom.s"
+	.include "data/maps/text/ShoalCave_LowTideInnerRoom.s"
+	.include "data/maps/text/ShoalCave_LowTideStairsRoom.s"
 	.include "data/maps/text/ShoalCave_LowTideLowerRoom.s"
 	.include "data/maps/text/NewMauville_Entrance.s"
 	.include "data/maps/text/NewMauville_Inside.s"
@@ -675,6 +839,9 @@ gUnknown_0815F528: @ 815F528
 	.include "data/maps/text/BattleTower_Outside.s"
 	.include "data/maps/text/BattleTower_Lobby.s"
 	.include "data/maps/text/BattleTower_BattleRoom.s"
+	.include "data/maps/text/SouthernIsland_Exterior.s"
+	.include "data/maps/text/SouthernIsland_Interior.s"
+	.include "data/maps/text/SafariZone_RestHouse.s"
 	.include "data/maps/text/Route104_Prototype.s"
 	.include "data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s"
 	.include "data/maps/text/Route109_SeashoreHouse.s"
@@ -707,6 +874,7 @@ UnknownString_819C21F: @ 819C21F
 	.include "data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s"
 	.include "data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s"
 	.include "data/maps/text/Route113_GlassWorkshop.s"
+	.include "data/maps/text/Route123_BerryMastersHouse.s"
 	.include "data/maps/text/Route119_WeatherInstitute_1F.s"
 	.include "data/maps/text/Route119_WeatherInstitute_2F.s"
 	.include "data/maps/text/Route119_House.s"
@@ -754,44 +922,362 @@ SecretBase_RedCave1_EventScript_19F806:: @ 819F806
 	waitstate
 	return
 
-	.global gUnknown_0819F80B
-gUnknown_0819F80B: @ 819F80B
-	.incbin "baserom.gba", 0x0019f80b, 0xd
+gUnknown_0819F80B:: @ 819F80B
+	lock
+	special 56
+	special 55
+	waitstate
+	jump EventScript_19F8F2
 
-	.global gUnknown_0819F818
-gUnknown_0819F818: @ 819F818
-	.incbin "baserom.gba", 0x0019f818, 0x28
+gUnknown_0819F818:: @ 819F818
+	lock
+	faceplayer
+	move LAST_TALKED, Movement_19F8F0
+	waitmove 0
+	specialval RESULT, 54
+	compare RESULT, 0
+	jumpif 5, EventScript_19F83F
+	special 56
+	special 314
+	jump EventScript_19F8F2
 
-	.global gUnknown_0819F840
-gUnknown_0819F840: @ 819F840
-	.incbin "baserom.gba", 0x0019f840, 0x38
+EventScript_19F83F:
+	endtrainerbattle
 
-	.global gUnknown_0819F878
-gUnknown_0819F878: @ 819F878
-	.incbin "baserom.gba", 0x0019f878, 0xf
+gUnknown_0819F840:: @ 819F840
+	lock
+	faceplayer
+	call EventScript_19F8E5
+	specialval RESULT, 54
+	compare RESULT, 0
+	jumpif 5, EventScript_19F877
+	special 61
+	compare RESULT, 0
+	jumpif 5, EventScript_19F870
+	special 56
+	special 314
+	jump EventScript_19F8F2
 
-	.global gUnknown_0819F887
-gUnknown_0819F887: @ 819F887
-	.incbin "baserom.gba", 0x0019f887, 0x27
+EventScript_19F870:
+	special 53
+	waittext
+	waitbutton
+	release
+	end
 
-	.global gUnknown_0819F8AE
-gUnknown_0819F8AE: @ 819F8AE
+EventScript_19F877:
+	endtrainerbattle
 
-	.incbin "baserom.gba", 0x19f8ae, 0x89
+gUnknown_0819F878:: @ 819F878
+	move LAST_TALKED, Movement_19F8F0
+	waitmove 0
+	special 56
+	reptrainerbattle
+	endtrainerbattle
 
-Std_6::
-	message 0x0
+gUnknown_0819F887:: @ 819F887
+	call EventScript_19F8E5
+	specialval RESULT, 58
+	compare RESULT, 0
+	jumpeq EventScript_19F8AD
+	special 56
+	special 314
+	special 52
+	waittext
+	waitbutton
+	special 59
+	waitstate
+	releaseall
+	end
+
+EventScript_19F8AD:
+	endtrainerbattle
+
+gUnknown_0819F8AE:: @ 819F8AE
+	specialval RESULT, 58
+	compare RESULT, 0
+	jumpeq EventScript_19F8DD
+	special 61
+	compare RESULT, 0
+	jumpif 5, EventScript_19F8DE
+	special 56
+	special 314
+	special 52
+	waittext
+	waitbutton
+	special 59
+	waitstate
+	releaseall
+	end
+
+EventScript_19F8DD:
+	endtrainerbattle
+
+EventScript_19F8DE:
+	special 53
 	waittext
 	waitbutton
 	release
+	end
+
+EventScript_19F8E5:
+	move LAST_TALKED, Movement_19F8F0
+	waitmove 0
 	return
 
-	.incbin "baserom.gba", 0x19f940, 0x141
+Movement_19F8F0::
+	step_59
+	step_end
 
-	.global gUnknown_0819FA81
-gUnknown_0819FA81: @ 819FA81
+EventScript_19F8F2:
+	special 52
+	waittext
+	waitbutton
+	reptrainerbattle
+	specialval RESULT, 51
+	compare RESULT, 0
+	jumpeq EventScript_19F934
+	compare RESULT, 2
+	jumpeq EventScript_19F936
+	compare RESULT, 1
+	jumpeq EventScript_19F936
+	compare RESULT, 6
+	jumpeq EventScript_19F936
+	compare RESULT, 8
+	jumpeq EventScript_19F936
+
+EventScript_19F934:
+	releaseall
+	end
+
+EventScript_19F936:
+	endtrainerbattle2
 
-	.incbin "baserom.gba", 0x19fa81, 0x192
+Std_6::
+	message 0x0
+	waittext
+	waitbutton
+	release
+	return
+
+Event_ResetBerryTrees: @ 19F940
+	event_8a 2, 7, 5
+	event_8a 1, 3, 5
+	event_8a 11, 7, 5
+	event_8a 13, 3, 5
+	event_8a 4, 7, 5
+	event_8a 76, 1, 5
+	event_8a 8, 1, 5
+	event_8a 10, 6, 5
+	event_8a 25, 20, 5
+	event_8a 26, 2, 5
+	event_8a 66, 2, 5
+	event_8a 67, 20, 5
+	event_8a 69, 22, 5
+	event_8a 70, 22, 5
+	event_8a 71, 22, 5
+	event_8a 55, 17, 5
+	event_8a 56, 17, 5
+	event_8a 5, 1, 5
+	event_8a 6, 6, 5
+	event_8a 7, 1, 5
+	event_8a 16, 18, 5
+	event_8a 17, 18, 5
+	event_8a 18, 18, 5
+	event_8a 29, 19, 5
+	event_8a 28, 19, 5
+	event_8a 27, 19, 5
+	event_8a 24, 4, 5
+	event_8a 23, 3, 5
+	event_8a 22, 3, 5
+	event_8a 21, 4, 5
+	event_8a 19, 16, 5
+	event_8a 20, 16, 5
+	event_8a 80, 7, 5
+	event_8a 81, 7, 5
+	event_8a 77, 8, 5
+	event_8a 78, 8, 5
+	event_8a 68, 8, 5
+	event_8a 31, 10, 5
+	event_8a 33, 10, 5
+	event_8a 34, 21, 5
+	event_8a 35, 21, 5
+	event_8a 36, 21, 5
+	event_8a 83, 24, 5
+	event_8a 84, 24, 5
+	event_8a 85, 10, 5
+	event_8a 86, 6, 5
+	event_8a 37, 5, 5
+	event_8a 38, 5, 5
+	event_8a 39, 5, 5
+	event_8a 40, 3, 5
+	event_8a 41, 3, 5
+	event_8a 42, 3, 5
+	event_8a 46, 19, 5
+	event_8a 45, 20, 5
+	event_8a 44, 18, 5
+	event_8a 43, 16, 5
+	event_8a 47, 8, 5
+	event_8a 48, 5, 5
+	event_8a 49, 4, 5
+	event_8a 50, 2, 5
+	event_8a 52, 18, 5
+	event_8a 53, 18, 5
+	event_8a 62, 6, 5
+	event_8a 64, 6, 5
+	event_8a 58, 21, 5
+	event_8a 59, 21, 5
+	event_8a 60, 25, 5
+	event_8a 61, 25, 5
+	event_8a 79, 23, 5
+	event_8a 14, 23, 5
+	event_8a 15, 21, 5
+	event_8a 30, 21, 5
+	event_8a 65, 25, 5
+	event_8a 72, 25, 5
+	event_8a 73, 23, 5
+	event_8a 74, 23, 5
+	event_8a 87, 3, 5
+	event_8a 88, 10, 5
+	event_8a 89, 4, 5
+	event_8a 82, 36, 5
+	return
+
+gUnknown_0819FA81:: @ 819FA81
+	setflag 86
+	setflag 769
+	setflag 770
+	setflag 771
+	setflag 721
+	setflag 889
+	setflag 726
+	setflag 867
+	setflag 731
+	setflag 732
+	setflag 814
+	setflag 868
+	setflag 739
+	setflag 881
+	setflag 738
+	setflag 740
+	setflag 741
+	setflag 743
+	setflag 744
+	setflag 906
+	setflag 737
+	setflag 747
+	setflag 748
+	setflag 749
+	setflag 756
+	setflag 774
+	setflag 895
+	setflag 776
+	setflag 777
+	setflag 778
+	setflag 779
+	setflag 780
+	setflag 781
+	setflag 782
+	setflag 783
+	setflag 734
+	setflag 849
+	setflag 789
+	setflag 790
+	setflag 791
+	setflag 792
+	setflag 797
+	setflag 798
+	setflag 799
+	setflag 901
+	setflag 902
+	setflag 903
+	setflag 904
+	setflag 800
+	setflag 801
+	setflag 803
+	setflag 802
+	setflag 806
+	setflag 808
+	setflag 809
+	setflag 984
+	setflag 811
+	setflag 812
+	setflag 866
+	setflag 815
+	setflag 816
+	setflag 869
+	setflag 823
+	setflag 828
+	setflag 829
+	setflag 831
+	setflag 859
+	setflag 841
+	setflag 843
+	setflag 844
+	setflag 847
+	setflag 845
+	setflag 846
+	setflag 860
+	setflag 861
+	setflag 835
+	setflag 840
+	setflag 848
+	setflag 851
+	setflag 855
+	setflag 856
+	setflag 973
+	setflag 870
+	setflag 872
+	setflag 877
+	setflag 879
+	setflag 891
+	setflag 880
+	setflag 878
+	setflag 807
+	setflag 983
+	setflag 886
+	setflag 884
+	setflag 885
+	setflag 961
+	setflag 888
+	setflag 941
+	setflag 752
+	setflag 757
+	setflag 892
+	setflag 896
+	setflag 897
+	setflag 898
+	setflag 909
+	setflag 910
+	setflag 911
+	setflag 915
+	setflag 912
+	setflag 920
+	setflag 921
+	setflag 922
+	setflag 923
+	setflag 925
+	setflag 929
+	setflag 930
+	setflag 934
+	setflag 939
+	setflag 940
+	setflag 928
+	setflag 834
+	setflag 944
+	setflag 945
+	setflag 947
+	setflag 948
+	setflag 858
+	setflag 950
+	setflag 968
+	setflag 1133
+	setflag 727
+	setflag 979
+	setflag 751
+	setflag 991
+	call Event_ResetBerryTrees
+	end
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag 925
@@ -832,14 +1318,61 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
 	setflag 2141
 	return
 
-	.global gUnknown_0819FC74
-gUnknown_0819FC74: @ 819FC74
-	.incbin "baserom.gba", 0x0019fc74, 0x2b
+gUnknown_0819FC74:: @ 819FC74
+	call EverGrandeCity_HallOfFame_EventScript_19FD09
+	call EventScript_19FC84
+	jump gUnknown_0819FC9F
+	end
 
-	.global gUnknown_0819FC9F
-gUnknown_0819FC9F: @ 819FC9F
+EventScript_19FC84:
+	checkflag 221
+	jumpeq Route101_EventScript_1A14DC
+	checkflag 1213
+	jumpif 0, Route101_EventScript_1A14DC
+	clearflag 929
+	setvar 0x4053, 2
+	return
 
-	.incbin "baserom.gba", 0x19fc9f, 0x6a
+gUnknown_0819FC9F:: @ 819FC9F
+	compare 0x4096, 1
+	jumpeq EventScript_19FCC1
+	compare 0x4096, 2
+	jumpeq EventScript_19FCD7
+	compare 0x4096, 3
+	jumpeq EventScript_19FCF0
+	end
+
+EventScript_19FCC1:
+	setflag 740
+	setflag 743
+	setflag 741
+	setflag 744
+	clearflag 742
+	clearflag 739
+	clearflag 881
+	end
+
+EventScript_19FCD7:
+	setflag 741
+	setflag 744
+	setflag 738
+	setflag 742
+	setflag 739
+	setflag 881
+	clearflag 740
+	clearflag 743
+	end
+
+EventScript_19FCF0:
+	setflag 738
+	setflag 742
+	setflag 739
+	setflag 881
+	setflag 740
+	setflag 743
+	clearflag 741
+	clearflag 744
+	end
 
 EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
 	clearflag 1245
@@ -1137,9 +1670,75 @@ UnusedMixRecordsScript_Done: @ 81A0000
 	release
 	end
 
-	.global gUnknown_081A0009
-gUnknown_081A0009: @ 81A0009
-	.incbin "baserom.gba", 0x1a0009, 0xd8
+gUnknown_081A0009:: @ 81A0009
+	lockall
+	setvar 0x8004, 0
+	special 214
+	playsfx 4
+	msgbox UnknownString_81A09EC, 4
+	jump EventScript_1A0023
+	end
+
+EventScript_1A0023:
+	message UnknownString_81A0A01
+	waittext
+	special 262
+	waitstate
+	jump EventScript_1A0033
+	end
+
+EventScript_1A0033:
+	switch RESULT
+	case 0, EventScript_1A0085
+	case 1, EventScript_1A0070
+	case 2, EventScript_1A00CB
+	case 3, EventScript_1A00BE
+	case 127, EventScript_1A00BE
+	end
+
+EventScript_1A0070:
+	playsfx 2
+	msgbox UnknownString_81A0A54, 4
+	special 250
+	waitstate
+	jump EventScript_1A0023
+	end
+
+EventScript_1A0085:
+	playsfx 2
+	checkflag 2123
+	callif 0, EventScript_1A00AC
+	checkflag 2123
+	callif 1, EventScript_1A00B5
+	msgbox UnknownString_81A0A35, 4
+	special 60
+	waitstate
+	jump EventScript_1A0023
+	end
+
+EventScript_1A00AC:
+	msgbox UnknownString_81A0A1E, 4
+	return
+
+EventScript_1A00B5:
+	msgbox UnknownString_81A0A66, 4
+	return
+
+EventScript_1A00BE:
+	setvar 0x8004, 0
+	playsfx 3
+	special 215
+	releaseall
+	end
+
+EventScript_1A00CB:
+	checkflag 2052
+	jumpif 0, EventScript_1A00BE
+	playsfx 2
+	special 263
+	waitstate
+	jump EventScript_1A0033
+	end
 
 FallarborTown_EventScript_1A00E1:: @ 81A00E1
 FortreeCity_EventScript_1A00E1:: @ 81A00E1
@@ -1492,10 +2091,14 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 0
 	return
 
-	.global gUnknown_081A02D6
-gUnknown_081A02D6: @ 81A02D6
-
-	.incbin "baserom.gba", 0x1a02d6, 0x11
+Event_WorldMap:: @ 81A02D6
+	lockall
+	msgbox UnknownString_817303D, 4
+	fadescreen 1
+	special 251
+	waitstate
+	releaseall
+	end
 
 DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
@@ -1586,8 +2189,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
 	copyvar 0x800a, RESULT
-	buffernum 0, 32776
-	buffernum 1, 32777
+	buffernum 0, 0x8008
+	buffernum 1, 0x8009
 	msgbox Route101_Text_1C44DC, 4
 	call Route101_EventScript_1A03A5
 	compare 0x800a, 0
@@ -1596,8 +2199,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0
 	specialval RESULT, 212
 	copyvar 0x8008, 0x8005
 	copyvar 0x8009, 0x8006
-	buffernum 0, 32776
-	buffernum 1, 32777
+	buffernum 0, 0x8008
+	buffernum 1, 0x8009
 	msgbox Route101_Text_1C4B05, 4
 	return
 
@@ -1640,7 +2243,20 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442
 	setflag 199
 	return
 
-	.incbin "baserom.gba", 0x1a0457, 0x25
+EventScript_1A0457: @ unreferenced?
+	pause 30
+	move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	waitmove 0
+	spritevisible 255, 0, 0
+	pause 30
+	move 255, Movement_1A047A
+	waitmove 0
+	pause 30
+	return
+
+Movement_1A047A:
+	step_up
+	step_end
 
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
@@ -1678,7 +2294,11 @@ CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
 	jump CaveOfOrigin_B2F_EventScript_1A04D3
 	end
 
-	.incbin "baserom.gba", 0x1a04c7, 0xc
+@ 81A04C7
+	lockall
+	setvar 0x4003, 1
+	jump CaveOfOrigin_B2F_EventScript_1A04D3
+	end
 
 CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
@@ -2505,7 +3125,7 @@ Route111_Text_1A0F93:: @ 81A0F93
 	.string "The sandstorm is vicious.\n"
 	.string "It’s impossible to keep going.$"
 
-UnknownString_81A0FCC: @ 81A0FCC
+Text_NoRegisteredItem: @ 81A0FCC
 	.string "An item in the BAG can be registered\n"
 	.string "on SELECT for convenience.$"
 
@@ -2531,10 +3151,7 @@ RustboroCity_DevonCorp_2F_Text_1A1102:: @ 81A1102
 	.string "Want to give a nickname to the\n"
 	.string "{STR_VAR_2} you received?$"
 
-	.global gUnknown_081A1132
-gUnknown_081A1132: @ 81A1132
-
-UnknownString_81A1132: @ 81A1132
+UnknownString_81A1132:: @ 81A1132
 	.string "{STR_VAR_1} fainted...\p$"
 
 UnknownString_81A1141: @ 81A1141
@@ -2580,14 +3197,29 @@ FallarborTown_House1_Text_1A1498:: @ 81A1498
 	.string "{PLAYER} handed over the\n"
 	.string "{STR_VAR_1}.$"
 
-	.global gUnknown_081A14AF
-gUnknown_081A14AF: @ 81A14AF
-	.incbin "baserom.gba", 0x001a14af, 0x9
+Event_NoRegisteredItem:: @ 81A14AF
+	msgbox Text_NoRegisteredItem, 3
+	end
 
-	.global gUnknown_081A14B8
-gUnknown_081A14B8: @ 81A14B8
+gUnknown_081A14B8:: @ 81A14B8
+	lockall
+	special 199
+	waitstate
+	compare RESULT, 1
+	jumpeq EventScript_1A14CA
+	releaseall
+	end
 
-	.incbin "baserom.gba", 0x1a14b8, 0x24
+EventScript_1A14CA::
+	message UnknownString_81A1141
+	waittext
+	waitbutton
+	special 332
+	waitstate
+	fadescreen 1
+	special 200
+	waitstate
+	end
 
 OldaleTown_PokemonCenter_1F_EventScript_1A14DC:: @ 81A14DC
 PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC
@@ -2694,7 +3326,7 @@ Route102_EventScript_1A15F2:: @ 81A15F2
 	return
 
 Route102_EventScript_1A15F9:: @ 81A15F9
-	buffernum 1, 32774
+	buffernum 1, 0x8006
 	lock
 	faceplayer
 	msgbox Route102_Text_1A17C0, 5
@@ -2733,10 +3365,12 @@ Route102_EventScript_1A164B:: @ 81A164B
 	release
 	end
 
-	.global gUnknown_081A1654
-gUnknown_081A1654: @ 81A1654
-
-	.incbin "baserom.gba", 0x1a1654, 0xb
+gUnknown_081A1654:: @ 81A1654
+	lockall
+	special 43
+	call Route102_EventScript_1A16A9
+	releaseall
+	end
 
 Route102_EventScript_1A165F:: @ 81A165F
 	checkitem ITEM_WAILMER_PAIL, 1
@@ -2752,10 +3386,9 @@ Route102_EventScript_1A168D:: @ 81A168D
 	releaseall
 	end
 
-	.global gUnknown_081A168F
-gUnknown_081A168F: @ 81A168F
-
-	.incbin "baserom.gba", 0x1a168f, 0x4
+gUnknown_081A168F:: @ 81A168F
+	special 43
+	lockall
 
 Route102_EventScript_1A1693:: @ 81A1693
 	message Route102_Text_1A1912
@@ -2890,10 +3523,7 @@ SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97
 	.string "Hunh?\n"
 	.string "Oh, you can’t now...$"
 
-	.global gUnknown_081A1BB2
-gUnknown_081A1BB2: @ 81A1BB2
-
-UnknownString_81A1BB2: @ 81A1BB2
+UnknownString_81A1BB2:: @ 81A1BB2
 	.string "Waaargh! You’re too strong!\n"
 	.string "About me losing... Please keep it secret!$"
 
@@ -2921,10 +3551,7 @@ SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59
 	.string "Oh...\n"
 	.string "You can’t now, okay.$"
 
-	.global gUnknown_081A1D74
-gUnknown_081A1D74: @ 81A1D74
-
-UnknownString_81A1D74: @ 81A1D74
+UnknownString_81A1D74:: @ 81A1D74
 	.string "Hmmm... It’s our loss...\n"
 	.string "But don’t tell anyone!\l"
 	.string "It’s a confidential secret!$"
@@ -2955,10 +3582,7 @@ SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E
 	.string "Hunh? Is that right?\n"
 	.string "You’re not interested in this spot?$"
 
-	.global gUnknown_081A1F67
-gUnknown_081A1F67: @ 81A1F67
-
-UnknownString_81A1F67: @ 81A1F67
+UnknownString_81A1F67:: @ 81A1F67
 	.string "I can’t keep going!\n"
 	.string "I surrender!$"
 
@@ -2985,10 +3609,7 @@ SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE
 	.string "Oh.\n"
 	.string "Some other time, then!$"
 
-	.global gUnknown_081A20C9
-gUnknown_081A20C9: @ 81A20C9
-
-UnknownString_81A20C9: @ 81A20C9
+UnknownString_81A20C9:: @ 81A20C9
 	.string "Hmm... I’ve still got lots to learn.\n"
 	.string "I have to study some more.$"
 
@@ -3014,10 +3635,7 @@ SecretBase_RedCave1_Text_1A2220:: @ 81A2220
 SecretBase_RedCave1_Text_1A2230:: @ 81A2230
 	.string "When you’re ready, give me a shout!$"
 
-	.global gUnknown_081A2254
-gUnknown_081A2254: @ 81A2254
-
-UnknownString_81A2254: @ 81A2254
+UnknownString_81A2254:: @ 81A2254
 	.string "Aww! Done in!\n"
 	.string "But it’s still fun to battle!$"
 
@@ -3049,10 +3667,7 @@ SecretBase_RedCave1_Text_1A2420:: @ 81A2420
 	.string "Oh.\n"
 	.string "How disappointing...$"
 
-	.global gUnknown_081A2439
-gUnknown_081A2439: @ 81A2439
-
-UnknownString_81A2439: @ 81A2439
+UnknownString_81A2439:: @ 81A2439
 	.string "I concede...$"
 
 SecretBase_RedCave1_Text_1A2446:: @ 81A2446
@@ -3079,10 +3694,7 @@ SecretBase_RedCave1_Text_1A258A:: @ 81A258A
 	.string "Oh... Are you maybe tired from searching\n"
 	.string "for this place?$"
 
-	.global gUnknown_081A25C3
-gUnknown_081A25C3: @ 81A25C3
-
-UnknownString_81A25C3: @ 81A25C3
+UnknownString_81A25C3:: @ 81A25C3
 	.string "I went down...$"
 
 SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2
@@ -3108,10 +3720,7 @@ SecretBase_RedCave1_Text_1A2710:: @ 81A2710
 SecretBase_RedCave1_Text_1A2736:: @ 81A2736
 	.string "I’ll battle with you anytime.$"
 
-	.global gUnknown_081A2754
-gUnknown_081A2754: @ 81A2754
-
-UnknownString_81A2754: @ 81A2754
+UnknownString_81A2754:: @ 81A2754
 	.string "Huh?\n"
 	.string "Did I just lose?$"
 
@@ -3140,10 +3749,7 @@ SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4
 	.string "I guess there are times when you’re not\n"
 	.string "into it.$"
 
-	.global gUnknown_081A2925
-gUnknown_081A2925: @ 81A2925
-
-UnknownString_81A2925: @ 81A2925
+UnknownString_81A2925:: @ 81A2925
 	.string "I know exactly what you’re made of now.$"
 
 SecretBase_RedCave1_Text_1A294D:: @ 81A294D
@@ -3173,10 +3779,7 @@ SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB
 	.string "I’ll be happy to demonstrate my style\n"
 	.string "anytime.$"
 
-	.global gUnknown_081A2B2A
-gUnknown_081A2B2A: @ 81A2B2A
-
-UnknownString_81A2B2A: @ 81A2B2A
+UnknownString_81A2B2A:: @ 81A2B2A
 	.string "You’re supremely talented!\n"
 	.string "Your power seems to be limitless...$"
 
@@ -3192,22 +3795,134 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
 	.string "What do you think of my taste?\n"
 	.string "Are you speechless?$"
 
-	.global gUnknown_081A2C51
-gUnknown_081A2C51: @ 81A2C51
-	.incbin "baserom.gba", 0x001a2c51, 0x95
+gUnknown_081A2C51:: @ 81A2C51
+	special 21
+	special 7
+	compare RESULT, 1
+	jumpeq EventScript_1A2E45
+	checkattack MOVE_SECRET_POWER
+	setanimation 0, RESULT
+	bufferattack 1, MOVE_SECRET_POWER
+	compare 0x8007, 1
+	jumpeq EventScript_1A2CB0
+	compare 0x8007, 2
+	jumpeq EventScript_1A2CB0
+	compare 0x8007, 3
+	jumpeq EventScript_1A2CB0
+	compare 0x8007, 4
+	jumpeq EventScript_1A2CB0
+	compare 0x8007, 5
+	jumpeq EventScript_1A2D08
+	compare 0x8007, 6
+	jumpeq EventScript_1A2D60
+	end
+
+EventScript_1A2CB0:
+	lockall
+	compare RESULT, 6
+	jumpeq EventScript_1A2CF1
+	bufferpartypoke 0, RESULT
+	msgbox UnknownString_8198F34, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, 4
+	closebutton
+	doanimation 11
+	waitstate
+	jump EventScript_1A2CFA
+	end
+
+gUnknown_081A2CE6:: @ 81A2CE6
+	lockall
+	doanimation 11
+	waitstate
+	jump EventScript_1A2CFA
+	end
+
+EventScript_1A2CF1:
+	msgbox UnknownString_8198F10, 3
+	end
+
+EventScript_1A2CFA:
+	msgbox UnknownString_8198F6E, 4
+	jump EventScript_1A2DB8
+	end
+
+EventScript_1A2D08:
+	lockall
+	compare RESULT, 6
+	jumpeq EventScript_1A2D49
+	bufferpartypoke 0, RESULT
+	msgbox UnknownString_81A197B, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, 4
+	closebutton
+	doanimation 26
+	waitstate
+	jump EventScript_1A2D52
+	end
 
-	.global gUnknown_081A2CE6
-gUnknown_081A2CE6: @ 81A2CE6
-	.incbin "baserom.gba", 0x001a2ce6, 0x58
+gUnknown_081A2D3E:: @ 81A2D3E
+	lockall
+	doanimation 26
+	waitstate
+	jump EventScript_1A2D52
+	end
 
-	.global gUnknown_081A2D3E
-gUnknown_081A2D3E: @ 81A2D3E
-	.incbin "baserom.gba", 0x001a2d3e, 0x58
+EventScript_1A2D49:
+	msgbox UnknownString_81A1948, 3
+	end
 
-	.global gUnknown_081A2D96
-gUnknown_081A2D96: @ 81A2D96
+EventScript_1A2D52:
+	msgbox UnknownString_81A19C4, 4
+	jump EventScript_1A2DB8
+	end
 
-	.incbin "baserom.gba", 0x1a2d96, 0x48
+EventScript_1A2D60:
+	lockall
+	compare RESULT, 6
+	jumpeq EventScript_1A2DA1
+	bufferpartypoke 0, RESULT
+	msgbox UnknownString_81A1A4B, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, 4
+	closebutton
+	doanimation 27
+	waitstate
+	jump EventScript_1A2DAA
+	end
+
+gUnknown_081A2D96:: @ 81A2D96
+	lockall
+	doanimation 27
+	waitstate
+	jump EventScript_1A2DAA
+	end
+
+EventScript_1A2DA1:
+	msgbox UnknownString_81A1A03, 3
+	end
+
+EventScript_1A2DAA:
+	msgbox UnknownString_81A1AA9, 4
+	jump EventScript_1A2DB8
+	end
+
+EventScript_1A2DB8:
+	closebutton
+	playsfx 9
+	setvar 0x4097, 0
+	setflag 173
+	special 6
+	special 8
+	setvar 0x8004, 0
+	setvar 0x8005, 0
+	special 18
+	setvar 0x4089, 1
+	waitstate
+	end
 
 SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 	move 255, SecretBase_RedCave1_Movement_1A2E11
@@ -3233,10 +3948,86 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
 	step_up
 	step_end
 
-	.global gUnknown_081A2E14
-gUnknown_081A2E14: @ 81A2E14
+gUnknown_081A2E14:: @ 81A2E14
+	lockall
+	setvar 0x4097, 1
+	playsfx 9
+	special 11
+	compare RESULT, 0
+	jumpeq EventScript_1A2E38
+	clearflag 173
+	special 8
+	setvar 0x4089, 0
+	waitstate
+	end
+
+EventScript_1A2E38:
+	setflag 173
+	special 8
+	setvar 0x4089, 0
+	waitstate
+	end
+
+EventScript_1A2E45:
+	checkattack MOVE_SECRET_POWER
+	compare RESULT, 6
+	jumpeq EventScript_1A2EF7
+	setanimation 0, RESULT
+	setorcopyvar 0x8004, RESULT
+	lockall
+	special 278
+	msgbox UnknownString_81A3C71, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	msgbox UnknownString_81A38FB, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	fadescreen 1
+	special 330
+	closebutton
+	fadescreen 0
+	msgbox UnknownString_81A3CC9, 5
+	compare RESULT, 0
+	jumpeq EventScript_1A2F3A
+	bufferpartypoke 0, 0x8004
+	bufferattack 1, MOVE_SECRET_POWER
+	msgbox UsedCutRockSmashText, 4
+	closebutton
+	closebutton
+	compare 0x8007, 1
+	jumpeq gUnknown_081A2CE6
+	compare 0x8007, 2
+	jumpeq gUnknown_081A2CE6
+	compare 0x8007, 3
+	jumpeq gUnknown_081A2CE6
+	compare 0x8007, 4
+	jumpeq gUnknown_081A2CE6
+	compare 0x8007, 5
+	jumpeq gUnknown_081A2D3E
+	compare 0x8007, 6
+	jumpeq gUnknown_081A2D96
+	releaseall
+	end
 
-	.incbin "baserom.gba", 0x1a2e14, 0x129
+EventScript_1A2EF7::
+	compare 0x8007, 1
+	jumpeq EventScript_1A2CF1
+	compare 0x8007, 2
+	jumpeq EventScript_1A2CF1
+	compare 0x8007, 3
+	jumpeq EventScript_1A2CF1
+	compare 0x8007, 4
+	jumpeq EventScript_1A2CF1
+	compare 0x8007, 5
+	jumpeq EventScript_1A2D49
+	compare 0x8007, 6
+	jumpeq EventScript_1A2DA1
+	end
+
+EventScript_1A2F3A::
+	closebutton
+	releaseall
+	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
 LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
@@ -3266,14 +4057,34 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68
 	setvar 0x4089, 1
 	end
 
-	.global gUnknown_081A2F7B
-gUnknown_081A2F7B: @ 81A2F7B
-	.incbin "baserom.gba", 0x001a2f7b, 0xf
+gUnknown_081A2F7B:: @ 81A2F7B
+	setvar 0x8005, 0
+	jump EventScript_1A2F86
+	end
+
+EventScript_1A2F86:
+	special 19
+	end
 
-	.global gUnknown_081A2F8A
-gUnknown_081A2F8A: @ 81A2F8A
+gUnknown_081A2F8A:: @ 81A2F8A
+	setvar 0x8004, 0
+	jump EventScript_1A2F95
+	end
+
+EventScript_1A2F95:
+	special 23
+	compare RESULT, 1
+	jumpeq EventScript_1A2FBF
+	addvar 0x8004, 1
+	compare 0x8005, 0
+	jumpeq EventScript_1A2F95
+	disappear 0x8006
+	setflag 0x8005
+	jump EventScript_1A2F95
+	end
 
-	.incbin "baserom.gba", 0x1a2f8a, 0x36
+EventScript_1A2FBF:
+	end
 
 SecretBase_BlueCave1_EventScript_1A2FC0:: @ 81A2FC0
 SecretBase_BlueCave2_EventScript_1A2FC0:: @ 81A2FC0
@@ -4450,9 +5261,13 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
 	step_02
 	step_end
 
-	.global gUnknown_081A4363
-gUnknown_081A4363: @ 81A4363
-	.incbin "baserom.gba", 0x001a4363, 0xc
+gUnknown_081A4363:: @ 81A4363
+	lockall
+	special 196
+	waitbutton
+	hidebox 0, 0, 29, 19
+	releaseall
+	end
 
 	.global gUnknown_081A436F
 gUnknown_081A436F: @ 81A436F
@@ -4549,7 +5364,17 @@ TradeCenter_EventScript_1A43FA:: @ 81A43FA
 	waitstate
 	end
 
-	.incbin "baserom.gba", 0x1a4404, 0x14
+@ 81A4404
+	setvar 0x8005, 2
+	special 33
+	waitstate
+	end
+
+@ 81A440E
+	setvar 0x8005, 3
+	special 33
+	waitstate
+	end
 
 	.global gUnknown_081A4418
 gUnknown_081A4418: @ 81A4418
@@ -4603,18 +5428,30 @@ RecordCorner_EventScript_1A446C:: @ 81A446C
 	releaseall
 	end
 
-	.global gUnknown_081A4479
-gUnknown_081A4479: @ 81A4479
-	.incbin "baserom.gba", 0x001a4479, 0xe
-
-	.global gUnknown_081A4487
-gUnknown_081A4487: @ 81A4487
-	.incbin "baserom.gba", 0x001a4487, 0xe
+gUnknown_081A4479:: @ 81A4479
+	message UnknownString_81A4D1C
+	waittext
+	waitbutton
+	fadescreen 1
+	special 42
+	waitstate
+	end
 
-	.global gUnknown_081A4495
-gUnknown_081A4495: @ 81A4495
+gUnknown_081A4487:: @ 81A4487
+	message UnknownString_81A4D45
+	waittext
+	waitbutton
+	fadescreen 1
+	special 42
+	waitstate
+	end
 
-	.incbin "baserom.gba", 0x1a4495, 0x9
+gUnknown_081A4495:: @ 81A4495
+	message UnknownString_81A4CF6
+	waittext
+	waitbutton
+	closebutton
+	end
 
 SingleBattleColosseum_EventScript_1A449E:: @ 81A449E
 	special 295
@@ -4654,18 +5491,24 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6
 	closebutton
 	end
 
-	.global gUnknown_081A44E5
-gUnknown_081A44E5: @ 81A44E5
-	.incbin "baserom.gba", 0x001a44e5, 0x19
-
-	.global gUnknown_081A44FE
-gUnknown_081A44FE: @ 81A44FE
-	.incbin "baserom.gba", 0x001a44fe, 0xa
+gUnknown_081A44E5:: @ 81A44E5
+	msgbox UnknownString_81A4C6E, 5
+	compare RESULT, 1
+	jumpeq gUnknown_081A44FE
+	hidebox 0, 0, 29, 19
+	end
 
-	.global gUnknown_081A4508
-gUnknown_081A4508: @ 81A4508
+gUnknown_081A44FE:: @ 81A44FE
+	message2 UnknownString_81A4CAF
+	waittext
+	special 5
+	end
 
-	.incbin "baserom.gba", 0x1a4508, 0x8
+gUnknown_081A4508:: @ 81A4508
+	special 4
+	special 3
+	waitstate
+	end
 
 OldaleTown_PokemonCenter_2F_Text_1A4510:: @ 81A4510
 	.string "Welcome to the POKéMON CABLE CLUB\n"
@@ -4840,7 +5683,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92
 	jumpif 5, FallarborTown_ContestLobby_EventScript_1A4F4E
 	checkflag 1
 	jumpeq FallarborTown_ContestLobby_EventScript_1A4F8F
-	bufferstd 0, 32779
+	bufferstd 0, 0x800b
 	msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
@@ -5089,8 +5932,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F
 	return
 
 LinkContestRoom1_EventScript_1A5245:: @ 81A5245
-	bufferstd 1, 32776
-	bufferstd 2, 32777
+	bufferstd 1, 0x8008
+	bufferstd 2, 0x8009
 	call LinkContestRoom1_EventScript_1A525F
 	lockall
 	move 1, LinkContestRoom1_Movement_1A5D87
@@ -5168,7 +6011,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311
 LinkContestRoom1_EventScript_1A5323:: @ 81A5323
 	special 81
 	addvar 0x8006, 1
-	buffernum 1, 32774
+	buffernum 1, 0x8006
 	lockall
 	move 0x800b, LinkContestRoom1_Movement_1A5D9C
 	waitmove 0
@@ -5179,7 +6022,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323
 	move 0x800b, LinkContestRoom1_Movement_1A5D9C
 	waitmove 0
 	releaseall
-	addvar 0x8006, 65535
+	addvar 0x8006, -1
 	playsfx 15
 	special 320
 	call LinkContestRoom1_EventScript_1A535E
@@ -5714,8 +6557,8 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
 	special 79
 	special 80
 	addvar 0x8005, 1
-	buffernum 1, 32773
-	addvar 0x8005, 65535
+	buffernum 1, 0x8005
+	addvar 0x8005, -1
 	call LinkContestRoom1_EventScript_1A5A75
 	move 0x4003, LinkContestRoom1_Movement_1A5D99
 	waitmove 0
@@ -6318,10 +7161,98 @@ FallarborTown_ContestLobby_Text_1A68C6:: @ 81A68C6
 	.string "later on.$"
 
 	.include "data/maps/text/LinkContestRoom1.s"
-	.global gUnknown_081A6E72
-gUnknown_081A6E72: @ 81A6E72
 
-	.incbin "baserom.gba", 0x1a6e72, 0x10a
+Event_TV:: @ 81A6E72
+	lockall
+	inccounter 44
+	special 75
+	specialval RESULT, 73
+	compare RESULT, 2
+	jumpeq EventScript_1A6F01
+	compare RESULT, 1
+	jumpeq EventScript_1A6F0B
+	checkflag 2098
+	jumpif 0, EventScript_1A6EF1
+	checkflag 2097
+	jumpeq EventScript_1A6EF1
+	specialval RESULT, 176
+	compare RESULT, 1
+	jumpeq EventScript_1A6F66
+	jump EventScript_1A6F50
+	end
+
+EventScript_1A6EBB:
+	specialval 0x8004, 65
+	compare 0x8004, 255
+	jumpeq EventScript_1A6F3F
+	specialval RESULT, 71
+	compare RESULT, 255
+	jumpeq EventScript_1A6F3F
+	copyvar 0x8004, RESULT
+	specialval RESULT, 66
+	compare RESULT, 0
+	jumpif 5, EventScript_1A6F21
+	end
+
+EventScript_1A6EF1:
+	special 74
+	msgbox UnknownString_81A0E68, 4
+	special 62
+	releaseall
+	end
+
+EventScript_1A6F01:
+	msgbox UnknownString_817288C, 4
+	releaseall
+	end
+
+EventScript_1A6F0B:
+	msgbox UnknownString_8172C50, 4
+	special 297
+	clearflag 2141
+	setflag 255
+	special 62
+	releaseall
+	end
+
+EventScript_1A6F21:
+	special 63
+	waittext
+	waitbutton
+	compare RESULT, 1
+	jumpif 5, EventScript_1A6F21
+	jump EventScript_1A6F37
+	end
+
+EventScript_1A6F37:
+	special 62
+	setflag 2097
+	releaseall
+	end
+
+EventScript_1A6F3F:
+	special 74
+	msgbox UnknownString_81A0E68, 4
+	jump EventScript_1A6F37
+	end
+
+EventScript_1A6F50:
+	special 64
+	compare RESULT, 0
+	jumpeq EventScript_1A6EBB
+	waittext
+	waitbutton
+	jump EventScript_1A6F37
+	end
+
+EventScript_1A6F66:
+	special 175
+	waittext
+	waitbutton
+	compare RESULT, 0
+	jumpeq EventScript_1A6F66
+	jump EventScript_1A6F37
+	end
 
 FallarborTown_ContestLobby_Text_1A6F7C:: @ 81A6F7C
 	.string "Oh, hello! You were in a POKéMON CONTEST,\n"
@@ -9459,8 +10390,6 @@ MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
 	.include "data/field_move_scripts.s"
 	.include "data/item_ball_scripts.s"
 
-	.incbin "baserom.gba", 0x1b1b07, 0xd
-
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14
 	lock
 	faceplayer
@@ -9919,12 +10848,25 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	release
 	end
 
-	.incbin "baserom.gba", 0x1b2591, 0x2b
-
-	.global gUnknown_081B25BC
-gUnknown_081B25BC: @ 81B25BC
+@ 81B2591
+	special 189
+	waitstate
+	compare RESULT, 2
+	jumpeq Route117_PokemonDayCare_EventScript_1B23D0
+	copyvar 0x8004, RESULT
+	specialval RESULT, 192
+	msgbox Route117_PokemonDayCare_Text_1B2B75, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+	release
+	end
 
-	.incbin "baserom.gba", 0x1b25bc, 0xf
+Event_EggHatch:: @ 81B25BC
+	lockall
+	msgbox UnknownString_81B2C68, 4
+	special 194
+	waitstate
+	releaseall
+	end
 
 Route117_Text_1B25CB:: @ 81B25CB
 	.string "I’m the DAY-CARE MAN.\p"
@@ -10469,9 +11411,10 @@ UnknownString_81B4818: @ 81B4818
 	.include "data/maps/text/CaveOfOrigin_B4F.s"
 	.include "data/maps/text/MtPyre_Summit.s"
 
-	.global gUnknown_081B694A
-gUnknown_081B694A: @ 81B694A
-	.incbin "baserom.gba", 0x1b694a, 0x6
+gUnknown_081B694A:: @ 81B694A
+	lighten 1
+	darken 1
+	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B6950:: @ 81B6950
 LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950
@@ -10990,10 +11933,9 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
 	step_28
 	step_end
 
-	.global gUnknown_081B6E5A
-gUnknown_081B6E5A: @ 81B6E5A
-
-	.incbin "baserom.gba", 0x1b6e5a, 0x9
+Event_RunningShoesManual:: @ 81B6E5A
+	msgbox UnknownString_81728E3, 3
+	end
 
 FallarborTown_ContestLobby_Text_1B6E63:: @ 81B6E63
 	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
@@ -11461,33 +12403,87 @@ FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A
 
 	.include "data/text/trainers.s"
 
-	.global gUnknown_081C33E6
-gUnknown_081C33E6: @ 81C33E6
-	.incbin "baserom.gba", 0x1C33E6, 0x9
+Event_RepelWoreOff:: @ 81C33E6
+	msgbox Text_RepelWoreOff, 3
+	end
 
-UnknownString_81C33EF: @ 81C33EF
+Text_RepelWoreOff: @ 81C33EF
 	.string "REPEL’s effect wore off...$"
 
-	.global gUnknown_081C340A
-gUnknown_081C340A: @ 81C340A
-	.incbin "baserom.gba", 0x001c340a, 0x23
+gUnknown_081C340A:: @ 81C340A
+	setvar 0x40a4, 1
+	special 206
+	warp3 Route121_SafariZoneEntrance, 255, 2, 5
+	end
+
+EventScript_1C341B: @ 81C341B
+	setvar 0x40a4, 1
+	special 206
+	warp Route121_SafariZoneEntrance, 255, 2, 5
+	waitstate
+	end
+
+gUnknown_081C342D:: @ 81C342D
+	lockall
+	msgbox UnknownString_81C34B2, 5
+	compare RESULT, 1
+	jumpeq EventScript_1C3443
+	releaseall
+	end
+
+EventScript_1C3443:
+	jump EventScript_1C341B
+
+gUnknown_081C3448:: @ 81C3448
+	lockall
+	playsfx 73
+	message UnknownString_81C34E4
+	waittext
+	waitbutton
+	releaseall
+	jump EventScript_1C341B
 
-	.global gUnknown_081C342D
-gUnknown_081C342D: @ 81C342D
-	.incbin "baserom.gba", 0x001c342d, 0x1b
+gUnknown_081C3459:: @ 81C3459
+	lockall
+	playsfx 73
+	message UnknownString_81C3514
+	waittext
+	waitbutton
+	releaseall
+	jump EventScript_1C341B
 
-	.global gUnknown_081C3448
-gUnknown_081C3448: @ 81C3448
-	.incbin "baserom.gba", 0x001c3448, 0x11
+gUnknown_081C346A:: @ 81C346A
+	lockall
+	special 207
+	compare RESULT, -1
+	jumpif 5, EventScript_1C34A9
+	msgbox UnknownString_81C354E, 5
+	compare RESULT, 1
+	jumpeq EventScript_1C348E
+	releaseall
+	end
 
-	.global gUnknown_081C3459
-gUnknown_081C3459: @ 81C3459
-	.incbin "baserom.gba", 0x001c3459, 0x11
+EventScript_1C348E:
+	fadescreen 1
+	special 208
+	waitstate
+	compare RESULT, -1
+	jumpif 5, EventScript_1C34A0
+	end
 
-	.global gUnknown_081C346A
-gUnknown_081C346A: @ 81C346A
+EventScript_1C34A0:
+	message UnknownString_81C35A9
+	waittext
+	waitbutton
+	releaseall
+	end
 
-	.incbin "baserom.gba", 0x1C346A, 0x48
+EventScript_1C34A9:
+	message UnknownString_81C3583
+	waittext
+	waitbutton
+	releaseall
+	end
 
 UnknownString_81C34B2: @ 81C34B2
 	.string "Would you like to exit the SAFARI ZONE\n"
@@ -11533,7 +12529,25 @@ SafariZone_Southwest_Text_1C3EA3:: @ 81C3EA3
 	.string "“Relieve your tired feet.”\n"
 	.string "REST HOUSE$"
 
-	.include "data/maps/text/SafariZone_RestHouse.s"
+SafariZone_RestHouse_Text_1C3EC9:: @ 81C3EC9
+	.string "I don’t have any {POKEBLOCK}S, but I caught\n"
+	.string "a good number of POKéMON.\p"
+	.string "You can improve your chances of making\n"
+	.string "a catch by getting closer to them\l"
+	.string "before throwing a SAFARI BALL.$"
+
+SafariZone_RestHouse_Text_1C3F71:: @ 81C3F71
+	.string "If you use {POKEBLOCK}S, wild POKéMON won’t\n"
+	.string "be so quick to run away.\p"
+	.string "It’s not much use to give {POKEBLOCK}S to\n"
+	.string "POKéMON that don’t flee easily.$"
+
+SafariZone_RestHouse_Text_1C3FF4:: @ 81C3FF4
+	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
+	.string "POKéMON are attracted to it.\p"
+	.string "I think POKéMON with the same sort of\n"
+	.string "nature are drawn by a certain {POKEBLOCK}.$"
+
 MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
 	checkitem ITEM_COIN_CASE, 1
 	compare RESULT, 0
@@ -11581,7 +12595,8 @@ UnknownString_81C4139: @ 81C4139
 
 	.global gUnknown_081C4157
 gUnknown_081C4157: @ 81C4157
-	.incbin "baserom.gba", 0x001c4157, 0x42
+	.string "Place your wager with the + Control Pad,\n"
+	.string "then press the A Button.$"
 
 	.global gUnknown_081C4199
 gUnknown_081C4199: @ 81C4199
@@ -11922,8 +12937,22 @@ LilycoveCity_Harbor_Text_1C5120:: @ 81C5120
 	.string "That shivers my timbers!\p"
 	.string "All aboard!$"
 
-	.include "data/maps/text/SouthernIsland_Exterior.s"
-	.include "data/maps/text/SouthernIsland_Interior.s"
+SouthernIsland_Exterior_Text_1C5215:: @ 81C5215
+	.string "Aye, mate, there’s nothing here to\n"
+	.string "see or do on this forgettable island.\p"
+	.string "What say we sail back to LILYCOVE?$"
+
+SouthernIsland_Exterior_Text_1C5281:: @ 81C5281
+	.string "Aye, right, then!\n"
+	.string "Sail home we will!$"
+
+SouthernIsland_Exterior_Text_1C52A6:: @ 81C52A6
+	.string "Aye, right, as you like, then.$"
+
+SouthernIsland_Interior_Text_1C52C5:: @ 81C52C5
+	.string "“All dreams are but another reality.\n"
+	.string "Never forget...”$"
+
 SouthernIsland_Exterior_Text_1C52FB:: @ 81C52FB
 	.string "“Those whose memories fade seek to\n"
 	.string "carve them in their hearts...”$"
@@ -12022,7 +13051,52 @@ LilycoveCity_Text_1C5B5D:: @ 81C5B5D
 	.string "The way dignified simplicity suits me,\n"
 	.string "{POKEBLOCK}S perfectly suit POKéMON.$"
 
-	.include "data/maps/text/Route123_BerryMastersHouse.s"
+Route123_BerryMastersHouse_Text_1C5BC4:: @ 81C5BC4
+	.string "You may call me the BERRY MASTER.\p"
+	.string "I dream of filling the world with\n"
+	.string "beautiful flowers, so I raise BERRIES\l"
+	.string "and hand them out to everyone.\p"
+	.string "You’re deserving of one!$"
+
+Route123_BerryMastersHouse_Text_1C5C66:: @ 81C5C66
+	.string "Why be stingy?\n"
+	.string "Take another!$"
+
+Route123_BerryMastersHouse_Text_1C5C83:: @ 81C5C83
+	.string "Be sure to visit the PRETTY PETAL\n"
+	.string "flower shop near RUSTBORO.\p"
+	.string "Let flowers fill the world!$"
+
+Route123_BerryMastersHouse_Text_1C5CDC:: @ 81C5CDC
+	.string "I’m done for today.\n"
+	.string "Come again another day.\p"
+	.string "Let flowers fill the world!$"
+
+Route123_BerryMastersHouse_Text_1C5D24:: @ 81C5D24
+	.string "The way my husband grows BERRIES,\n"
+	.string "oh, he’s the best in the world.\p"
+	.string "He makes me proud, that he does.\p"
+	.string "Incidentally, child, have you heard\n"
+	.string "a good saying lately?$"
+
+Route123_BerryMastersHouse_Text_1C5DC1:: @ 81C5DC1
+	.string "Ah! What a remarkable saying!\n"
+	.string "Inspirational, it is!\p"
+	.string "I want you to have this.$"
+
+Route123_BerryMastersHouse_Text_1C5E0E:: @ 81C5E0E
+	.string "Oh! A good saying it is.\n"
+	.string "You’re quite remarkable.\p"
+	.string "I want you to have this.$"
+
+Route123_BerryMastersHouse_Text_1C5E59:: @ 81C5E59
+	.string "Our four grandchildren should become\n"
+	.string "more accomplished than my husband.\p"
+	.string "Joy never goes out of my life!$"
+
+Route123_BerryMastersHouse_Text_1C5EC0:: @ 81C5EC0
+	.string "Ah...$"
+
 Route104_PrettyPetalFlowerShop_Text_1C5EC6:: @ 81C5EC6
 	.string "Hello!\p"
 	.string "This is the PRETTY PETAL flower shop.\n"
@@ -12121,10 +13195,52 @@ SootopolisCity_Text_1C6626:: @ 81C6626
 	.string "It doesn’t matter...\p"
 	.string "There’s so much that I want to know...$"
 
-	.include "data/maps/text/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideInnerRoom.s"
+ShoalCave_LowTideEntranceRoom_Text_1C6668:: @ 81C6668
+	.string "Are you planning on going deep in\n"
+	.string "there?\p"
+	.string "How about bringing me back some\n"
+	.string "SHOAL SALT and SHOAL SHELLS?\p"
+	.string "I can make you something good if\n"
+	.string "you bring me the ingredients.$"
+
+ShoalCave_LowTideEntranceRoom_Text_1C670D:: @ 81C670D
+	.string "If you bring me four each of the\n"
+	.string "SHOAL SALT and SHOAL SHELLS,\l"
+	.string "I can make you a SHELL BELL...\p"
+	.string "You can get those ingredients\n"
+	.string "every day.$"
+
+ShoalCave_LowTideEntranceRoom_Text_1C6793:: @ 81C6793
+	.string "Oh, hey! SHOAL SALT and SHOAL\n"
+	.string "SHELLS! And enough of them, too!\p"
+	.string "Would you like me to make you a\n"
+	.string "SHELL BELL with them?$"
+
+ShoalCave_LowTideEntranceRoom_Text_1C6808:: @ 81C6808
+	.string "All righty, then! I’ll make you a\n"
+	.string "SHELL BELL right away.\p"
+	.string "... ... ... ... ... ... ... ...\n"
+	.string "... ... ... ... ... ... ... ...\p"
+	.string "There! Done!$"
+
+ShoalCave_LowTideEntranceRoom_Text_1C688E:: @ 81C688E
+	.string "Have a POKéMON hold on to that.\n"
+	.string "It’ll love it, that’s for certain.\p"
+	.string "Why, the SHELL BELL’s chime...\n"
+	.string "It’s simply sublime!\p"
+	.string "You can get its ingredients every\n"
+	.string "day, so I can make you more.$"
+
+ShoalCave_LowTideEntranceRoom_Text_1C6944:: @ 81C6944
+	.string "Oh... Is that so...\n"
+	.string "I wanted to make a SHELL BELL...$"
+
+ShoalCave_LowTideInnerRoom_Text_1C6979:: @ 81C6979
 ShoalCave_LowTideLowerRoom_Text_1C6979:: @ 81C6979
-	.include "data/maps/text/ShoalCave_LowTideStairsRoom.s"
+ShoalCave_LowTideStairsRoom_Text_1C6979:: @ 81C6979
+	.string "There was some SHOAL SALT here.\n"
+	.string "But, there’s nothing here now.$"
+
 ShoalCave_LowTideInnerRoom_Text_1C69B8:: @ 81C69B8
 	.string "There was a SHOAL SHELL here.\n"
 	.string "But, there’s nothing here now.$"
@@ -12177,9 +13293,6 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
 	copyvar 0x4022, 0x1
 	end
 
-	.global gUnknown_081C6BC5
-gUnknown_081C6BC5: @ 81C6BC5
-
 GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
 	lockall
 	pause 20
@@ -12191,34 +13304,63 @@ GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5
 	waitstate
 	end
 
-	.global gUnknown_081C6BDE
-gUnknown_081C6BDE: @ 81C6BDE
-
-	.incbin "baserom.gba", 0x1c6bde, 0x19
+gUnknown_081C6BDE:: @ 81C6BDE
+	lockall
+	pause 20
+	move 255, GraniteCave_B1F_Movement_1C6BF7
+	waitmove 0
+	playsfx 43
+	pause 60
+	special 319
+	waitstate
+	end
 
 GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
 	step_54
 	step_end
 
-	.incbin "baserom.gba", 0x1c6bf9, 0x9
+@ 81C6BF9
+	msgbox Text_1C6C2B, 2
+	end
 
-	.global gUnknown_081C6C02
-gUnknown_081C6C02: @ 81C6C02
-	.incbin "baserom.gba", 0x001c6c02, 0x29
+gUnknown_081C6C02:: @ 81C6C02
+	msgbox Text_1C6C4B, 3
+	end
 
-@ 81C6C2B
+@ 81C6C0B
+	end
+
+@ 81C6C0C
+	msgbox Text_1C6C62, 3
+	end
+
+@ 81C6C15
+	lockall
+	call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
+	releaseall
+	end
+
+@ 81C6C1D
+	lockall
+	braillemsg Underwater_SealedChamber_Braille_1C533D
+	waitbutton
+	hidebox 0, 0, 29, 19
+	releaseall
+	end
+
+Text_1C6C2B: @ 81C6C2B
 	@ This is a test message!
 	@ Welcome to the world of Pokémon!
 	.string "テストよう　メッセージです！\n"
 	.string "ポケモンの　せかいへ　ようこそ！$"
 
-@ 81C6C4B
+Text_1C6C4B: @ 81C6C4B
 	@ This is a test message!
 	@ This is a sign.
 	.string "テストよう　メッセージです！\n"
 	.string "かんばん　です$"
 
-@ 81C6C62
+Text_1C6C62: @ 81C6C62
 	@ This is a test message!
 	@ This is a coordinate-check event.
 	.string "テストよう　メッセージです！\n"
@@ -12240,14 +13382,12 @@ UnknownString_81C6CA6: @ 81C6CA6
 
 	.global gUnknown_081C6CE1
 gUnknown_081C6CE1: @ 81C6CE1
-
 BattleTower_BattleRoom_Text_1C6CE1:: @ 81C6CE1
 	.string "SAVING...\n"
 	.string "DON’T TURN OFF THE POWER.$"
 
 	.global gUnknown_081C6D05
 gUnknown_081C6D05: @ 81C6D05
-
 BattleTower_BattleRoom_Text_1C6D05:: @ 81C6D05
 	.string "{PLAYER} saved the game.$"
 
diff --git a/data/item_ball_scripts.s b/data/item_ball_scripts.s
index c8aec1b2a..ad4386990 100644
--- a/data/item_ball_scripts.s
+++ b/data/item_ball_scripts.s
@@ -533,3 +533,7 @@ VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED
 VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA
 	giveitem ITEM_FULL_HEAL, 1, 1
 	end
+
+@ 81B1B07
+	giveitem ITEM_HM08, 1, 1
+	end
diff --git a/data/maps/text/Route117_PokemonDayCare.s b/data/maps/text/Route117_PokemonDayCare.s
index 58b5ac4bf..5445200cc 100644
--- a/data/maps/text/Route117_PokemonDayCare.s
+++ b/data/maps/text/Route117_PokemonDayCare.s
@@ -74,5 +74,5 @@ Route117_PokemonDayCare_Text_1B2C17:: @ 81B2C17
 UnknownString_81B2C68: @ 81B2C68
 	.string "Huh?$"
 
+@ XXX JP
 	.incbin "baserom.gba", 0x1B2C6D, 0x28
-
diff --git a/data/maps/text/Route123_BerryMastersHouse.s b/data/maps/text/Route123_BerryMastersHouse.s
index 6f958d50b..8b1378917 100644
--- a/data/maps/text/Route123_BerryMastersHouse.s
+++ b/data/maps/text/Route123_BerryMastersHouse.s
@@ -1,46 +1 @@
-Route123_BerryMastersHouse_Text_1C5BC4:: @ 81C5BC4
-	.string "You may call me the BERRY MASTER.\p"
-	.string "I dream of filling the world with\n"
-	.string "beautiful flowers, so I raise BERRIES\l"
-	.string "and hand them out to everyone.\p"
-	.string "You’re deserving of one!$"
-
-Route123_BerryMastersHouse_Text_1C5C66:: @ 81C5C66
-	.string "Why be stingy?\n"
-	.string "Take another!$"
-
-Route123_BerryMastersHouse_Text_1C5C83:: @ 81C5C83
-	.string "Be sure to visit the PRETTY PETAL\n"
-	.string "flower shop near RUSTBORO.\p"
-	.string "Let flowers fill the world!$"
-
-Route123_BerryMastersHouse_Text_1C5CDC:: @ 81C5CDC
-	.string "I’m done for today.\n"
-	.string "Come again another day.\p"
-	.string "Let flowers fill the world!$"
-
-Route123_BerryMastersHouse_Text_1C5D24:: @ 81C5D24
-	.string "The way my husband grows BERRIES,\n"
-	.string "oh, he’s the best in the world.\p"
-	.string "He makes me proud, that he does.\p"
-	.string "Incidentally, child, have you heard\n"
-	.string "a good saying lately?$"
-
-Route123_BerryMastersHouse_Text_1C5DC1:: @ 81C5DC1
-	.string "Ah! What a remarkable saying!\n"
-	.string "Inspirational, it is!\p"
-	.string "I want you to have this.$"
-
-Route123_BerryMastersHouse_Text_1C5E0E:: @ 81C5E0E
-	.string "Oh! A good saying it is.\n"
-	.string "You’re quite remarkable.\p"
-	.string "I want you to have this.$"
-
-Route123_BerryMastersHouse_Text_1C5E59:: @ 81C5E59
-	.string "Our four grandchildren should become\n"
-	.string "more accomplished than my husband.\p"
-	.string "Joy never goes out of my life!$"
-
-Route123_BerryMastersHouse_Text_1C5EC0:: @ 81C5EC0
-	.string "Ah...$"
 
diff --git a/data/maps/text/SafariZone_RestHouse.s b/data/maps/text/SafariZone_RestHouse.s
index e3d14d9a3..8b1378917 100644
--- a/data/maps/text/SafariZone_RestHouse.s
+++ b/data/maps/text/SafariZone_RestHouse.s
@@ -1,19 +1 @@
-SafariZone_RestHouse_Text_1C3EC9:: @ 81C3EC9
-	.string "I don’t have any {POKEBLOCK}S, but I caught\n"
-	.string "a good number of POKéMON.\p"
-	.string "You can improve your chances of making\n"
-	.string "a catch by getting closer to them\l"
-	.string "before throwing a SAFARI BALL.$"
-
-SafariZone_RestHouse_Text_1C3F71:: @ 81C3F71
-	.string "If you use {POKEBLOCK}S, wild POKéMON won’t\n"
-	.string "be so quick to run away.\p"
-	.string "It’s not much use to give {POKEBLOCK}S to\n"
-	.string "POKéMON that don’t flee easily.$"
-
-SafariZone_RestHouse_Text_1C3FF4:: @ 81C3FF4
-	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
-	.string "POKéMON are attracted to it.\p"
-	.string "I think POKéMON with the same sort of\n"
-	.string "nature are drawn by a certain {POKEBLOCK}.$"
 
diff --git a/data/maps/text/ShoalCave_LowTideEntranceRoom.s b/data/maps/text/ShoalCave_LowTideEntranceRoom.s
index bd40b25f2..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideEntranceRoom.s
+++ b/data/maps/text/ShoalCave_LowTideEntranceRoom.s
@@ -1,40 +1 @@
-ShoalCave_LowTideEntranceRoom_Text_1C6668:: @ 81C6668
-	.string "Are you planning on going deep in\n"
-	.string "there?\p"
-	.string "How about bringing me back some\n"
-	.string "SHOAL SALT and SHOAL SHELLS?\p"
-	.string "I can make you something good if\n"
-	.string "you bring me the ingredients.$"
-
-ShoalCave_LowTideEntranceRoom_Text_1C670D:: @ 81C670D
-	.string "If you bring me four each of the\n"
-	.string "SHOAL SALT and SHOAL SHELLS,\l"
-	.string "I can make you a SHELL BELL...\p"
-	.string "You can get those ingredients\n"
-	.string "every day.$"
-
-ShoalCave_LowTideEntranceRoom_Text_1C6793:: @ 81C6793
-	.string "Oh, hey! SHOAL SALT and SHOAL\n"
-	.string "SHELLS! And enough of them, too!\p"
-	.string "Would you like me to make you a\n"
-	.string "SHELL BELL with them?$"
-
-ShoalCave_LowTideEntranceRoom_Text_1C6808:: @ 81C6808
-	.string "All righty, then! I’ll make you a\n"
-	.string "SHELL BELL right away.\p"
-	.string "... ... ... ... ... ... ... ...\n"
-	.string "... ... ... ... ... ... ... ...\p"
-	.string "There! Done!$"
-
-ShoalCave_LowTideEntranceRoom_Text_1C688E:: @ 81C688E
-	.string "Have a POKéMON hold on to that.\n"
-	.string "It’ll love it, that’s for certain.\p"
-	.string "Why, the SHELL BELL’s chime...\n"
-	.string "It’s simply sublime!\p"
-	.string "You can get its ingredients every\n"
-	.string "day, so I can make you more.$"
-
-ShoalCave_LowTideEntranceRoom_Text_1C6944:: @ 81C6944
-	.string "Oh... Is that so...\n"
-	.string "I wanted to make a SHELL BELL...$"
 
diff --git a/data/maps/text/ShoalCave_LowTideInnerRoom.s b/data/maps/text/ShoalCave_LowTideInnerRoom.s
index b79e0e805..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideInnerRoom.s
+++ b/data/maps/text/ShoalCave_LowTideInnerRoom.s
@@ -1 +1 @@
-ShoalCave_LowTideInnerRoom_Text_1C6979:: @ 81C6979
+
diff --git a/data/maps/text/ShoalCave_LowTideStairsRoom.s b/data/maps/text/ShoalCave_LowTideStairsRoom.s
index 6bad21fed..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideStairsRoom.s
+++ b/data/maps/text/ShoalCave_LowTideStairsRoom.s
@@ -1,4 +1 @@
-ShoalCave_LowTideStairsRoom_Text_1C6979:: @ 81C6979
-	.string "There was some SHOAL SALT here.\n"
-	.string "But, there’s nothing here now.$"
 
diff --git a/data/maps/text/SouthernIsland_Exterior.s b/data/maps/text/SouthernIsland_Exterior.s
index 5a8a0bfc8..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Exterior.s
+++ b/data/maps/text/SouthernIsland_Exterior.s
@@ -1,12 +1 @@
-SouthernIsland_Exterior_Text_1C5215:: @ 81C5215
-	.string "Aye, mate, there’s nothing here to\n"
-	.string "see or do on this forgettable island.\p"
-	.string "What say we sail back to LILYCOVE?$"
-
-SouthernIsland_Exterior_Text_1C5281:: @ 81C5281
-	.string "Aye, right, then!\n"
-	.string "Sail home we will!$"
-
-SouthernIsland_Exterior_Text_1C52A6:: @ 81C52A6
-	.string "Aye, right, as you like, then.$"
 
diff --git a/data/maps/text/SouthernIsland_Interior.s b/data/maps/text/SouthernIsland_Interior.s
index d4a340435..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Interior.s
+++ b/data/maps/text/SouthernIsland_Interior.s
@@ -1,4 +1 @@
-SouthernIsland_Interior_Text_1C52C5:: @ 81C52C5
-	.string "“All dreams are but another reality.\n"
-	.string "Never forget...”$"