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/LittlerootTown/scripts.inc
+21 -21
View File
@@ -126,7 +126,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
delay 10
applymovement 4, LittlerootTown_Movement_1E7F9A
waitmovement 0
msgbox LittlerootTown_Text_1E86BC, 4
msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT
closemessage
applymovement 4, LittlerootTown_Movement_1E7F9D
applymovement 255, LittlerootTown_Movement_1E7FA4
@@ -190,7 +190,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
applymovement 8, LittlerootTown_Movement_272598
waitmovement 0
delay 80
msgbox LittlerootTown_Text_1E8DA2, 4
msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT
closemessage
clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
@@ -225,11 +225,11 @@ LittlerootTown_EventScript_1E8013:: @ 81E8013
end
LittlerootTown_EventScript_1E8022:: @ 81E8022
msgbox LittlerootTown_Text_1E8ACF, 2
msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC
end
LittlerootTown_EventScript_1E802B:: @ 81E802B
msgbox LittlerootTown_Text_1E8B25, 2
msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC
end
LittlerootTown_EventScript_1E8034:: @ 81E8034
@@ -241,13 +241,13 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034
goto_eq LittlerootTown_EventScript_1E807A
compare VAR_0x4050, 0
goto_if 5, LittlerootTown_EventScript_1E805D
msgbox LittlerootTown_Text_1E8BB8, 4
msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
release
end
LittlerootTown_EventScript_1E805D:: @ 81E805D
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
waitmovement 0
@@ -257,12 +257,12 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
LittlerootTown_EventScript_1E807A:: @ 81E807A
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8CE3, 4
msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT
release
end
LittlerootTown_EventScript_1E8087:: @ 81E8087
msgbox LittlerootTown_Text_1E8D07, 4
msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT
release
end
@@ -277,12 +277,12 @@ LittlerootTown_EventScript_1E8091:: @ 81E8091
end
LittlerootTown_EventScript_1E80AD:: @ 81E80AD
msgbox LittlerootTown_Text_1E8BB8, 4
msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
closemessage
applymovement 1, LittlerootTown_Movement_1E80DF
applymovement 255, LittlerootTown_Movement_1E80EB
waitmovement 0
msgbox LittlerootTown_Text_1E8C07, 4
msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT
closemessage
return
@@ -365,7 +365,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
applymovement 255, LittlerootTown_Movement_2725A4
waitmovement 0
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
waitmovement 0
@@ -374,11 +374,11 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
end
LittlerootTown_EventScript_1E8151:: @ 81E8151
msgbox LittlerootTown_Text_1E8D32, 3
msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN
end
LittlerootTown_EventScript_1E815A:: @ 81E815A
msgbox LittlerootTown_Text_1E8D69, 3
msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN
end
LittlerootTown_EventScript_1E8163:: @ 81E8163
@@ -392,11 +392,11 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163
end
LittlerootTown_EventScript_1E817D:: @ 81E817D
msgbox LittlerootTown_Text_1E8D83, 4
msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT
return
LittlerootTown_EventScript_1E8186:: @ 81E8186
msgbox LittlerootTown_Text_1E8D8E, 4
msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT
return
LittlerootTown_EventScript_1E818F:: @ 81E818F
@@ -410,11 +410,11 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F
end
LittlerootTown_EventScript_1E81A9:: @ 81E81A9
msgbox LittlerootTown_Text_1E8D8E, 4
msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT
return
LittlerootTown_EventScript_1E81B2:: @ 81E81B2
msgbox LittlerootTown_Text_1E8D83, 4
msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT
return
LittlerootTown_EventScript_1E81BB:: @ 81E81BB
@@ -466,7 +466,7 @@ LittlerootTown_EventScript_1E8211:: @ 81E8211
call_if 1, LittlerootTown_EventScript_1E8281
compare VAR_RESULT, 1
call_if 1, LittlerootTown_EventScript_1E828C
msgbox LittlerootTown_Text_1E87E1, 4
msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT
closemessage
checkplayergender
compare VAR_RESULT, 0
@@ -917,13 +917,13 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686
end
LittlerootTown_EventScript_1E8693:: @ 81E8693
msgbox LittlerootTown_Text_1E87F0, 4
msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
message LittlerootTown_Text_1E8925
waitfanfare
setflag FLAG_0x112
msgbox LittlerootTown_Text_1E894F, 4
msgbox LittlerootTown_Text_1E8A03, 4
msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT
msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT
closemessage
delay 30
return