From 19fcd7d5be746f8bb6386bc0a877afd56e7b58a0 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:56:11 +0100
Subject: [PATCH] Winner's Path gets Rock Smash wild data

whoopsie daisy i forgotti

labelled as victory in case victory road wants it too

pupitar seems fitting since it's a very competitively-centred mon
---
 constants/pokemon_data_constants.asm | 1 +
 data/wild/treemon_maps.asm           | 1 +
 data/wild/treemons.asm               | 6 ++++++
 maps/SafariZoneFuchsiaGateBeta.asm   | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 15a8f02..552dabd 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -192,6 +192,7 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as
 	const TREEMON_SET_ROCK_SQUARE
 	const TREEMON_SET_ROCK_WELL
 	const TREEMON_SET_SWEET_HONEY
+	const TREEMON_SET_ROCK_VICTORY
 DEF NUM_TREEMON_SETS EQU const_value
 
 ; treemon scores
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 6a0e905..ef21a98 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -53,4 +53,5 @@ RockMonMaps:
 	treemon_map MOUNT_MOON_SQUARE,			    TREEMON_SET_ROCK_SQUARE
 	treemon_map BURNED_TOWER_1F,		        TREEMON_SET_ROCK_TOWER
 	treemon_map CLIFF_CAVE,						TREEMON_SET_ROCK_DARK_CAVE
+	treemon_map WINNERS_PATH,					TREEMON_SET_ROCK_VICTORY
 	db -1
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 1ec79fd..ff9ac09 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -15,6 +15,7 @@ TreeMons:
 	dw TreeMonSet_Rock_Square
 	dw TreeMonSet_Rock_Well
 	dw TreeMonSet_Sweet_Honey
+	dw TreeMonSet_Rock_Victory
 	assert_table_length NUM_TREEMON_SETS
 
 ; Two tables each (common, rare).
@@ -187,3 +188,8 @@ TreeMonSet_Sweet_Honey:
 	dbbw 25, 60, BEEDRILL
 	dbbw 25, 60, MUNCHLAX
 	db -1
+	
+TreeMonSet_Rock_Victory:
+	dbbw 70, 43, MAGCARGO
+	dbbw 30, 45, PUPITAR
+	db -1
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index 95f281d..8e1ba62 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -31,8 +31,8 @@ SafariZoneEntry:
 	closetext
 	
 	applymovement PLAYER, SafariZoneEntryMovement
-	warpfacing UP, SAFARI_ZONE_BETA, 9,  23
 	playsound SFX_ENTER_DOOR
+	warpfacing UP, SAFARI_ZONE_BETA, 9,  23
 	setevent EVENT_IN_SAFARI_ZONE
 	
 	; Give the player 500 steps...I think.