dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TM34 Transposition Typo

Browse Source 
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
This commit is contained in:
Deokishisu
2021-02-03 19:54:45 -05:00
parent 80b2c0eee6
commit ee0fb9ea5a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/VermilionCity_Gym/scripts.inc
+6 -6
View File
@@ -208,7 +208,7 @@ VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF
VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A
famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 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 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 msgbox VermilionCity_Gym_Text_LtSurgePostBattle
release release
end end
@@ -220,25 +220,25 @@ VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C
setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_DEFEATED_LT_SURGE
setflag FLAG_BADGE03_GET setflag FLAG_BADGE03_GET
set_gym_trainers 3 set_gym_trainers 3
goto VermilionCity_Gym_EventScript_GiveTM43 goto VermilionCity_Gym_EventScript_GiveTM34
end end
VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB
clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
return return
VermilionCity_Gym_EventScript_GiveTM43:: @ 816B9AF VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF
msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis
checkitemspace ITEM_TM34, 1 checkitemspace ITEM_TM34, 1
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM43 goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM34
giveitem_msg VermilionCity_Gym_Text_ReceivedTM43FromLtSurge, ITEM_TM34 giveitem_msg VermilionCity_Gym_Text_ReceivedTM34FromLtSurge, ITEM_TM34
setflag FLAG_GOT_TM34_FROM_SURGE setflag FLAG_GOT_TM34_FROM_SURGE
msgbox VermilionCity_Gym_Text_ExplainTM34 msgbox VermilionCity_Gym_Text_ExplainTM34
release release
end end
VermilionCity_Gym_EventScript_NoRoomForTM43:: @ 816B9F0 VermilionCity_Gym_EventScript_NoRoomForTM34:: @ 816B9F0
msgbox VermilionCity_Gym_Text_MakeRoomInYourBag msgbox VermilionCity_Gym_Text_MakeRoomInYourBag
release release
end end
data/maps/VermilionCity_Gym/text.inc
+1 -1
View File
@@ -23,7 +23,7 @@ VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA
.string "You're special, kid!\n" .string "You're special, kid!\n"
.string "Take this!$" .string "Take this!$"
VermilionCity_Gym_Text_ReceivedTM43FromLtSurge:: @ 8194D87 VermilionCity_Gym_Text_ReceivedTM34FromLtSurge:: @ 8194D87
.string "{PLAYER} received TM34\n" .string "{PLAYER} received TM34\n"
.string "from LT. SURGE.$" .string "from LT. SURGE.$"