Readded 1st town mart

Author: Dakorias

constants/event_flags.asm

@@ -37,7 +37,7 @@
 	const EVENT_GOT_BALTOY_FROM_OAK
 	const EVENT_GOT_A_POKEMON_FROM_OAK
 	const EVENT_BATTLE_PERCY_2ND_GYM
-	const EVENT_GOT_ITEMS_FROM_HERALD_HOUSE
+	const_skip
 	const EVENT_EDWARD_MISSING_FROM_GYM
 	const EVENT_GOT_MAP_FROM_EDWARD
 	const EVENT_GYM_TRAINERS_IN_HERALD_COVE

constants/mart_constants.asm

@@ -5,7 +5,7 @@
 	const MARTTYPE_BARGAIN
 	const MARTTYPE_PHARMACY
 	const MARTTYPE_ROOFTOP
-	const MARTTYPE_NO_DIALOG
+	const MARTTYPE_HOUSE
 
 ; Marts indexes (see data/items/marts.asm)
 	const_def

data/items/marts.asm

@@ -405,7 +405,8 @@ MartHeraldBerries:
 	db -1 ; end
 
 MartCraggyCoast1:
-	db 3 ; # items
+	db 4 ; # items
+	db POKE_BALL
 	db X_ATTACK
 	db X_DEFEND
 	db X_ACCURACY
@@ -430,8 +431,7 @@ MartCraggyCoast3:
 	db -1 ; end
 
 MartCraggyCoast4:
-	db 9 ; # items
-	db POKE_BALL
+	db 8 ; # items
 	db RESCUE_BALL
 	db DUSK_BALL
 	db DAWN_BALL

data/text/common_3.asm

@@ -623,6 +623,51 @@ _PharmacyComeAgainText::
 	line "See you around."
 	done
 
+_MartHouseIntroText::
+	text "Hey, I'm trying to"
+	line "move out, but I've"
+
+	para "got to get rid of"
+	line "some things."
+
+	para "Could you buy any"
+	line "of these? Thanks!"
+	done
+
+_MartHouseHowManyText::
+	text "How many?"
+	done
+
+_MartHouseFinalPriceText::
+	text_decimal wItemQuantityChange, 1, 2
+	text " @"
+	text_ram wStringBuffer2
+	text "(S)"
+	line "will cost ¥@"
+	text_decimal hMoneyTemp, 3, 6
+	text "."
+	done
+
+_MartHouseThanksText::
+	text "Thanks a bunch!"
+	done
+
+_MartHousePackFullText::
+	text "I don't think you"
+	line "can carry this..."
+	done
+
+_MartHouseNoMoneyText::
+	text "Huh? That's not"
+	line "enough money."
+	done
+
+_MartHouseComeAgainText::
+	text "Thanks! That makes"
+	line "moving so much"
+	cont "easier."
+	done
+
 _NothingToSellText::
 	text "You don't have"
 	line "anything to sell."

engine/items/mart.asm

@@ -22,6 +22,7 @@ OpenMartDialog::
 	dw BargainShop
 	dw Pharmacist
 	dw RooftopSale
+	dw MartHouse
 
 MartDialog:
 	ld a, MARTTYPE_STANDARD
@@ -41,6 +42,16 @@ HerbShop:
 	call MartTextbox
 	ret
 
+MartHouse:
+	call FarReadMart
+	call LoadStandardMenuHeader
+	ld hl, MartHouseIntroText
+	call MartTextbox
+	call BuyMenu
+	ld hl, MartHouseComeAgainText
+	call MartTextbox
+	ret
+
 BargainShop:
 	ld b, BANK(BargainShopData)
 	ld de, BargainShopData
@@ -394,6 +405,7 @@ GetMartDialogGroup:
 	dwb .BargainShopPointers, 1
 	dwb .PharmacyPointers, 0
 	dwb .StandardMartPointers, 2
+	dwb .MartHousePointers, 0
 
 .StandardMartPointers:
 	dw MartHowManyText
@@ -427,6 +439,14 @@ GetMartDialogGroup:
 	dw PharmacyThanksText
 	dw BuyMenuLoop
 
+.MartHousePointers:
+	dw MartHouseHowManyText
+	dw MartHouseFinalPriceText
+	dw MartHouseNoMoneyText
+	dw MartHousePackFullText
+	dw MartHouseThanksText
+	dw BuyMenuLoop
+
 BuyMenuLoop:
 	farcall PlaceMoneyTopRight
 	call UpdateSprites
@@ -707,6 +727,34 @@ PharmacyComeAgainText:
 	text_far _PharmacyComeAgainText
 	text_end
 
+MartHouseIntroText:
+	text_far _MartHouseIntroText
+	text_end
+
+MartHouseHowManyText:
+	text_far _MartHouseHowManyText
+	text_end
+
+MartHouseFinalPriceText:
+	text_far _MartHouseFinalPriceText
+	text_end
+
+MartHouseNoMoneyText:
+	text_far _MartHouseNoMoneyText
+	text_end
+
+MartHousePackFullText:
+	text_far _MartHousePackFullText
+	text_end
+
+MartHouseThanksText:
+	text_far _MartHouseThanksText
+	text_end
+
+MartHouseComeAgainText:
+	text_far _MartHouseComeAgainText
+	text_end
+
 SellMenu:
 	call DisableSpriteUpdates
 	farcall DepositSellInitPackBuffers

maps/HeraldHouse.asm

@@ -9,38 +9,10 @@ HeraldHouse_MapScripts:
 	HeraldHouseCoolTrainerFScript:
 		faceplayer
 		opentext
-		checkevent EVENT_GOT_ITEMS_FROM_HERALD_HOUSE
-		iffalse .NoItem
-		writetext HeraldHouseCoolTrainerFScript
-		waitbutton
-		verbosegiveitem POKE_BALL, 5
-		verbosegiveitem POTION, 2
+		pokemart MARTTYPE_HOUSE, MART_HERALD_COVE
 		closetext
 		end
 
-	.NoItem
-		writetext HeraldHouseCooltrainerAfter
-		waitbutton
-		closetext
-		end
-
-	HeraldHouseCooltrainerMoving:
-		text "Hey, I'm trying to"
-		line "move out, but I've"
-
-		para "got to get rid of"
-		line "some things."
-
-		para "Could you take any"
-		line "of these? Thanks!"
-		done
-
-	HeraldHouseCooltrainerAfter:
-		text "Thanks! That makes"
-		line "moving that much"
-		cont "easier."
-		done
-
 HeraldHouse_MapEvents:
 	db 0, 0 ; filler
 

maps/HeraldRoute.asm

@@ -448,14 +448,14 @@ HeraldRoute_MapEvents:
 	bg_event 22,  6, BGEVENT_READ, RegistrationCenterSignScript
 
 	def_object_events
-	object_event 48,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerYoungsterKevin, -1
-	object_event 26, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJames, -1
+	object_event 31,  12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerYoungsterKevin, -1
+	object_event 17, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJames, -1
 	object_event  8, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassAlexis, -1
 	object_event 19,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCoolTrainerFStacy, -1
 	object_event  9, 16, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlockingLassScript, EVENT_LASS_AT_HERALD_ROUTE
 	object_event  9,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, HeraldRouteYoungsterScript, -1
 	object_event 32,  6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, HeraldRouteLassScript, -1
 	object_event  37,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlockingRocket1Script, EVENT_ROCKETS_STEAL_SEALED_MAP
 	object_event  38,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlockingRocket2Script, EVENT_ROCKETS_STEAL_SEALED_MAP
-	object_event  54,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HeraldRouteYoungsterDannyScript, EVENT_BEAT_YOUNGSTER_DANNY1
+	object_event  51, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HeraldRouteYoungsterDannyScript, EVENT_BEAT_YOUNGSTER_DANNY1
 	object_event  13,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, HeraldRoutePotion, EVENT_HERALD_ROUTE_POTION