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/VerdanturfTown_BattleTentLobby/scripts.inc
+31 -31
View File
@@ -27,7 +27,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719
VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
lockall
msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -43,7 +43,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
message VerdanturfTown_BattleTentLobby_Text_2C5791
waitmessage
setvar VAR_0x8004, 6
@@ -59,7 +59,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
waitse
VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT
setvar VAR_0x8004, 7
special sub_81B99B4
switch VAR_RESULT
@@ -72,14 +72,14 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
waitmessage
playfanfare MUS_FANFA4
waitfanfare
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
end
VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, MSGBOX_DEFAULT
waitmessage
closemessage
setvar VAR_TEMP_0, 255
@@ -88,7 +88,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE
lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201791
end
@@ -105,7 +105,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
special sub_81B99B4
playse SE_SAVE
waitse
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
@@ -113,7 +113,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
lockall
msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT
message VerdanturfTown_BattleTentLobby_Text_24E5F6
waitmessage
setvar VAR_0x8004, 5
@@ -136,7 +136,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
compare VAR_RESULT, 0
goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE
special SavePlayerParty
msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT
VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
message VerdanturfTown_BattleTentLobby_Text_2C5129
@@ -160,7 +160,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8004, 1
setvar VAR_0x8005, 3
@@ -168,7 +168,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
waitstate
compare VAR_RESULT, 0
goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34
msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5
msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO
switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34
case 1, VerdanturfTown_BattleTentLobby_EventScript_201954
@@ -202,7 +202,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special CallFrontierUtilFunc
msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT
closemessage
call VerdanturfTown_BattleTentLobby_EventScript_201A41
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
@@ -211,7 +211,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
end
VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB
msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201893
VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
@@ -220,11 +220,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8
case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10
VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03
msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10
msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201A3F
VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
@@ -238,7 +238,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
special LoadPlayerParty
VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F
release
@@ -279,27 +279,27 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
faceplayer
checkflag FLAG_0x0EB
goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2
msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT
giveitem_std ITEM_TM45
compare VAR_RESULT, 0
goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054
setflag FLAG_0x0EB
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT
release
end
VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT
release
end
VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC
msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2
msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC
end
VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5
lock
msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT
release
end
@@ -308,26 +308,26 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0
faceplayer
checkflag FLAG_0x1CC
goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED
msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1
setflag FLAG_0x1CC
release
end
VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED
msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4
msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT
release
end
VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7
lock
msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4
msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT
release
end
VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02
lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
@@ -349,32 +349,32 @@ VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E
msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4
msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C
msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A
msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24F049, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8
msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24F190, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6
msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end
VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4
msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4
msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11
end