Added Deco Vendor and made GoldenRod Dept 3F a Decorations Floor (Not…

… yet Finished)
SoupPotato · Nov 17, 2024 · 3451c86 · 3451c86
1 parent 427594c
commit 3451c86
Show file tree

Hide file tree

Showing 6 changed files with 874 additions and 74 deletions.
diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm
@@ -15,8 +15,8 @@
 	const MART_CIANWOOD
 	const MART_GOLDENROD_2F_1
 	const MART_GOLDENROD_2F_2
-	const MART_GOLDENROD_3F
-	const MART_GOLDENROD_4F
+	const MART_GOLDENROD_4F_1
+	const MART_GOLDENROD_4F_2
 	const MART_GOLDENROD_5F
 	const MART_OLIVINE
 	const MART_ECRUTEAK

diff --git a/data/items/marts.asm b/data/items/marts.asm
@@ -8,8 +8,8 @@ Marts:
 	dw MartCianwood
 	dw MartGoldenrod2F1
 	dw MartGoldenrod2F2
-	dw MartGoldenrod3F
-	dw MartGoldenrod4F
+	dw MartGoldenrod4F1
+	dw MartGoldenrod4F2
 	dw MartGoldenrod5F
 	dw MartOlivine
 	dw MartEcruteak
@@ -111,7 +111,16 @@ MartGoldenrod2F2:
 	db FLOWER_MAIL
 	db -1 ; end
 
-MartGoldenrod3F:
+MartGoldenrod4F1:
+	db 5 ; # items
+	db PROTEIN
+	db IRON
+	db CARBOS
+	db CALCIUM
+	db HP_UP
+	db -1 ; end
+
+MartGoldenrod4F2:
 	db 7 ; # items
 	db X_SPEED
 	db X_SPECIAL
@@ -122,15 +131,6 @@ MartGoldenrod3F:
 	db X_ACCURACY
 	db -1 ; end
 
-MartGoldenrod4F:
-	db 5 ; # items
-	db PROTEIN
-	db IRON
-	db CARBOS
-	db CALCIUM
-	db HP_UP
-	db -1 ; end
-
 MartGoldenrod5F:
 	db 3 ; # items
 	db TM_THUNDERPUNCH

diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
@@ -10,7 +10,6 @@ INCLUDE "maps/GoldenrodPPSpeechHouse.asm"
 INCLUDE "maps/GoldenrodNameRater.asm"
 INCLUDE "maps/GoldenrodDeptStore1F.asm"
 INCLUDE "maps/GoldenrodDeptStore2F.asm"
-INCLUDE "maps/GoldenrodDeptStore3F.asm"
 INCLUDE "maps/GoldenrodDeptStore4F.asm"
 INCLUDE "maps/GoldenrodDeptStore5F.asm"
 INCLUDE "maps/GoldenrodDeptStore6F.asm"
@@ -527,5 +526,6 @@ INCLUDE "maps/RuinsOfAlphResearchCenter.asm"
 INCLUDE "maps/MountMoonB1F.asm"
 INCLUDE "maps/MountMoonB2F.asm"
 INCLUDE "maps/NewBarkTown.asm"
+INCLUDE "maps/GoldenrodDeptStore3F.asm"
 
 ENDSECTION