ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some mislabeled scripts

Browse Source
This commit is contained in:
GriffinR 2021-01-19 04:51:34 -05:00
parent 1a40202ea4
commit de52df5613
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/CaveOfOrigin_1F/scripts.inc
View File

@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
.byte 0 .byte 0
CaveOfOrigin_1F_OnTransition: @ 823576E CaveOfOrigin_1F_OnTransition: @ 823576E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end end

2
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
View File

@ -3,5 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end end

2
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
View File

@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end end

2
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
View File

@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
.byte 0 .byte 0
CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end end

2
data/scripts/cave_of_origin.inc
View File

@ -36,7 +36,7 @@ CaveOfOrigin_EventScript_Shake:: @ 82722A7
releaseall releaseall
end end
CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1 CaveOfOrigin_EventScript_DisableTriggers:: @ 82722C1
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1 setvar VAR_TEMP_3, 1

8
data/scripts/pkmn_center_nurse.inc
View File

@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2 goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2
message gText_RestoredPkmnToFullHealth message gText_RestoredPkmnToFullHealth
waitmessage waitmessage
applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0 waitmovement 0
message gText_WeHopeToSeeYouAgain message gText_WeHopeToSeeYouAgain
return return
@ -73,7 +73,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03 EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03
message gText_ThankYouForWaiting message gText_ThankYouForWaiting
waitmessage waitmessage
applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0 waitmovement 0
message gText_WeHopeToSeeYouAgain2 message gText_WeHopeToSeeYouAgain2
return return
@ -84,7 +84,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
setflag FLAG_NURSE_UNION_ROOM_REMINDER setflag FLAG_NURSE_UNION_ROOM_REMINDER
message CableClub_Text_PlayerIsWaiting message CableClub_Text_PlayerIsWaiting
waitmessage waitmessage
applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0 waitmovement 0
message gText_WeHopeToSeeYouAgain message gText_WeHopeToSeeYouAgain
return return
@ -129,7 +129,7 @@ EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5
goto EventScript_PkmnCenterNurse_HealPkmn goto EventScript_PkmnCenterNurse_HealPkmn
end end
EventScript_PkmnCenterNurse_Bow: @ 8271AD0 Movement_PkmnCenterNurse_Bow: @ 8271AD0
nurse_joy_bow nurse_joy_bow
delay_4 delay_4
step_end step_end

7
data/scripts/record_mix.inc
View File

@ -6,16 +6,15 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq EventScript_MixRecords goto_if_eq EventScript_MixRecords
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq EventScript_DeclineMixRecords goto_if_eq EventScript_EndMixRecords
goto EventScript_DeclineMixRecords goto EventScript_EndMixRecords
EventScript_MixRecords:: @ 8271D83 EventScript_MixRecords:: @ 8271D83
special RecordMixingPlayerSpotTriggered special RecordMixingPlayerSpotTriggered
waitstate waitstate
lock lock
faceplayer faceplayer
EventScript_EndMixRecords:: @ 8271D89
EventScript_DeclineMixRecords:: @ 8271D89
message Text_WeHopeToSeeYouAgain message Text_WeHopeToSeeYouAgain
waitmessage waitmessage
waitbuttonpress waitbuttonpress