dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

adds constants, cleans up callstd and msgbox code

Browse Source 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
This commit is contained in:
Melody
2018-12-02 03:37:46 -05:00
parent 145047d438
commit c557ac61ae
354 changed files with 4538 additions and 4531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route120/scripts.inc
+34 -34
View File
@@ -105,7 +105,7 @@ Route120_EventScript_1F5527:: @ 81F5527
dodailyevents
checkflag FLAG_0x92E
goto_eq Route120_EventScript_1F5625
msgbox Route120_Text_2A70C7, 5
msgbox Route120_Text_2A70C7, MSGBOX_YESNO
compare VAR_RESULT, 1
call_if 1, Route120_EventScript_1F562F
compare VAR_RESULT, 0
@@ -154,21 +154,21 @@ Route120_EventScript_1F5601:: @ 81F5601
compare VAR_RESULT, 0
goto_eq Route120_EventScript_272054
setflag FLAG_0x92E
msgbox Route120_Text_2A71D5, 4
msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
release
end
Route120_EventScript_1F5625:: @ 81F5625
msgbox Route120_Text_2A7217, 4
msgbox Route120_Text_2A7217, MSGBOX_DEFAULT
release
end
Route120_EventScript_1F562F:: @ 81F562F
msgbox Route120_Text_2A7147, 4
msgbox Route120_Text_2A7147, MSGBOX_DEFAULT
return
Route120_EventScript_1F5638:: @ 81F5638
msgbox Route120_Text_2A7183, 4
msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
return
Route120_EventScript_1F5641:: @ 81F5641
@@ -176,27 +176,27 @@ Route120_EventScript_1F5641:: @ 81F5641
faceplayer
checkflag FLAG_0x122
goto_eq Route120_EventScript_1F5672
msgbox Route120_Text_1F5998, 5
msgbox Route120_Text_1F5998, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
end
Route120_EventScript_1F5665:: @ 81F5665
msgbox Route120_Text_1F5AAC, 4
msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
setflag FLAG_0x122
release
end
Route120_EventScript_1F5672:: @ 81F5672
msgbox Route120_Text_1F5ADE, 5
msgbox Route120_Text_1F5ADE, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
end
Route120_EventScript_1F568B:: @ 81F568B
msgbox Route120_Text_1F5B0F, 4
msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2
call_if 1, Route120_EventScript_1F57A3
@@ -205,7 +205,7 @@ Route120_EventScript_1F568B:: @ 81F568B
applymovement 31, Route120_Movement_2725A4
waitmovement 0
delay 20
msgbox Route120_Text_1F5B43, 4
msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT
closemessage
applymovement 30, Route120_Movement_2725A8
waitmovement 0
@@ -242,10 +242,10 @@ Route120_EventScript_1F572C:: @ 81F572C
applymovement 31, Route120_Movement_2725AA
applymovement 255, Route120_Movement_2725A6
waitmovement 0
msgbox Route120_Text_1F5BAF, 4
msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_SCOPE
setflag FLAG_0x11D
msgbox Route120_Text_1F5C7B, 4
msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT
closemessage
applymovement 31, Route120_Movement_2725AA
waitmovement 0
@@ -279,20 +279,20 @@ Route120_Movement_1F57B9: @ 81F57B9
step_end
Route120_EventScript_1F57BC:: @ 81F57BC
msgbox Route120_Text_1F5D00, 2
msgbox Route120_Text_1F5D00, MSGBOX_NPC
end
Route120_EventScript_1F57C5:: @ 81F57C5
msgbox Route120_Text_1F5DCB, 3
msgbox Route120_Text_1F5DCB, MSGBOX_SIGN
end
Route120_EventScript_1F57CE:: @ 81F57CE
msgbox Route120_Text_1F5DE4, 3
msgbox Route120_Text_1F5DE4, MSGBOX_SIGN
end
Route120_EventScript_1F57D7:: @ 81F57D7
trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665
msgbox Route120_Text_29E67A, 6
msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F57EE:: @ 81F57EE
@@ -300,34 +300,34 @@ Route120_EventScript_1F57EE:: @ 81F57EE
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F5839
msgbox Route120_Text_29E726, 4
msgbox Route120_Text_29E726, MSGBOX_DEFAULT
release
end
Route120_EventScript_1F581A:: @ 81F581A
special sub_80B4808
waitmovement 0
msgbox Route120_Text_29E75D, 4
msgbox Route120_Text_29E75D, MSGBOX_DEFAULT
setvar VAR_0x8004, 406
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 406
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route120_EventScript_1F5839:: @ 81F5839
trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1
msgbox Route120_Text_29E804, 6
msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F5850:: @ 81F5850
trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884
msgbox Route120_Text_29E8C5, 6
msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F5867:: @ 81F5867
trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980
msgbox Route120_Text_29E996, 6
msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F587E:: @ 81F587E
@@ -335,64 +335,64 @@ Route120_EventScript_1F587E:: @ 81F587E
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F58C9
msgbox Route120_Text_29EA08, 4
msgbox Route120_Text_29EA08, MSGBOX_DEFAULT
release
end
Route120_EventScript_1F58AA:: @ 81F58AA
special sub_80B4808
waitmovement 0
msgbox Route120_Text_29EA31, 4
msgbox Route120_Text_29EA31, MSGBOX_DEFAULT
setvar VAR_0x8004, 226
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 226
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
Route120_EventScript_1F58C9:: @ 81F58C9
trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F
msgbox Route120_Text_29EAA9, 6
msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F58E0:: @ 81F58E0
trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53
msgbox Route120_Text_29EB6E, 6
msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F58F7:: @ 81F58F7
trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25
msgbox Route120_Text_29EC41, 6
msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F590E:: @ 81F590E
trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF
msgbox Route120_Text_29ED19, 6
msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F5925:: @ 81F5925
trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3
msgbox Route120_Text_29EDF7, 6
msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F593C:: @ 81F593C
trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97
msgbox Route120_Text_29EED4, 6
msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F5953:: @ 81F5953
trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63
msgbox Route120_Text_29EF89, 6
msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F596A:: @ 81F596A
trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080
msgbox Route120_Text_29F0A1, 6
msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE
end
Route120_EventScript_1F5981:: @ 81F5981
trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1
msgbox Route120_Text_29F002, 6
msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
end
Route120_Text_1F5998: @ 81F5998