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/scripts/players_house.inc
+34 -34
View File
@@ -5,14 +5,14 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E
waitmovement 0
compare VAR_0x8005, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D
compare VAR_0x8005, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4092, 4
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763
@@ -37,7 +37,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763
LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0
@@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799
LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
checkflag FLAG_0x051
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, 4
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
call LittlerootTown_BrendansHouse_2F_EventScript_292849
delay 30
setvar VAR_0x4092, 6
@@ -85,7 +85,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857
waitmovement 0
@@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862
waitmovement 0
@@ -161,7 +161,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7
waitmovement 0
@@ -170,8 +170,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD
@@ -186,7 +186,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA
waitmovement 0
@@ -195,8 +195,8 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
call LittlerootTown_MaysHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, 4
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, 4
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1
@@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
waitmovement 0
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT
closemessage
return
@@ -219,7 +219,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
special TurnOffTVScreen
setflag FLAG_SYS_TV_HOME
@@ -326,23 +326,23 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
compare VAR_0x4092, 7
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
checkflag FLAG_0x0D8
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -358,22 +358,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43
LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
checkflag FLAG_0x085
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN
compare VAR_RESULT, 0
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
setflag FLAG_0x085
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT
goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E
end
LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT
release
end
@@ -381,12 +381,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
closemessage
call LittlerootTown_BrendansHouse_1F_EventScript_272083
incrementgamestat 16
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT
release
end
@@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA
faceplayer
waitse
playmoncry SPECIES_VIGOROTH, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -407,7 +407,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD
faceplayer
waitse
playmoncry SPECIES_VIGOROTH, 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -464,16 +464,16 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1
msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT
giveitem_std ITEM_SS_TICKET
msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT
closemessage
delay 20
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1
msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6
@@ -488,7 +488,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D
delay 20
msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_TV_LATI
special TurnOnTVScreen
@@ -497,13 +497,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D
msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33
msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
closemessage
clearflag FLAG_SYS_TV_LATI
setflag FLAG_0x0FF
@@ -512,12 +512,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT
multichoice 22, 8, 108, 1
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_0x40D5, VAR_RESULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, 4
msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4082, 4
setvar VAR_0x408C, 4