small script incbins

26 files changed, 100 insertions, 45 deletions

diff --git a/data/scripts/day_care.s b/data/scripts/day_care.s
index dc1b1fea9..f83d5af97 100644
--- a/data/scripts/day_care.s
+++ b/data/scripts/day_care.s
@@ -254,7 +254,8 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
 	slow_step_down
 	step_end
 
-	.incbin "baserom.gba", 0x1b2557, 0x1
+@ 81B2557
+	end
 
 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	msgbox Route117_PokemonDayCare_Text_1B2A88, 4
diff --git a/data/scripts/maps/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.s
index a2fd22b10..2387a4515 100644
--- a/data/scripts/maps/BattleTower_Lobby.s
+++ b/data/scripts/maps/BattleTower_Lobby.s
@@ -322,7 +322,14 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A
 	step_54
 	step_end
 
-	.incbin "baserom.gba", 0x16069e, 0x7
+@ 816069E
+	step_16
+	step_16
+	step_16
+	step_16
+	step_16
+	step_54
+	step_end
 
 BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
 	lock
diff --git a/data/scripts/maps/DewfordTown.s b/data/scripts/maps/DewfordTown.s
index 6c184198d..7cb673cc4 100644
--- a/data/scripts/maps/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.s
@@ -25,15 +25,15 @@ DewfordTown_EventScript_14E04B:: @ 814E04B
 	msgbox DewfordTown_Text_16B57D, 4
 	closebutton
 	jump DewfordTown_EventScript_14E151
-
-	.incbin "baserom.gba", 0x14e059, 0x2
+	release
+	end
 
 DewfordTown_EventScript_14E05B:: @ 814E05B
 	msgbox DewfordTown_Text_16B5D2, 4
 	closebutton
 	jump DewfordTown_EventScript_14E1D8
-
-	.incbin "baserom.gba", 0x14e069, 0x2
+	release
+	end
 
 DewfordTown_EventScript_14E06B:: @ 814E06B
 	msgbox DewfordTown_Text_16B627, 4
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
index de6c091a5..1187aaeea 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
@@ -29,8 +29,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
 	waitmove 0
 	setvar 0x4001, 1
 	jump EverGrandeCity_ChampionsRoom_EventScript_15B805
-
-	.incbin "baserom.gba", 0x15b800, 0x2
+	releaseall
+	end
 
 EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
 	step_up
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.s
index f006755d4..2c7ed6617 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.s
+++ b/data/scripts/maps/FortreeCity_DecorationShop.s
@@ -19,8 +19,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A
 	release
 	end
 
-	.incbin "baserom.gba", 0x158281, 0x3
-
+	.align 2
 FortreeCity_DecorationShop_PokemartDecor_158284:: @ 8158284
 	.2byte 1
 	.2byte 2
@@ -44,8 +43,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298
 	release
 	end
 
-	.incbin "baserom.gba", 0x1582af, 0x1
-
+	.align 2
 FortreeCity_DecorationShop_PokemartDecor_1582B0:: @ 81582B0
 	.2byte 10
 	.2byte 11
diff --git a/data/scripts/maps/LavaridgeTown.s b/data/scripts/maps/LavaridgeTown.s
index 0f668c584..0af7a5823 100644
--- a/data/scripts/maps/LavaridgeTown.s
+++ b/data/scripts/maps/LavaridgeTown.s
@@ -313,9 +313,10 @@ LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
 	msgbox LavaridgeTown_Text_16C77C, 3
 	end
 
-	.incbin "baserom.gba", 0x14e7ce, 0x9
+@ 814E7CE
+	msgbox LavaridgeTown_Text_16C7CF, 3
+	end
 
 LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
 	msgbox LavaridgeTown_Text_16C7CF, 3
 	end
-
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.s
index a06ccf14d..fa0dbc9df 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.s
+++ b/data/scripts/maps/LilycoveCity_ContestHall.s
@@ -1,7 +1,7 @@
 LilycoveCity_ContestHall_MapScripts:: @ 8159099
 	.byte 0
 
-	.incbin "baserom.gba", 0x15909a, 0x1
+	.byte 0 @ XXX
 
 LilycoveCity_ContestHall_EventScript_15909B:: @ 815909B
 	msgbox LilycoveCity_ContestHall_Text_1890D4, 2
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
index b98cc38b5..2499621c5 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
@@ -28,8 +28,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a17e, 0x2
-
+	.align 2
 LilycoveCity_DepartmentStoreRooftop_PokemartDecor_15A180:: @ 815A180
 	.2byte 39
 	.2byte 35
diff --git a/data/scripts/maps/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.s
index 6195332a1..38eabbd83 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.s
+++ b/data/scripts/maps/LilycoveCity_Harbor.s
@@ -152,7 +152,9 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
 	step_up
 	step_end
 
-	.incbin "baserom.gba", 0x159a8b, 0x2
+@ 8159A8B
+	step_up
+	step_end
 
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
index 44015d256..89d769dbb 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
@@ -179,7 +179,9 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
 	end
 
-	.incbin "baserom.gba", 0x1587fc, 0x9
+@ 81587FC
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, 2
diff --git a/data/scripts/maps/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.s
index ef20523a8..193bf71ea 100644
--- a/data/scripts/maps/MossdeepCity_Mart.s
+++ b/data/scripts/maps/MossdeepCity_Mart.s
@@ -6,14 +6,13 @@ MossdeepCity_Mart_EventScript_15A926:: @ 815A926
 	faceplayer
 	message MossdeepCity_Mart_Text_1A0BE4
 	waittext
-	pokemart MossdeepCity_Mart_Pokemart_15A940
+	pokemart MossdeepCity_Mart_Items
 	msgbox MossdeepCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a93d, 0x3
-
-MossdeepCity_Mart_Pokemart_15A940:: @ 815A940
+	.align 2
+MossdeepCity_Mart_Items:: @ 815A940
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_NET_BALL
 	.2byte ITEM_DIVE_BALL
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s
index 8c7db64be..9cdf17390 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
@@ -129,7 +129,9 @@ MtChimney_EventScript_15D13E:: @ 815D13E
 	msgbox MtChimney_Text_1B3D9A, 3
 	end
 
-	.incbin "baserom.gba", 0x15d147, 0x9
+@ 815D147
+	msgbox MtChimney_Text_1B3DD6, 3
+	end
 
 MtChimney_EventScript_15D150:: @ 815D150
 	msgbox MtChimney_Text_1B3DF5, 3
diff --git a/data/scripts/maps/PetalburgCity.s b/data/scripts/maps/PetalburgCity.s
index d82359af1..e746a37b8 100644
--- a/data/scripts/maps/PetalburgCity.s
+++ b/data/scripts/maps/PetalburgCity.s
@@ -267,7 +267,11 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B
 	waitmove 0
 	return
 
-	.incbin "baserom.gba", 0x14b9ad, 0x4
+@ 814B9AD
+	step_14
+	step_14
+	step_14
+	step_end
 
 PetalburgCity_Movement_14B9B1:: @ 814B9B1
 	step_right
diff --git a/data/scripts/maps/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.s
index c9e54f6cf..a60df1c7f 100644
--- a/data/scripts/maps/PetalburgCity_Gym.s
+++ b/data/scripts/maps/PetalburgCity_Gym.s
@@ -480,7 +480,16 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
 	waitmove 0
 	return
 
-	.incbin "baserom.gba", 0x154b14, 0x9
+@ 8154B14
+	step_26
+	step_14
+	step_14
+	step_14
+	step_14
+	step_14
+	step_13
+	step_25
+	step_end
 
 PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
 	step_14
diff --git a/data/scripts/maps/Route101.s b/data/scripts/maps/Route101.s
index a44d0ffd3..dfb202d32 100644
--- a/data/scripts/maps/Route101.s
+++ b/data/scripts/maps/Route101.s
@@ -122,7 +122,8 @@ Route101_Movement_14EA1F:: @ 814EA1F
 	step_16
 	step_end
 
-	.incbin "baserom.gba", 0x14ea26, 0x1
+@ 814EA26
+	step_end
 
 Route101_Movement_14EA27:: @ 814EA27
 	step_23
@@ -180,7 +181,8 @@ Route101_Movement_14EA50:: @ 814EA50
 	step_16
 	step_end
 
-	.incbin "baserom.gba", 0x14ea57, 0x1
+@ 814EA57
+	step_end
 
 Route101_Movement_14EA58:: @ 814EA58
 	step_24
@@ -189,7 +191,16 @@ Route101_Movement_14EA58:: @ 814EA58
 	step_24
 	step_end
 
-	.incbin "baserom.gba", 0x14ea5d, 0x7
+@ 814EA5D
+	step_up
+	step_up
+	step_end
+
+@ 814EA60
+	step_up
+	step_left
+	step_up
+	step_end
 
 Route101_EventScript_14EA64:: @ 814EA64
 	msgbox Route101_Text_16D25E, 2
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.s
index 08d78bfa1..47b63c3cd 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.s
@@ -229,7 +229,9 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
 	releaseall
 	end
 
-	.incbin "baserom.gba", 0x161218, 0x2
+@ 8161218
+	releaseall
+	end
 
 Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
 	lockall
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.s
index b1bfb5eaa..3402bb000 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.s
+++ b/data/scripts/maps/Route123_BerryMastersHouse.s
@@ -82,8 +82,8 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	compare RESULT, 0
 	jumpeq Route123_BerryMastersHouse_EventScript_1A029B
 	jump Route123_BerryMastersHouse_EventScript_163C1D
-
-	.incbin "baserom.gba", 0x163b1c, 0x2
+	release
+	end
 
 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
 	checkflag 248
diff --git a/data/scripts/maps/RustboroCity.s b/data/scripts/maps/RustboroCity.s
index b7635286d..d7664388f 100644
--- a/data/scripts/maps/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.s
@@ -81,7 +81,9 @@ RustboroCity_EventScript_14C41C:: @ 814C41C
 	msgbox RustboroCity_Text_167439, 3
 	end
 
-	.incbin "baserom.gba", 0x14c425, 0x9
+@ 814C425
+	msgbox RustboroCity_Text_167485, 3
+	end
 
 RustboroCity_EventScript_14C42E:: @ 814C42E
 	msgbox RustboroCity_Text_1674DD, 3
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
index 99b5e782f..5af0e2cf4 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
@@ -68,7 +68,12 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	releaseall
 	end
 
-	.incbin "baserom.gba", 0x1577fe, 0x5
+@ 81577FE
+	step_up
+	step_up
+	step_up
+	step_27
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
 	step_right
diff --git a/data/scripts/maps/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.s
index f143d3261..c27c841eb 100644
--- a/data/scripts/maps/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.s
@@ -192,8 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84
 	jumpif 0, SSTidalCorridor_EventScript_15FED5
 	setflag 247
 	jump SSTidalCorridor_EventScript_15FE7A
-
-	.incbin "baserom.gba", 0x15fed4, 0x1
+	return
 
 SSTidalCorridor_EventScript_15FED5:: @ 815FED5
 	return
diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s
index a052c7989..f6827d059 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.s
@@ -225,14 +225,19 @@ SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
 	step_right
 	step_end
 
-	.incbin "baserom.gba", 0x15dd3e, 0x3
+@ 815DD3E
+	step_left
+	step_left
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
 	step_left
 	step_14
 	step_end
 
-	.incbin "baserom.gba", 0x15dd44, 0x2
+@ 815DD44
+	step_right
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
 	step_01
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index 7c10a8142..ca2c60a0c 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
@@ -393,8 +393,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2
 	release
 	end
 
-	.incbin "baserom.gba", 0x14be09, 0x3
-
+	.align 2
 SlateportCity_PokemartDecor_14BE0C:: @ 814BE0C
 	.2byte 95
 	.2byte 78
@@ -568,7 +567,10 @@ SlateportCity_Movement_14BFEA:: @ 814BFEA
 	step_left
 	step_end
 
-	.incbin "baserom.gba", 0x14bff8, 0x3
+@ 814BFF8
+	step_down
+	step_26
+	step_end
 
 SlateportCity_Movement_14BFFB:: @ 814BFFB
 	step_right
diff --git a/data/scripts/maps/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.s
index 8bdccdbb9..241b48a16 100644
--- a/data/scripts/maps/SlateportCity_Harbor.s
+++ b/data/scripts/maps/SlateportCity_Harbor.s
@@ -108,7 +108,12 @@ SlateportCity_Harbor_Movement_15609B:: @ 815609B
 	step_54
 	step_end
 
-	.incbin "baserom.gba", 0x1560a0, 0x5
+@ 81560A0
+	step_14
+	step_14
+	step_43
+	step_54
+	step_end
 
 SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
 	step_14
diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.s
index fe4f91cef..0c8e84e41 100644
--- a/data/scripts/maps/VerdanturfTown_ContestHall.s
+++ b/data/scripts/maps/VerdanturfTown_ContestHall.s
@@ -1,7 +1,7 @@
 VerdanturfTown_ContestHall_MapScripts:: @ 8153E95
 	.byte 0
 
-	.incbin "baserom.gba", 0x153e96, 0x1
+	.byte 0 @ XXX
 
 VerdanturfTown_ContestHall_EventScript_153E97:: @ 8153E97
 	msgbox VerdanturfTown_ContestHall_Text_177FB4, 2
diff --git a/data/text/magma_chimney.s b/data/text/magma_chimney.s
index 31e70fe37..cdfde2ef2 100644
--- a/data/text/magma_chimney.s
+++ b/data/text/magma_chimney.s
@@ -78,7 +78,7 @@ MtChimney_Text_1B3D9A:: @ 81B3D9A
 	.string "That annoying TEAM AQUA...\n"
 	.string "They always mess with our plans!$"
 
-UnknownString_81B3DD6: @ 81B3DD6
+MtChimney_Text_1B3DD6: @ 81B3DD6
 	.string "METEORITES pack amazing power!$"
 
 MtChimney_Text_1B3DF5:: @ 81B3DF5
diff --git a/data/text/maps/RustboroCity.s b/data/text/maps/RustboroCity.s
index 54b658c01..f2c9a2f57 100644
--- a/data/text/maps/RustboroCity.s
+++ b/data/text/maps/RustboroCity.s
@@ -159,7 +159,7 @@ RustboroCity_Text_167439:: @ 8167439
 	.string "LEADER: ROXANNE\p"
 	.string "“The ROCK-loving honors student!”$"
 
-UnknownString_8167485: @ 8167485
+RustboroCity_Text_167485: @ 8167485
 	.string "DEVON CORP. BRANCH OFFICE\p"
 	.string "“Access limited to DEVON employees\n"
 	.string "and authorized personnel.”$"