18 files changed, 85 insertions, 99 deletions
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
index e5179022f..9663d087c 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
@@ -27,14 +27,13 @@ EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
 	faceplayer
 	message EverGrandeCity_PokemonLeague_Text_1A0BE4
 	waittext
-	pokemart EverGrandeCity_PokemonLeague_Pokemart_15BAC0
+	pokemart EverGrandeCity_PokemonLeague_Items
 	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15babf, 0x1
-
-EverGrandeCity_PokemonLeague_Pokemart_15BAC0:: @ 815BAC0
+	.align 2
+EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
diff --git a/data/scripts/maps/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.s
index 123128d22..591b67509 100644
--- a/data/scripts/maps/FallarborTown_Mart.s
+++ b/data/scripts/maps/FallarborTown_Mart.s
@@ -6,14 +6,13 @@ FallarborTown_Mart_EventScript_153967:: @ 8153967
 	faceplayer
 	message FallarborTown_Mart_Text_1A0BE4
 	waittext
-	pokemart FallarborTown_Mart_Pokemart_153980
+	pokemart FallarborTown_Mart_Items
 	msgbox FallarborTown_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15397e, 0x2
-
-FallarborTown_Mart_Pokemart_153980:: @ 8153980
+	.align 2
+FallarborTown_Mart_Items:: @ 8153980
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
diff --git a/data/scripts/maps/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.s
index 6c9cf6298..5630bcd5f 100644
--- a/data/scripts/maps/FortreeCity_Mart.s
+++ b/data/scripts/maps/FortreeCity_Mart.s
@@ -6,14 +6,13 @@ FortreeCity_Mart_EventScript_158067:: @ 8158067
 	faceplayer
 	message FortreeCity_Mart_Text_1A0BE4
 	waittext
-	pokemart FortreeCity_Mart_Pokemart_158080
+	pokemart FortreeCity_Mart_Items
 	msgbox FortreeCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15807e, 0x2
-
-FortreeCity_Mart_Pokemart_158080:: @ 8158080
+	.align 2
+FortreeCity_Mart_Items:: @ 8158080
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_SUPER_POTION
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.s
index 96d95a75c..d63f7276d 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.s
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.s
@@ -6,12 +6,13 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629
 	faceplayer
 	message LavaridgeTown_HerbShop_Text_17615C
 	waittext
-	pokemart LavaridgeTown_HerbShop_Pokemart_153640
+	pokemart LavaridgeTown_HerbShop_Items
 	msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4
 	release
 	end
 
-LavaridgeTown_HerbShop_Pokemart_153640:: @ 8153640
+	.align 2
+LavaridgeTown_HerbShop_Items:: @ 8153640
 	.2byte ITEM_ENERGY_POWDER
 	.2byte ITEM_ENERGY_ROOT
 	.2byte ITEM_HEAL_POWDER
diff --git a/data/scripts/maps/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.s
index 13e119eeb..747c606f4 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.s
+++ b/data/scripts/maps/LavaridgeTown_Mart.s
@@ -6,14 +6,13 @@ LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB
 	faceplayer
 	message LavaridgeTown_Mart_Text_1A0BE4
 	waittext
-	pokemart LavaridgeTown_Mart_Pokemart_1538E4
+	pokemart LavaridgeTown_Mart_Items
 	msgbox LavaridgeTown_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x1538e2, 0x2
-
-LavaridgeTown_Mart_Pokemart_1538E4:: @ 81538E4
+	.align 2
+LavaridgeTown_Mart_Items:: @ 81538E4
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
index f331dc758..9ab45fd85 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
@@ -18,14 +18,13 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A
 	faceplayer
 	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_159F44
+	pokemart LilycoveCity_DepartmentStore_2F_Items1
 	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x159f41, 0x3
-
-LilycoveCity_DepartmentStore_2F_Pokemart_159F44:: @ 8159F44
+	.align 2
+LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
@@ -46,14 +45,13 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E
 	faceplayer
 	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_159F78
+	pokemart LilycoveCity_DepartmentStore_2F_Items2
 	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x159f75, 0x3
-
-LilycoveCity_DepartmentStore_2F_Pokemart_159F78:: @ 8159F78
+	.align 2
+LilycoveCity_DepartmentStore_2F_Items2:: @ 8159F78
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_HYPER_POTION
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
index eddabf55f..c81f9ac95 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
@@ -6,12 +6,13 @@ LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91
 	faceplayer
 	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_159FA8
+	pokemart LilycoveCity_DepartmentStore_3F_Items1
 	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_Pokemart_159FA8:: @ 8159FA8
+	.align 2
+LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_IRON
@@ -27,14 +28,14 @@ LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8
 	faceplayer
 	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_159FD0
+	pokemart LilycoveCity_DepartmentStore_3F_Items2
 	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x159fcf, 0x1
 
-LilycoveCity_DepartmentStore_3F_Pokemart_159FD0:: @ 8159FD0
+	.align 2
+LilycoveCity_DepartmentStore_3F_Items2:: @ 8159FD0
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_SPECIAL
 	.2byte ITEM_X_ATTACK
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
index 7466deb99..949891fec 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
@@ -18,12 +18,13 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019
 	faceplayer
 	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_15A030
+	pokemart LilycoveCity_DepartmentStore_4F_Items1
 	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_Pokemart_15A030:: @ 815A030
+	.align 2
+LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030
 	.2byte ITEM_TM38
 	.2byte ITEM_TM25
 	.2byte ITEM_TM14
@@ -37,14 +38,13 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C
 	faceplayer
 	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
 	waittext
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_15A054
+	pokemart LilycoveCity_DepartmentStore_4F_Items2
 	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a053, 0x1
-
-LilycoveCity_DepartmentStore_4F_Pokemart_15A054:: @ 815A054
+	.align 2
+LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054
 	.2byte ITEM_TM17
 	.2byte ITEM_TM20
 	.2byte ITEM_TM33
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
index bfe83d6ec..cdd8621b6 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
@@ -6,12 +6,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waittext
-	pokemartbp LilycoveCity_DepartmentStore_5F_Pokemart_15A078
+	pokemartbp LilycoveCity_DepartmentStore_5F_Items1
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_Pokemart_15A078:: @ 815A078
+	.align 2
+LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_ACCURACY
@@ -33,14 +34,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waittext
-	pokemartbp LilycoveCity_DepartmentStore_5F_Pokemart_15A0AC
+	pokemartbp LilycoveCity_DepartmentStore_5F_Items2
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a0ab, 0x1
-
-LilycoveCity_DepartmentStore_5F_Pokemart_15A0AC:: @ 815A0AC
+	.align 2
+LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC
 	.2byte 101
 	.2byte 102
 	.2byte ITEM_BIG_MUSHROOM
@@ -59,14 +59,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waittext
-	pokemartbp LilycoveCity_DepartmentStore_5F_Pokemart_15A0DC
+	pokemartbp LilycoveCity_DepartmentStore_5F_Items3
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a0d9, 0x3
-
-LilycoveCity_DepartmentStore_5F_Pokemart_15A0DC:: @ 815A0DC
+	.align 2
+LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC
 	.2byte ITEM_CARBOS
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_RARE_CANDY
@@ -85,14 +84,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
 	waittext
-	pokemartbp LilycoveCity_DepartmentStore_5F_Pokemart_15A10C
+	pokemartbp LilycoveCity_DepartmentStore_5F_Items4
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15a109, 0x3
-
-LilycoveCity_DepartmentStore_5F_Pokemart_15A10C:: @ 815A10C
+	.align 2
+LilycoveCity_DepartmentStore_5F_Items4:: @ 815A10C
 	.2byte 59
 	.2byte 60
 	.2byte 61
diff --git a/data/scripts/maps/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.s
index 312b64226..96ac01a8a 100644
--- a/data/scripts/maps/MauvilleCity_Mart.s
+++ b/data/scripts/maps/MauvilleCity_Mart.s
@@ -6,14 +6,13 @@ MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE
 	faceplayer
 	message MauvilleCity_Mart_Text_1A0BE4
 	waittext
-	pokemart MauvilleCity_Mart_Pokemart_1573D8
+	pokemart MauvilleCity_Mart_Items
 	msgbox MauvilleCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x1573d5, 0x3
-
-MauvilleCity_Mart_Pokemart_1573D8:: @ 81573D8
+	.align 2
+MauvilleCity_Mart_Items:: @ 81573D8
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
diff --git a/data/scripts/maps/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.s
index d4c76f516..d1c36ce7a 100644
--- a/data/scripts/maps/OldaleTown_Mart.s
+++ b/data/scripts/maps/OldaleTown_Mart.s
@@ -8,14 +8,13 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	waittext
 	checkflag 116
 	jumpeq OldaleTown_Mart_EventScript_152FA8
-	pokemart OldaleTown_Mart_Pokemart_152F9C
+	pokemart OldaleTown_Mart_Items1
 	msgbox OldaleTown_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x152f99, 0x3
-
-OldaleTown_Mart_Pokemart_152F9C:: @ 8152F9C
+	.align 2
+OldaleTown_Mart_Items1:: @ 8152F9C
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -25,14 +24,13 @@ OldaleTown_Mart_Pokemart_152F9C:: @ 8152F9C
 	end
 
 OldaleTown_Mart_EventScript_152FA8:: @ 8152FA8
-	pokemart OldaleTown_Mart_Pokemart_152FB8
+	pokemart OldaleTown_Mart_Items2
 	msgbox OldaleTown_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x152fb7, 0x1
-
-OldaleTown_Mart_Pokemart_152FB8:: @ 8152FB8
+	.align 2
+OldaleTown_Mart_Items2:: @ 8152FB8
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
diff --git a/data/scripts/maps/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.s
index 85fc92110..52ad90072 100644
--- a/data/scripts/maps/PetalburgCity_Mart.s
+++ b/data/scripts/maps/PetalburgCity_Mart.s
@@ -8,12 +8,13 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	waittext
 	checkflag 296
 	jumpeq PetalburgCity_Mart_EventScript_1552EA
-	pokemart PetalburgCity_Mart_Pokemart_1552D0
+	pokemart PetalburgCity_Mart_Items1
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-PetalburgCity_Mart_Pokemart_1552D0:: @ 81552D0
+	.align 2
+PetalburgCity_Mart_Items1:: @ 81552D0
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
@@ -30,14 +31,13 @@ PetalburgCity_Mart_Pokemart_1552D0:: @ 81552D0
 	end
 
 PetalburgCity_Mart_EventScript_1552EA:: @ 81552EA
-	pokemart PetalburgCity_Mart_Pokemart_1552FC
+	pokemart PetalburgCity_Mart_Items2
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x1552f9, 0x3
-
-PetalburgCity_Mart_Pokemart_1552FC:: @ 81552FC
+	.align 2
+PetalburgCity_Mart_Items2:: @ 81552FC
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
index 18c4f85b7..122b15e9e 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
@@ -52,14 +52,13 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73
 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C
 	message Route104_PrettyPetalFlowerShop_Text_1A0C42
 	waittext
-	pokemartbp Route104_PrettyPetalFlowerShop_Pokemart_15BE94
+	pokemartbp Route104_PrettyPetalFlowerShop_Items
 	msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15be91, 0x3
-
-Route104_PrettyPetalFlowerShop_Pokemart_15BE94:: @ 815BE94
+	.align 2
+Route104_PrettyPetalFlowerShop_Items:: @ 815BE94
 	.2byte ITEM_FULL_RESTORE
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_HYPER_POTION
diff --git a/data/scripts/maps/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.s
index 245d02056..39b4de4e8 100644
--- a/data/scripts/maps/RustboroCity_Mart.s
+++ b/data/scripts/maps/RustboroCity_Mart.s
@@ -13,14 +13,13 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	end
 
 RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF
-	pokemart RustboroCity_Mart_Pokemart_157C00
+	pokemart RustboroCity_Mart_Items1
 	msgbox RustboroCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x157bfe, 0x2
-
-RustboroCity_Mart_Pokemart_157C00:: @ 8157C00
+	.align 2
+RustboroCity_Mart_Items1:: @ 8157C00
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
@@ -36,14 +35,13 @@ RustboroCity_Mart_Pokemart_157C00:: @ 8157C00
 	end
 
 RustboroCity_Mart_EventScript_157C18:: @ 8157C18
-	pokemart RustboroCity_Mart_Pokemart_157C28
+	pokemart RustboroCity_Mart_Items2
 	msgbox RustboroCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x157c27, 0x1
-
-RustboroCity_Mart_Pokemart_157C28:: @ 8157C28
+	.align 2
+RustboroCity_Mart_Items2:: @ 8157C28
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_TIMER_BALL
 	.2byte ITEM_REPEAT_BALL
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index 2298425bd..7c10a8142 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
@@ -44,14 +44,13 @@ SlateportCity_EventScript_14BAB6:: @ 814BAB6
 	faceplayer
 	message SlateportCity_Text_164642
 	waittext
-	pokemart SlateportCity_Pokemart_14BAD0
+	pokemart SlateportCity_Items1
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x14bacd, 0x3
-
-SlateportCity_Pokemart_14BAD0:: @ 814BAD0
+	.align 2
+SlateportCity_Items1:: @ 814BAD0
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
 	.2byte ITEM_CARBOS
@@ -421,6 +420,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20
 	release
 	end
 
+	.align 2
 SlateportCity_PokemartDecor_14BE40:: @ 814BE40
 	.2byte 25
 	.2byte 27
@@ -447,14 +447,13 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A
 	faceplayer
 	message SlateportCity_Text_1A0BE4
 	waittext
-	pokemart SlateportCity_Pokemart_14BEB4
+	pokemart SlateportCity_Items2
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x14beb1, 0x3
-
-SlateportCity_Pokemart_14BEB4:: @ 814BEB4
+	.align 2
+SlateportCity_Items2:: @ 814BEB4
 	.2byte ITEM_TM10
 	.2byte ITEM_TM43
 	.2byte ITEM_NONE
diff --git a/data/scripts/maps/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.s
index f2c8f029b..2374fa2d3 100644
--- a/data/scripts/maps/SlateportCity_Mart.s
+++ b/data/scripts/maps/SlateportCity_Mart.s
@@ -6,12 +6,13 @@ SlateportCity_Mart_EventScript_156411:: @ 8156411
 	faceplayer
 	message SlateportCity_Mart_Text_1A0BE4
 	waittext
-	pokemart SlateportCity_Mart_Pokemart_156428
+	pokemart SlateportCity_Mart_Items
 	msgbox SlateportCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-SlateportCity_Mart_Pokemart_156428:: @ 8156428
+	.align 2
+SlateportCity_Mart_Items:: @ 8156428
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
diff --git a/data/scripts/maps/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.s
index 7dcb0e274..fd562a3c0 100644
--- a/data/scripts/maps/SootopolisCity_Mart.s
+++ b/data/scripts/maps/SootopolisCity_Mart.s
@@ -6,14 +6,13 @@ SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B
 	faceplayer
 	message SootopolisCity_Mart_Text_1A0BE4
 	waittext
-	pokemart SootopolisCity_Mart_Pokemart_15B234
+	pokemart SootopolisCity_Mart_Items
 	msgbox SootopolisCity_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x15b232, 0x2
-
-SootopolisCity_Mart_Pokemart_15B234:: @ 815B234
+	.align 2
+SootopolisCity_Mart_Items:: @ 815B234
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
diff --git a/data/scripts/maps/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.s
index 08634cb85..bc105de61 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.s
+++ b/data/scripts/maps/VerdanturfTown_Mart.s
@@ -6,14 +6,13 @@ VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC
 	faceplayer
 	message VerdanturfTown_Mart_Text_1A0BE4
 	waittext
-	pokemart VerdanturfTown_Mart_Pokemart_153ED4
+	pokemart VerdanturfTown_Mart_Items
 	msgbox VerdanturfTown_Mart_Text_1A0C02, 4
 	release
 	end
 
-	.incbin "baserom.gba", 0x153ed3, 0x1
-
-VerdanturfTown_Mart_Pokemart_153ED4:: @ 8153ED4
+	.align 2
+VerdanturfTown_Mart_Items:: @ 8153ED4
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_NEST_BALL
 	.2byte ITEM_SUPER_POTION