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/SlateportCity_BattleTentLobby/scripts.inc
+21 -21
View File
@@ -27,7 +27,7 @@ SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779
SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
lockall
msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -58,7 +58,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
waitse
SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT
setvar VAR_0x8004, 5
special sub_81B9D08
switch VAR_RESULT
@@ -74,7 +74,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
goto SlateportCity_BattleTentLobby_EventScript_208861
SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A
msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208861
SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
@@ -92,7 +92,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
waitse
SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
@@ -123,7 +123,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
compare VAR_RESULT, 0
goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9
special SavePlayerParty
msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT
SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
message SlateportCity_BattleTentLobby_Text_2C586A
@@ -142,7 +142,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special CallFrontierUtilFunc
msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5
msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO
switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_208A2B
case 1, SlateportCity_BattleTentLobby_EventScript_208950
@@ -172,7 +172,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
setvar VAR_0x8006, 0
SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC
msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT
closemessage
call SlateportCity_BattleTentLobby_EventScript_2089C9
warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
@@ -217,7 +217,7 @@ SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
step_end
SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4
msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_2088CA
SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
@@ -231,7 +231,7 @@ SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
special LoadPlayerParty
SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT
release
end
@@ -247,35 +247,35 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
faceplayer
checkflag FLAG_0x109
goto_eq SlateportCity_BattleTentLobby_EventScript_208A74
msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4
msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT
giveitem_std ITEM_TM41
compare VAR_RESULT, 0
goto_eq SlateportCity_BattleTentLobby_EventScript_272054
setflag FLAG_0x109
msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT
release
end
SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74
msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4
msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT
release
end
SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E
msgbox SlateportCity_BattleTentLobby_Text_208D27, 2
msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC
end
SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87
msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2
msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC
end
SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90
msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2
msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC
end
SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99
lockall
msgbox SlateportCity_BattleTentLobby_Text_259721, 4
msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end
@@ -294,27 +294,27 @@ SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8
end
SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06
msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end
SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14
msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4
msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end
SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22
msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4
msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end
SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30
msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4
msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end
SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E
msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4
msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8
end