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/RustboroCity_PokemonSchool/scripts.inc
+19 -19
View File
@@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8
RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9
lockall
msgbox RustboroCity_PokemonSchool_Text_2140B2, 4
msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
@@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8
end
RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17
msgbox RustboroCity_PokemonSchool_Text_21411A, 4
msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25
msgbox RustboroCity_PokemonSchool_Text_2141D8, 4
msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33
msgbox RustboroCity_PokemonSchool_Text_21427D, 4
msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41
msgbox RustboroCity_PokemonSchool_Text_214336, 4
msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F
msgbox RustboroCity_PokemonSchool_Text_2143B8, 4
msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_213EB8
end
@@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D
end
RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F
msgbox RustboroCity_PokemonSchool_Text_21459F, 2
msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC
end
RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68
msgbox RustboroCity_PokemonSchool_Text_2145CD, 2
msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC
end
RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71
msgbox RustboroCity_PokemonSchool_Text_214604, 2
msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC
end
RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A
msgbox RustboroCity_PokemonSchool_Text_214669, 2
msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC
end
RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83
msgbox RustboroCity_PokemonSchool_Text_214719, 2
msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC
end
RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C
msgbox RustboroCity_PokemonSchool_Text_2147A2, 3
msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN
end
RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
@@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5
compare VAR_FACING, 3
call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0
msgbox RustboroCity_PokemonSchool_Text_214433, 4
msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
giveitem_std ITEM_QUICK_CLAW
compare VAR_RESULT, 0
goto_eq RustboroCity_PokemonSchool_EventScript_272054
@@ -105,7 +105,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
return
RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
msgbox RustboroCity_PokemonSchool_Text_2144C8, 4
msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
waitmovement 0
@@ -173,7 +173,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
goto_eq RustboroCity_PokemonSchool_EventScript_21406F
checkflag FLAG_BADGE01_GET
goto_eq RustboroCity_PokemonSchool_EventScript_214082
msgbox RustboroCity_PokemonSchool_Text_2148C0, 4
msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1
setflag FLAG_0x136
release
@@ -182,17 +182,17 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F
checkflag FLAG_BADGE01_GET
goto_eq RustboroCity_PokemonSchool_EventScript_214090
msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT
release
end
RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082
msgbox RustboroCity_PokemonSchool_Text_214B8A, 4
msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_21409E
end
RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
msgbox RustboroCity_PokemonSchool_Text_214AB6, 4
msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT
goto RustboroCity_PokemonSchool_EventScript_21409E
end
@@ -203,7 +203,7 @@ RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
end
RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8
msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT
release
end