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

Fix special var names

Browse Source
This commit is contained in:
GriffinR
2020-03-02 12:57:54 -05:00
parent 9803cb612e
commit 4ab3d77d80
25 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+1 -1
View File
@@ -154,7 +154,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
waitmessage
waitfanfare
putitemaway VAR_0x8009
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_0x8008, ITEM_FRESH_WATER
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
compare VAR_0x8008, ITEM_SODA_POP
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -1
View File
@@ -38,7 +38,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA
message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
waitmessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment
end
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -112,7 +112,7 @@ FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1
FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB
textcolor 3
message DayCare_Text_ReceivedEgg
call EventScript_1A6675
call EventScript_RestorePrevTextColor
playfanfare MUS_FANFA1
waitfanfare
waitbuttonpress
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -1
View File
@@ -138,7 +138,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05
playmoncry VAR_RESULT, 0
textcolor 3
msgbox DayCare_Text_TookBackMon
call EventScript_1A6675
call EventScript_RestorePrevTextColor
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, DAYCARE_ONE_MON
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -123,7 +123,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA
playfanfare MUS_FANFA1
message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
msgbox FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut
closemessage
hidemoneybox 0, 0
data/maps/FuchsiaCity_WardensHouse/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780
waitmessage
waitfanfare
msgbox FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth
call EventScript_1A6675
call EventScript_RestorePrevTextColor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq FuchsiaCity_WardensHouse_EventScript_WardenThanksMale
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -141,7 +141,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46
message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
return
OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58
@@ -264,7 +264,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5
message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
removeitem ITEM_SAPPHIRE, 1
msgbox OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime
closemessage
@@ -310,7 +310,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044
message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
closemessage
applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine
waitmovement 0
@@ -349,7 +349,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2
message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+5 -5
View File
@@ -98,7 +98,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035
textcolor 3
msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits
closemessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_FACING, DIR_NORTH
call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth
compare VAR_FACING, DIR_SOUTH
@@ -128,7 +128,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035
message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
special EnableNationalPokedex
msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex
msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex
@@ -655,7 +655,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
removeitem ITEM_OAKS_PARCEL, 1
msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered
playbgm MUS_RIVAL1, 0
@@ -721,7 +721,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEDEX_GET
special sub_810B810
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
@@ -1212,7 +1212,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74
erasemonpic
removeobject VAR_LAST_TALKED
msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic
call EventScript_1A6675
call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE
data/maps/PewterCity/scripts.inc
+1 -1
View File
@@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
signmsg
msgbox PewterCity_Text_ExplainRunningShoes
normalmsg
call EventScript_1A6675
call EventScript_RestorePrevTextColor
msgbox PewterCity_Text_MustBeGoingBackToLab
closemessage
compare VAR_TEMP_1, 0
data/maps/PewterCity_House1/scripts.inc
+1 -1
View File
@@ -27,5 +27,5 @@ PewterCity_House1_EventScript_DoNidoranCry:: @ 816A749
playmoncry SPECIES_NIDORAN_M, 0
msgbox PewterCity_House1_Text_Nidoran
waitmoncry
call EventScript_1A6675
call EventScript_RestorePrevTextColor
return
data/maps/Route1/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE
waitfanfare
additem ITEM_POTION
msgbox Route1_Text_PutPotionAway
call EventScript_1A6675
call EventScript_RestorePrevTextColor
setflag FLAG_GOT_POTION_ON_ROUTE_1
release
end
data/maps/SSAnne_CaptainsOffice/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A
waitmessage
playfanfare MUS_ME_ASA
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
delay 50
applymovement 1, Movement_FacePlayer
waitmovement 0
data/maps/SaffronCity_Dojo/scripts.inc
+2 -2
View File
@@ -29,7 +29,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
waitmovement 0
textcolor 0
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
@@ -51,7 +51,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
waitmovement 0
textcolor 0
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_RESULT, YES
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183
goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance
closemessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_FACING, DIR_SOUTH
call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
delay 30
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -78,7 +78,7 @@ TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727
removeitem ITEM_BIG_MUSHROOM, 1
textcolor 3
msgbox TwoIsland_House_Text_HandedOverOneBigMushroom
call EventScript_1A6675
call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove
end
@@ -86,7 +86,7 @@ TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741
removeitem ITEM_TINY_MUSHROOM, 2
textcolor 3
msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms
call EventScript_1A6675
call EventScript_RestorePrevTextColor
goto TwoIsland_House_EventScript_EndTutorMove
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -162,7 +162,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A
message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
waitmessage
waitfanfare
call EventScript_1A6675
call EventScript_RestorePrevTextColor
removeitem ITEM_METEORITE, 1
msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill
goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone