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/FallarborTown_BattleTentLobby/scripts.inc
+26 -26
View File
@@ -27,7 +27,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF
FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -43,7 +43,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
message FallarborTown_BattleTentLobby_Text_2C4EFF
waitmessage
setvar VAR_0x8004, 4
@@ -59,7 +59,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
waitse
FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
setvar VAR_0x8004, 5
special sub_81B9B80
switch VAR_RESULT
@@ -72,14 +72,14 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
waitmessage
playfanfare MUS_FANFA4
waitfanfare
msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
end
FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73
msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT
waitmessage
closemessage
setvar VAR_TEMP_0, 255
@@ -88,7 +88,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73
FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84
lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_1FFF27
end
@@ -105,7 +105,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
special sub_81B9B80
playse SE_SAVE
waitse
msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4
msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
releaseall
@@ -135,7 +135,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
compare VAR_RESULT, 0
goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84
special SavePlayerParty
msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4
msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT
FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
message FallarborTown_BattleTentLobby_Text_2C4843
@@ -159,7 +159,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
setvar VAR_0x8005, 1
setvar VAR_0x8006, 2
special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
@@ -167,7 +167,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
waitstate
compare VAR_RESULT, 0
goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2
msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5
msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO
switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_2001C2
case 1, FallarborTown_BattleTentLobby_EventScript_2000E2
@@ -201,7 +201,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
special CallFrontierUtilFunc
msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT
closemessage
call FallarborTown_BattleTentLobby_EventScript_2001CF
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
@@ -210,7 +210,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
end
FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169
msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4
msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_200021
FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
@@ -219,11 +219,11 @@ FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176
case 1, FallarborTown_BattleTentLobby_EventScript_20019E
FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191
msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_2001CD
FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E
msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4
msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_2001CD
FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
@@ -237,7 +237,7 @@ FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
special LoadPlayerParty
FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5
msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4
msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT
FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD
release
@@ -280,15 +280,15 @@ FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
step_end
FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D
msgbox FallarborTown_BattleTentLobby_Text_20045A, 2
msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC
end
FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216
msgbox FallarborTown_BattleTentLobby_Text_200304, 2
msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC
end
FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
msgbox FallarborTown_BattleTentLobby_Text_200382, 2
msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC
end
FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
@@ -296,20 +296,20 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
faceplayer
checkflag FLAG_0x1CD
goto_eq FallarborTown_BattleTentLobby_EventScript_200245
msgbox FallarborTown_BattleTentLobby_Text_200501, 4
msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1
setflag FLAG_0x1CD
release
end
FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245
msgbox FallarborTown_BattleTentLobby_Text_200653, 4
msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT
release
end
FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F
lockall
msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4
msgbox FallarborTown_BattleTentLobby_Text_256DB8, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end
@@ -328,27 +328,27 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E
end
FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC
msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4
msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end
FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA
msgbox FallarborTown_BattleTentLobby_Text_256E02, 4
msgbox FallarborTown_BattleTentLobby_Text_256E02, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end
FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8
msgbox FallarborTown_BattleTentLobby_Text_256F43, 4
msgbox FallarborTown_BattleTentLobby_Text_256F43, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end
FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6
msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4
msgbox FallarborTown_BattleTentLobby_Text_256FF2, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end
FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4
msgbox FallarborTown_BattleTentLobby_Text_257202, 4
msgbox FallarborTown_BattleTentLobby_Text_257202, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E
end