diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:20:34 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:59:25 -0400 |
| commit | 71094356313801bf20191f3db1efa0decd3c3dcb (patch) | |
| tree | 18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/MtChimney | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/MtChimney')
| -rw-r--r-- | data/maps/MtChimney/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index e06433dfa..f967f9f2f 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if_eq MtChimney_EventScript_15D000 - giveitem_std ITEM_LAVA_COOKIE + giveitem ITEM_LAVA_COOKIE compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -41,7 +41,7 @@ MtChimney_EventScript_15CFF3:: @ 815CFF3 end MtChimney_EventScript_15D000:: @ 815D000 - takemoney 0xc8, 0 + removemoney 200, 0 updatemoneybox 0, 0 nop return @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -412,7 +412,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D compare VAR_RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem_std ITEM_METEORITE + giveitem ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end |