more scripts

12 files changed, 311 insertions, 25 deletions

diff --git a/data/scripts/maps/DewfordTown.s b/data/scripts/maps/DewfordTown.s
index 7cb673cc4..a020c4aad 100644
--- a/data/scripts/maps/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.s
@@ -640,5 +640,7 @@ DewfordTown_EventScript_14E48F:: @ 814E48F
 	release
 	end
 
-	.incbin "baserom.gba", 0x14e499, 0xa
-
+@ 814E499
+	msgbox DewfordTown_Text_16BD79, 4
+	release
+	end
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
index 035566c4e..84b52ca7e 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
@@ -4,7 +4,13 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
 	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
 	.byte 0
 
-	.incbin "baserom.gba", 0x15b71d, 0xf
+@ 815B71D
+	map_script_2 0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_15B727
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
+	spriteface 255, 2
+	end
 
 EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
 	map_script_2 0x409c, 3, EverGrandeCity_DrakesRoom_EventScript_15B736
diff --git a/data/scripts/maps/IslandCave.s b/data/scripts/maps/IslandCave.s
index 4cad35aab..19a236d11 100644
--- a/data/scripts/maps/IslandCave.s
+++ b/data/scripts/maps/IslandCave.s
@@ -33,8 +33,16 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
 
 	.global gUnknown_0815EF19
 gUnknown_0815EF19: @ 815EF19
-
-	.incbin "baserom.gba", 0x15ef19, 0x40
+	setmaptile 7, 19, 554, 1
+	setmaptile 8, 19, 555, 1
+	setmaptile 9, 19, 556, 1
+	setmaptile 7, 20, 562, 1
+	setmaptile 8, 20, 563, 0
+	setmaptile 9, 20, 564, 1
+	special 142
+	playsfx SE_BAN
+	setflag 2129
+	end
 
 IslandCave_EventScript_15EF59:: @ 815EF59
 	lockall
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
index 39f4d3bae..4f121118a 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
@@ -27,10 +27,26 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4
 	jumpeq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68
 	end
 
-	.incbin "baserom.gba", 0x1527f1, 0x2d
+@ 81527F1
+	lockall
+	checkgender
+	compare RESULT, 0
+	jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15280A
+	compare RESULT, 1
+	jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152814
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_15280A:: @ 815280A
+	msgbox UnknownString_8172F31, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152814:: @ 8152814
+	msgbox UnknownString_8173A76, 4
+	releaseall
+	end
 
-	.global gUnknown_0815281E
-gUnknown_0815281E: @ 815281E
+gUnknown_0815281E:: @ 815281E
 
 LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E
 	lockall
@@ -44,16 +60,19 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E
 LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
 	setvar 0x8004, 1
 	special 214
-	playsfx 4
+	playsfx SE_PC_ON
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4
 	special 249
 	waitstate
 	releaseall
 	end
 
-	.global gUnknown_08152850
-gUnknown_08152850: @ 8152850
-	.incbin "baserom.gba", 0x152850, 0xd
+gUnknown_08152850:: @ 8152850
+	setvar 0x8004, 1
+	playsfx SE_PC_OFF
+	special 215
+	releaseall
+	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, 4
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
index baf6df5af..eea17b4e9 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
@@ -114,7 +114,22 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
 	step_left
 	step_end
 
-	.incbin "baserom.gba", 0x1529c7, 0x24
+@ 81529C7
+	lockall
+	checkgender
+	compare RESULT, 0
+	callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1
+	compare RESULT, 1
+	callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
+	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
 LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
index b09cd4011..cd05edddf 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
@@ -209,13 +209,16 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
 LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
 	setvar 0x8004, 2
 	special 214
-	playsfx 4
+	playsfx SE_PC_ON
 	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
 	special 249
 	waitstate
 	releaseall
 	end
 
-	.global gUnknown_08152C75
-gUnknown_08152C75: @ 8152C75
-	.incbin "baserom.gba", 0x152c75, 0xd
+gUnknown_08152C75:: @ 8152C75
+	setvar 0x8004, 2
+	playsfx SE_PC_OFF
+	special 215
+	releaseall
+	end
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.s
index a77e099c5..3ddb6963e 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.s
+++ b/data/scripts/maps/MauvilleCity_GameCorner.s
@@ -23,7 +23,13 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60
 	jump MauvilleCity_GameCorner_EventScript_156B4C
 	end
 
-	.incbin "baserom.gba", 0x156a87, 0x27
+@ 8156A87
+	multichoicedef 15, 0, 49, 1, 0
+	switch RESULT
+	case 0, MauvilleCity_GameCorner_EventScript_156AAE
+	case 1, MauvilleCity_GameCorner_EventScript_156AF0
+	jump MauvilleCity_GameCorner_EventScript_156B4C
+	end
 
 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE
 	checkcoins 16385
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s
index 9cdf17390..28de28857 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
@@ -101,7 +101,208 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	step_down
 	step_end
 
-	.incbin "baserom.gba", 0x15d048, 0xad
+@ 815D048
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+@ 815D05A
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+@ 815D063
+	step_right
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+@ 815D072
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_15
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+@ 815D08B
+	step_14
+	step_14
+	step_14
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+@ 815D096
+	step_14
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+@ 815D0A6
+	step_14
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_end
+
+@ 815D0B7
+	step_14
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_25
+	step_end
+
+@ 815D0BF
+	step_down
+	step_down
+	step_down
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+@ 815D0CD
+	step_down
+	step_end
+
+@ 815D0CF
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+@ 815D0D7
+	step_14
+	step_14
+	step_27
+	step_14
+	step_down
+	step_down
+	step_down
+	step_down
+	step_down
+	step_end
+
+@ 815D0E1
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_27
+	step_14
+	step_down
+	step_down
+	step_end
+
+@ 815D0EC
+	step_40
+	step_17
+	step_41
+	step_03
+	step_end
+
+@ 815D0F1
+	step_left
+	step_28
+	step_14
+	step_end
 
 MtChimney_EventScript_15D0F5:: @ 815D0F5
 	msgbox MtChimney_Text_1B40EA, 3
diff --git a/data/scripts/maps/OldaleTown.s b/data/scripts/maps/OldaleTown.s
index 4595cd5c0..4a7db8c40 100644
--- a/data/scripts/maps/OldaleTown.s
+++ b/data/scripts/maps/OldaleTown.s
@@ -130,7 +130,21 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2
 	step_25
 	step_end
 
-	.incbin "baserom.gba", 0x14deab, 0xe
+@ 814DEAB
+	step_up
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_up
+	step_up
+	step_up
+	step_13
+	step_25
+	step_end
 
 OldaleTown_Movement_14DEB9:: @ 814DEB9
 	step_right
@@ -164,7 +178,19 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 	step_up
 	step_end
 
-	.incbin "baserom.gba", 0x14ded3, 0xc
+@ 814DED3
+	step_left
+	step_up
+	step_up
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_up
+	step_up
+	step_end
 
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
diff --git a/data/text/maps/DewfordTown.s b/data/text/maps/DewfordTown.s
index a39dcc4c2..efdbfbff6 100644
--- a/data/text/maps/DewfordTown.s
+++ b/data/text/maps/DewfordTown.s
@@ -162,6 +162,6 @@ DewfordTown_Text_16BD37:: @ 816BD37
 	.string "“{STR_VAR_1}” is the\n"
 	.string "definition of “in” right now.$"
 
-UnknownString_816BD79: @ 816BD79
+DewfordTown_Text_16BD79: @ 816BD79
 	.string "“{STR_VAR_2}” is at\n"
 	.string "the pinnacle of cool right now.$"
diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.s b/data/text/maps/LittlerootTown_MaysHouse_2F.s
index a63675bce..313095c8d 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_2F.s
@@ -81,3 +81,6 @@ LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC
 	.string "Hey, {PLAYER}, if I see you while I’m out\n"
 	.string "catching POKéMON, I can pitch you a\l"
 	.string "battle if you’d like.$"
+
+UnknownString_8173A76: @ 8173A76
+	.string "It’s lined with POKéMON picture books.$"
diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
index 28dd5b31f..eef8370b2 100644
--- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
@@ -1,6 +1,3 @@
-UnknownString_8173A76: @ 8173A76
-	.string "It’s lined with POKéMON picture books.$"
-
 UnknownString_8173A9D: @ 8173A9D
 	.string "POKéMON SPECIES & HABITATS...\n"
 	.string "HUMAN & POKéMON COEXISTENCE...\l"