Merge pull request #13 from PlagueVonKarma/BattleTentPort

Battle Tent Port

data/events/hidden_objects.asm

@@ -85,6 +85,7 @@ HiddenObjectMaps:
 	db ROUTE_4
 	db CELADON_UNIVERSITY_POKECENTER
 	db CITRINE_POKECENTER
+	db BATTLE_TENT
 	db -1 ; end
 
 HiddenObjectPointers:
@@ -175,6 +176,7 @@ HiddenObjectPointers:
 	dw Route4HiddenObjects
 	dw CeladonUniversityPokecenterHiddenObjects
 	dw CitrinePokecenterHiddenObjects
+	dw BattleTentHiddenObjects
 
 MACRO hidden_object
 	db \2 ; y coord
@@ -634,3 +636,7 @@ CeruleanCityHiddenObjects:
 Route4HiddenObjects:
 	hidden_object 40,  3, GREAT_BALL, HiddenItems
 	db -1 ; end
+
+BattleTentHiddenObjects:
+	hidden_object 9,  16, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1

data/items/prices.asm

@@ -76,7 +76,7 @@ ItemPrices::
 	bcd3 0     ; LIFT_KEY
 	bcd3 0     ; EXP_ALL
 	bcd3 0     ; was OLD_ROD, now CANDY_SACK. Plan to be one-of-a-kind, so 0 to discourage sale a la Master Ball.
-	bcd3 5000  ; was GOOD_ROD, now BOTTLE_CAP. Sells for 5000 in SV.
+	bcd3 9800  ; was GOOD_ROD, now BOTTLE_CAP. Sells for 5000 in SV, but making it in-line with the Stat Exp items feels right.
 	bcd3 0     ; SUPER_ROD
 	bcd3 0     ; PP_UP
 	bcd3 0     ; ETHER

data/maps/headers/BattleTent.asm

@@ -0,0 +1,2 @@
+	map_header BattleTent, BATTLE_TENT, CLUB, 0
+	end_map_header

data/maps/hide_show_data.asm

@@ -253,6 +253,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw GiovannisRoomHS
+	dw NoHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 

data/maps/map_header_banks.asm

@@ -251,4 +251,5 @@ MapHeaderBanks::
 	db BANK(AgathasRoom_h)
 	db BANK(RockTunnelB1F_h)
 	db BANK(GiovannisRoom_h)
+	db BANK(BattleTent_h)
 	assert_table_length NUM_MAPS

data/maps/map_header_pointers.asm

@@ -251,4 +251,5 @@ MapHeaderPointers::
 	dw AgathasRoom_h
 	dw RockTunnelB1F_h
 	dw GiovannisRoom_h
+	dw BattleTent_h
 	assert_table_length NUM_MAPS

data/maps/objects/BattleTent.asm

@@ -0,0 +1,17 @@
+BattleTent_Object: ; 0x1dd9b (size=38)
+	db $e ; border block
+
+	def_warp_events
+	warp_event  2, 19, CITRINE_CITY, 6
+	warp_event  3, 19, CITRINE_CITY, 6
+
+	def_bg_events
+
+	def_object_events
+	object_event  2, 14, SPRITE_WAITER, STAY, DOWN, 1 ; person
+	object_event  7, 14, SPRITE_CLERK, STAY, DOWN, 2 ; person
+	object_event  2,  4, SPRITE_WAITER, STAY, RIGHT, 3 ; person
+	object_event 10,  4, SPRITE_YOUNGSTER, STAY, LEFT, 4 ; person
+	
+
+	def_warps_to BATTLE_TENT

data/maps/objects/CitrineCity.asm

@@ -7,6 +7,7 @@ CitrineCity_Object:
 	warp_event 15, 17, CITRINE_POKECENTER, 1
 	warp_event 15, 27, CITRINE_MART, 1
 	warp_event 22,  5, GARNET_CAVERN_1F, 1
+	warp_event 11,  7, BATTLE_TENT, 1
 	warp_event 35, 31, VERMILION_CITY, 6
 	warp_event 35, 30, VERMILION_CITY, 6
 

data/maps/songs.asm

@@ -250,4 +250,5 @@ MapSongBanks::
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
 	db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
 	db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
+	db MUSIC_GYM, 0 ; BATTLE_TENT
 	assert_table_length NUM_MAPS

data/maps/town_map_entries.asm

@@ -126,4 +126,5 @@ InternalMapEntries:
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
 	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 	internal_map GIOVANNIS_ROOM,                 2,  8, ViridianCityName
+	internal_map BATTLE_TENT,               	 7,  9, CitrineCityName
 	db -1 ; end

data/maps/town_map_order.asm

@@ -53,4 +53,5 @@ TownMapOrder:
 	db BRUNSWICK_TRAIL
 	db CELESTE_HILL
 	db FARAWAY_ISLAND_OUTSIDE
+	db BATTLE_TENT
 TownMapOrderEnd:

data/wild/grass_water.asm

@@ -250,6 +250,7 @@ WildDataPointers:
 	dw NothingWildMons
 	dw RockTunnelB1FWildMons
 	dw NothingWildMons
+	dw NothingWildMons ; battle tent
 	assert_table_length NUM_MAPS
 	dw -1 ; end