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/Route110_TrickHouseEnd/scripts.inc
+29 -29
View File
@@ -43,7 +43,7 @@ Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
lock
faceplayer
msgbox Route110_TrickHouseEnd_Text_26B08D, 4
msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
switch VAR_0x4044
case 0, Route110_TrickHouseEnd_EventScript_26AD84
@@ -57,98 +57,98 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
end
Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
msgbox Route110_TrickHouseEnd_Text_26B0BC, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_RARE_CANDY
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
msgbox Route110_TrickHouseEnd_Text_26B13B, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_TIMER_BALL
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
msgbox Route110_TrickHouseEnd_Text_26B1AD, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_HARD_STONE
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
msgbox Route110_TrickHouseEnd_Text_26B223, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_SMOKE_BALL
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
msgbox Route110_TrickHouseEnd_Text_26B293, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_TM12
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
msgbox Route110_TrickHouseEnd_Text_26B315, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_MAGNET
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
msgbox Route110_TrickHouseEnd_Text_26B365, 4
msgbox Route110_TrickHouseEnd_Text_26B73D, 4
msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
giveitem_std ITEM_PP_MAX
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF
msgbox Route110_TrickHouseEnd_Text_26B7EF, 4
msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
closemessage
call Route110_TrickHouseEnd_EventScript_26AFCF
release
end
Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
msgbox Route110_TrickHouseEnd_Text_26B3AB, 4
msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 1
call_if 1, Route110_TrickHouseEnd_EventScript_26B015
@@ -159,17 +159,17 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
compare VAR_FACING, 4
call_if 1, Route110_TrickHouseEnd_EventScript_26B036
delay 30
msgbox Route110_TrickHouseEnd_Text_26B3FA, 4
msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
closemessage
applymovement 1, Route110_TrickHouseEnd_Movement_27259E
waitmovement 0
delay 30
msgbox Route110_TrickHouseEnd_Text_26B485, 4
msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
setvar VAR_0x40C1, 0
call Route110_TrickHouseEnd_EventScript_26AFA5
compare VAR_RESULT, 0
call_if 1, Route110_TrickHouseEnd_EventScript_26B002
msgbox Route110_TrickHouseEnd_Text_26B69A, 4
msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT
call Route110_TrickHouseEnd_EventScript_26AFCF
special ResetTrickHouseEndRoomFlag
release
@@ -201,13 +201,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
call Route110_TrickHouseEnd_EventScript_27205E
msgbox Route110_TrickHouseEnd_Text_26B760, 4
msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
setvar VAR_0x40C1, 1
return
Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
call Route110_TrickHouseEnd_EventScript_272071
msgbox Route110_TrickHouseEnd_Text_26B615, 4
msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
setvar VAR_0x40C1, 1
return
@@ -243,7 +243,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
playse SE_W153
applymovement 255, Route110_TrickHouseEnd_Movement_2725AA
waitmovement 0
msgbox Route110_TrickHouseEnd_Text_26B8BD, 4
msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT
closemessage
applymovement 255, Route110_TrickHouseEnd_Movement_26B089
waitmovement 0