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/AbandonedShip_Rooms2_1F/scripts.inc
+10 -10
View File
@@ -6,22 +6,22 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4
msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT
release
end
AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
setvar VAR_0x8004, 642
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 642
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
msgbox AbandonedShip_Rooms2_1F_Text_238491, 6
msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
@@ -29,32 +29,32 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4
msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT
release
end
AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
setvar VAR_0x8004, 642
special SetMatchCallRegisteredFlag
setorcopyvar VAR_0x8000, 642
callstd 8
callstd STD_REGISTER_MATCH_CALL
release
end
AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154
trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6
msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F
trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
msgbox AbandonedShip_Rooms2_1F_Text_238708, 6
msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186
trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6
msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE
end
AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D