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/scripts/cable_club.inc
+6 -6
View File
@@ -288,7 +288,7 @@ CableClub_EventScript_TryEnterColosseum:: @ 81BB54C
textcolor 3
special TryBattleLinkup
waitstate
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_RESULT, 1
goto_if_eq CableClub_EventScript_EnterColosseum
compare VAR_RESULT, 2
@@ -395,7 +395,7 @@ CableClub_EventScript_TradeCenter:: @ 81BB6AB
textcolor 3
special TryTradeLinkup
waitstate
call EventScript_1A6675
call EventScript_RestorePrevTextColor
compare VAR_RESULT, 1
goto_if_eq CableClub_EventScript_EnterTradeCenter
compare VAR_RESULT, 2
@@ -1001,7 +1001,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC
textcolor 3
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup2Players
@@ -1036,7 +1036,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50
textcolor 3
message CableClub_Text_ChooseGroupLeaderOfFour
waitmessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup4Players
@@ -1071,7 +1071,7 @@ CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4
textcolor 3
message CableClub_Text_ChooseGroupLeader
waitmessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroupXPlayers
@@ -1281,7 +1281,7 @@ CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE
textcolor 3
message CableClub_Text_ChooseGroupLeader
waitmessage
call EventScript_1A6675
call EventScript_RestorePrevTextColor
multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinMinigameLinkGroup
data/scripts/day_care.inc
+1 -1
View File
@@ -102,7 +102,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA
waitse
playmoncry VAR_RESULT, 0
msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack
call EventScript_1A6675
call EventScript_RestorePrevTextColor
waitmoncry
goto Route5_PokemonDayCare_EventScript_CloseMoneyBox
end
data/scripts/move_tutors.inc
+1 -1
View File
@@ -560,7 +560,7 @@ EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37
signmsg
msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
normalmsg
call EventScript_1A6675
call EventScript_RestorePrevTextColor
return
Movement_JumpInPlaceDown: @ 81C4F4C
data/scripts/obtain_item.inc
+7 -6
View File
@@ -1,18 +1,19 @@
EventScript_1A666F:: @ 81A666F
copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
@ Unused, handled by textcolor script cmd
EventScript_SaveTextColor:: @ 81A666F
copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR
return
EventScript_1A6675:: @ 81A6675
copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
EventScript_RestorePrevTextColor:: @ 81A6675
copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR
return
Std_ObtainItem:: @ 81A667B
copyvar VAR_MON_BOX_POS, VAR_MON_BOX_ID
copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR
textcolor 3
additem VAR_0x8000, VAR_0x8001
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainItemMessage
copyvar VAR_MON_BOX_ID, VAR_MON_BOX_POS
copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR
return
EventScript_ObtainItemMessage:: @ 81A6697
data/scripts/std_msgbox.inc
+1 -1
View File
@@ -39,7 +39,7 @@ Std_ReceivedItem:: @ 81A4E66
compare VAR_0x8002, MUS_FANFA1
call_if_eq EventScript_ReceivedItemWaitFanfare
putitemaway VAR_0x8000, VAR_0x8001
call EventScript_1A6675
call EventScript_RestorePrevTextColor
return
EventScript_ReceivedItemFanfare1:: @ 81A4EA2
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -299,7 +299,7 @@ TrainerTower_Roof_EventScript_ReceivePrize:
waitmessage
getstdstring 2, STDSTRING_ITEMS_POCKET
msgbox Text_PutItemAway
call EventScript_1A6675
call EventScript_RestorePrevTextColor
goto TrainerTower_Roof_EventScript_CheckFinalTime
TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A