diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
| commit | 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch) | |
| tree | 9e276d9e08c46e9fe4f92af636d53f1dda33190a /data/maps/BattleFrontier_BattleTowerMultiPartnerRoom | |
| parent | ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge master into doc-tower
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiPartnerRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc index e651f785c..ea32a8275 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts:: @ 8243D92 .byte 0 BattleFrontier_BattleTowerMultiPartnerRoom_OnResume: @ 8243DA7 - pyramid_healparty + pyramid_resetparty end BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0 |