Extract more baseroms from maps

8 files changed, 24 insertions, 20 deletions

diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index b3dd9b522..0dd4d6a26 100755
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -29815,7 +29815,7 @@ _081A9F7A:
 	thumb_func_start sub_81A9F80
 sub_81A9F80: @ 81A9F80
 	push {lr}
-	ldr r0, =gUnknown_08252C88
+	ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
 	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
@@ -30241,8 +30241,8 @@ sub_81AA2F8: @ 81AA2F8
 	push {r4,r5,lr}
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
-	ldr r5, =gUnknown_08252C4F
-	ldr r4, =gUnknown_08252C6A
+	ldr r5, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F
+	ldr r4, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A
 	movs r2, 0xC8
 	lsls r2, 4
 	adds r1, r0, r2
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 2247c80c0..dc11f1506 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -836,7 +836,7 @@ _0809C574:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0809C58C
-	ldr r0, =gUnknown_081E615D
+	ldr r0, =SootopolisCity_EventScript_1E615D
 	b _0809C7E4
 	.pool
 _0809C58C:
@@ -846,7 +846,7 @@ _0809C58C:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0809C5A4
-	ldr r0, =gUnknown_082393F9
+	ldr r0, =SkyPillar_Outside_EventScript_2393F9
 	b _0809C7E4
 	.pool
 _0809C5A4:
@@ -874,7 +874,7 @@ _0809C5CC:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0809C5E4
-	ldr r0, =gUnknown_0826A22A
+	ldr r0, =Route110_TrickHouseEntrance_EventScript_26A22A
 	b _0809C7E4
 	.pool
 _0809C5E4:
@@ -1310,7 +1310,7 @@ _0809C988:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C9A4
-	ldr r0, =gUnknown_08252BE8
+	ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8
 _0809C996:
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
@@ -1416,7 +1416,7 @@ _0809CA7C:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0809CA94
-	ldr r0, =gUnknown_08238EAF
+	ldr r0, =IslandCave_EventScript_238EAF
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
@@ -1424,7 +1424,7 @@ _0809CA94:
 	bl is_tile_that_overrides_player_control
 	cmp r0, 0x1
 	bne _0809CAA8
-	ldr r0, =gUnknown_081DF7BA
+	ldr r0, =MauvilleCity_EventScript_1DF7BA
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
@@ -1432,7 +1432,7 @@ _0809CAA8:
 	bl sub_8138120
 	cmp r0, 0x1
 	bne _0809CABC
-	ldr r0, =gUnknown_081F49EC
+	ldr r0, =Route119_EventScript_1F49EC
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
@@ -1440,7 +1440,7 @@ _0809CABC:
 	bl sub_8138168
 	cmp r0, 0x1
 	bne _0809CAD0
-	ldr r0, =gUnknown_081FA4D6
+	ldr r0, =LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
@@ -1448,7 +1448,7 @@ _0809CAD0:
 	bl sub_81381B0
 	cmp r0, 0x1
 	bne _0809CAE4
-	ldr r0, =gUnknown_0821307B
+	ldr r0, =RustboroCity_Gym_EventScript_21307B
 	bl ScriptContext1_SetupScript
 	b _0809CB28
 	.pool
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index e31bf22e2..14502cb9a 100755
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -1323,7 +1323,7 @@ _080D41D4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _080D422A
-	ldr r0, =gUnknown_08267EDB
+	ldr r0, =FarawayIsland_Interior_EventScript_267EDB
 	bl ScriptContext1_SetupScript
 _080D422A:
 	pop {r4-r6}
diff --git a/asm/item_use.s b/asm/item_use.s
index d3c724166..c270d4c1e 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -1787,7 +1787,7 @@ sub_80FDE7C: @ 80FDE7C
 	lsls r4, 24
 	lsrs r4, 24
 	bl ScriptContext2_Enable
-	ldr r0, =gUnknown_08242CFC
+	ldr r0, =BattleFrontier_OutsideEast_EventScript_242CFC
 	bl ScriptContext1_SetupScript
 	adds r0, r4, 0
 	bl DestroyTask
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index 6ca58c57e..5a810c497 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -114,6 +114,10 @@
 	create_movement step_94
 	create_movement step_95
 	create_movement step_96
+	create_movement step_97
+	create_movement step_98
+	create_movement step_99
+	create_movement step_9A
 
 	enum_start 0xfe
 	create_movement step_end
diff --git a/asm/player_pc.s b/asm/player_pc.s
index cd91ed3e1..592cc0fe0 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -379,12 +379,12 @@ sub_816B148: @ 816B148
 	ldrb r0, [r0, 0x8]
 	cmp r0, 0
 	bne _0816B174
-	ldr r0, =gUnknown_081F863F
+	ldr r0, =LittlerootTown_BrendansHouse_2F_EventScript_1F863F
 	bl ScriptContext1_SetupScript
 	b _0816B184
 	.pool
 _0816B174:
-	ldr r0, =gUnknown_081F958F
+	ldr r0, =LittlerootTown_MaysHouse_2F_EventScript_1F958F
 	bl ScriptContext1_SetupScript
 	b _0816B184
 	.pool
diff --git a/asm/rom6.s b/asm/rom6.s
index 83fbece49..38e249037 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -11777,7 +11777,7 @@ _0813B728:
 	ldrh r0, [r0]
 	cmp r0, 0x2
 	bne _0813B790
-	ldr r0, =gUnknown_0824979B
+	ldr r0, =gText_YourPartnerHasRetired
 	bl ShowFieldAutoScrollMessage
 	b _0813B790
 	.pool
@@ -11786,7 +11786,7 @@ _0813B74C:
 	ldrh r0, [r0]
 	cmp r0, 0x3
 	bne _0813B790
-	ldr r0, =gUnknown_0824979B
+	ldr r0, =gText_YourPartnerHasRetired
 	bl ShowFieldAutoScrollMessage
 	b _0813B790
 	.pool
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 752f2c810..dd12ea2dc 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -868,7 +868,7 @@ _0809FF00:
 	bl sub_8197DF8
 	bl sub_80984F4
 	bl ScriptContext2_Disable
-	ldr r0, =gUnknown_08252C88
+	ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _0809FF22
@@ -1089,7 +1089,7 @@ sub_80A00A0: @ 80A00A0
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A00D4
-	ldr r0, =gUnknown_08252CA7
+	ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CA7
 	ldr r1, =sub_80A00EC
 	bl sub_809FF98
 	b _080A00DC