diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-03 20:49:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 20:49:41 -0500 |
| commit | 8a0294f9f1b48f4b47b81cab8c13ae2f2ef1c86f (patch) | |
| tree | 0f74174f13a9ae07a09b3cc6c988502986d41139 | |
| parent | 80b2c0eee67ac8a008c0a8c621b51e391d94df98 (diff) | |
| parent | ee0fb9ea5a24066d30e33ead4b21de2d004b8faf (diff) | |
Merge pull request #383 from Deokishisu/patch-2
Fix Vermilion Gym Script Label Transposition Typos
| -rw-r--r-- | data/maps/VermilionCity_Gym/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/VermilionCity_Gym/text.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 17dae87dd..bb6b5c91a 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -208,7 +208,7 @@ VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_LT_SURGE, VermilionCity_Gym_Text_LtSurgeIntro, VermilionCity_Gym_Text_LtSurgeDefeat, VermilionCity_Gym_EventScript_DefeatedLtSurge, NO_MUSIC - goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM43 + goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM34 msgbox VermilionCity_Gym_Text_LtSurgePostBattle release end @@ -220,25 +220,25 @@ VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET set_gym_trainers 3 - goto VermilionCity_Gym_EventScript_GiveTM43 + goto VermilionCity_Gym_EventScript_GiveTM34 end VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return -VermilionCity_Gym_EventScript_GiveTM43:: @ 816B9AF +VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis checkitemspace ITEM_TM34, 1 compare VAR_RESULT, FALSE - goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM43 - giveitem_msg VermilionCity_Gym_Text_ReceivedTM43FromLtSurge, ITEM_TM34 + goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM34 + giveitem_msg VermilionCity_Gym_Text_ReceivedTM34FromLtSurge, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE msgbox VermilionCity_Gym_Text_ExplainTM34 release end -VermilionCity_Gym_EventScript_NoRoomForTM43:: @ 816B9F0 +VermilionCity_Gym_EventScript_NoRoomForTM34:: @ 816B9F0 msgbox VermilionCity_Gym_Text_MakeRoomInYourBag release end diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index e640a2c7c..c9d1ef12d 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -23,7 +23,7 @@ VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA .string "You're special, kid!\n" .string "Take this!$" -VermilionCity_Gym_Text_ReceivedTM43FromLtSurge:: @ 8194D87 +VermilionCity_Gym_Text_ReceivedTM34FromLtSurge:: @ 8194D87 .string "{PLAYER} received TM34\n" .string "from LT. SURGE.$" |