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/LilycoveCity/scripts.inc
+56 -56
View File
@@ -38,24 +38,24 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
dodailyevents
checkflag FLAG_0x92F
goto_eq LilycoveCity_EventScript_1E2C18
msgbox LilycoveCity_Text_2A7244, 4
msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_272054
setflag FLAG_0x92F
msgbox LilycoveCity_Text_2A72E3, 4
msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C18:: @ 81E2C18
msgbox LilycoveCity_Text_2A7321, 4
msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C22:: @ 81E2C22
msgbox LilycoveCity_Text_1E3D9E, 2
msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B
@@ -63,17 +63,17 @@ LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B
faceplayer
checkflag FLAG_BADGE07_GET
goto_eq LilycoveCity_EventScript_1E2C40
msgbox LilycoveCity_Text_1E3E3C, 4
msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C40:: @ 81E2C40
msgbox LilycoveCity_Text_1E3E7D, 4
msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
msgbox LilycoveCity_Text_1E3F05, 2
msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2C53:: @ 81E2C53
@@ -81,12 +81,12 @@ LilycoveCity_EventScript_1E2C53:: @ 81E2C53
faceplayer
checkflag FLAG_0x070
goto_eq LilycoveCity_EventScript_1E2C68
msgbox LilycoveCity_Text_1E3FAB, 4
msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C68:: @ 81E2C68
msgbox LilycoveCity_Text_1E4020, 4
msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT
release
end
@@ -95,25 +95,25 @@ LilycoveCity_EventScript_1E2C72:: @ 81E2C72
faceplayer
checkflag FLAG_0x070
goto_eq LilycoveCity_EventScript_1E2C87
msgbox LilycoveCity_Text_1E40AD, 4
msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C87:: @ 81E2C87
msgbox LilycoveCity_Text_1E4145, 4
msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2C91:: @ 81E2C91
msgbox LilycoveCity_Text_1E417B, 2
msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A
msgbox LilycoveCity_Text_1E420B, 3
msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3
msgbox LilycoveCity_Text_1E4283, 3
msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC
@@ -121,45 +121,45 @@ LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC
faceplayer
checkflag FLAG_BADGE07_GET
goto_eq LilycoveCity_EventScript_1E2CC1
msgbox LilycoveCity_Text_1E42FC, 4
msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1
msgbox LilycoveCity_Text_1E43FF, 4
msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT
release
end
LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB
msgbox LilycoveCity_Text_1E48A5, 2
msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4
msgbox LilycoveCity_Text_1E4902, 2
msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD
lockall
msgbox LilycoveCity_Text_1E494D, 2
msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC
applymovement 20, LilycoveCity_Movement_2725A2
end
LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE
lockall
msgbox LilycoveCity_Text_1E49F4, 2
msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC
applymovement 19, LilycoveCity_Movement_2725A2
end
LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF
msgbox LilycoveCity_Text_1E448B, 3
msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D08:: @ 81E2D08
msgbox LilycoveCity_Text_1E44C3, 3
msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D11:: @ 81E2D11
msgbox LilycoveCity_Text_1E44FC, 3
msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
@@ -167,12 +167,12 @@ LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
specialvar VAR_0x8004, sub_80F8940
switch VAR_0x8004
case 0, LilycoveCity_EventScript_1E2D3A
msgbox LilycoveCity_Text_1E4571, 4
msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A
msgbox LilycoveCity_Text_1E4534, 4
msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT
releaseall
end
@@ -180,35 +180,35 @@ LilycoveCity_EventScript_1E2D44:: @ 81E2D44
lockall
checkflag FLAG_SYS_GAME_CLEAR
goto_eq LilycoveCity_EventScript_1E2D58
msgbox LilycoveCity_Text_1E45A7, 4
msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_EventScript_1E2D58:: @ 81E2D58
msgbox LilycoveCity_Text_1E4624, 4
msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_EventScript_1E2D62:: @ 81E2D62
msgbox LilycoveCity_Text_1E466E, 3
msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B
msgbox LilycoveCity_Text_1E46BE, 3
msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D74:: @ 81E2D74
msgbox LilycoveCity_Text_1E473D, 3
msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN
end
LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
lockall
checkflag FLAG_0x0DA
goto_eq LilycoveCity_EventScript_1E2DB0
msgbox LilycoveCity_Text_1E3D1F, 4
msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
waitmovement 0
msgbox LilycoveCity_Text_1E3D4A, 4
msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2
waitmovement 0
setflag FLAG_0x0DA
@@ -216,24 +216,24 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
end
LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0
msgbox LilycoveCity_Text_1E3D1F, 4
msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA
msgbox LilycoveCity_Text_1E3B2C, 2
msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3
msgbox LilycoveCity_Text_1E3B95, 2
msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC
msgbox LilycoveCity_Text_1E3C46, 2
msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5
msgbox LilycoveCity_Text_1E3CBE, 2
msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC
end
LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
@@ -254,7 +254,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
call_if 0, LilycoveCity_EventScript_1E2E51
compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2E5A
msgbox LilycoveCity_Text_1E3234, 4
msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2EDE
case 1, LilycoveCity_EventScript_1E2EEE
@@ -262,16 +262,16 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
end
LilycoveCity_EventScript_1E2E48:: @ 81E2E48
msgbox LilycoveCity_Text_1E31F5, 5
msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO
return
LilycoveCity_EventScript_1E2E51:: @ 81E2E51
msgbox LilycoveCity_Text_1E3061, 5
msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO
return
LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
setflag FLAG_0x11E
msgbox LilycoveCity_Text_1E318D, 4
msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT
savebgm MUS_DUMMY
fadedefaultbgm
release
@@ -285,7 +285,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
call_if 0, LilycoveCity_EventScript_1E2EC4
compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2ECD
msgbox LilycoveCity_Text_1E373C, 4
msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2F0E
case 1, LilycoveCity_EventScript_1E2F1E
@@ -293,16 +293,16 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
end
LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB
msgbox LilycoveCity_Text_1E36FA, 5
msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO
return
LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4
msgbox LilycoveCity_Text_1E3608, 5
msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO
return
LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
setflag FLAG_0x11E
msgbox LilycoveCity_Text_1E36BF, 4
msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT
savebgm MUS_DUMMY
fadedefaultbgm
release
@@ -339,7 +339,7 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
end
LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
msgbox LilycoveCity_Text_1E32FB, 4
msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
checkflag FLAG_BADGE06_GET
call_if 1, LilycoveCity_EventScript_1E2F76
@@ -362,21 +362,21 @@ LilycoveCity_EventScript_1E2F80:: @ 81E2F80
return
LilycoveCity_EventScript_1E2F86:: @ 81E2F86
msgbox LilycoveCity_Text_1E3398, 4
msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F
checkflag FLAG_SYS_GAME_CLEAR
goto_eq LilycoveCity_EventScript_1E2FA1
msgbox LilycoveCity_Text_1E346D, 4
msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1
msgbox LilycoveCity_Text_1E353A, 4
msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
msgbox LilycoveCity_Text_1E37D7, 4
msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
checkflag FLAG_BADGE06_GET
call_if 1, LilycoveCity_EventScript_1E2F76
@@ -390,17 +390,17 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
end
LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2
msgbox LilycoveCity_Text_1E3876, 4
msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB
checkflag FLAG_SYS_GAME_CLEAR
goto_eq LilycoveCity_EventScript_1E2FFD
msgbox LilycoveCity_Text_1E390C, 4
msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
msgbox LilycoveCity_Text_1E39E3, 4
msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E3006:: @ 81E3006
@@ -422,7 +422,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
LilycoveCity_EventScript_1E302D:: @ 81E302D
lock
faceplayer
msgbox LilycoveCity_Text_1E4774, 5
msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO
compare VAR_RESULT, 1
call_if 1, LilycoveCity_EventScript_1E304F
compare VAR_RESULT, 0
@@ -431,11 +431,11 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D
end
LilycoveCity_EventScript_1E304F:: @ 81E304F
msgbox LilycoveCity_Text_1E47A1, 4
msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT
return
LilycoveCity_EventScript_1E3058:: @ 81E3058
msgbox LilycoveCity_Text_1E4824, 4
msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT
return
LilycoveCity_Text_1E3061: @ 81E3061