From 624a7552b6e2c07543dfac7276206912970cee15 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 09:05:22 -0400 Subject: use event flags in event scripts --- data/maps/MtPyre_Summit/events.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 554eaa75e..a5526e471 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x394 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 856 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_0x395 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_0x395 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_0x395 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_0x395 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_0x358 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR @@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79 - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_0x04F + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_0x050 MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents -- cgit v1.2.3 From d1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 22:07:23 -0400 Subject: begin event flag names, add temporary hidden item macro --- data/maps/MtPyre_Summit/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index fe39e9d48..335d0ef37 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -66,7 +66,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C msgbox MtPyre_Summit_Text_23290E, 4 giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 - setflag FLAG_0x34F + setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall end -- cgit v1.2.3 From c27043bd3cf51d00b846d5ed38d8bf7c079992bc Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Oct 2018 15:28:59 -0400 Subject: more event flags --- data/maps/MtPyre_Summit/events.inc | 16 ++++++++-------- data/maps/MtPyre_Summit/scripts.inc | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index a5526e471..13c507b86 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x394 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_0x395 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_0x395 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_0x395 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_0x395 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_0x358 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR @@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_0x04F - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_0x050 + bg_hidden_item_event_new 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC + bg_hidden_item_event_new 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 335d0ef37..352d92d83 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -51,8 +51,8 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C removeobject 5 removeobject 6 removeobject 7 - setflag FLAG_0x394 - setflag FLAG_0x395 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE + setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA fadedefaultbgm fadescreen 0 delay 20 -- cgit v1.2.3 From 113a8d1efd45ed387a0ede7b7aa8744b622c662f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 14:59:18 -0400 Subject: clean flags and remove temp macro --- data/maps/MtPyre_Summit/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 13c507b86..b112fbcfe 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_hidden_item_event_new 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event_new 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents -- cgit v1.2.3 From c557ac61aef788f1630d3960dd2366bf000db8e0 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 03:37:46 -0500 Subject: adds constants, cleans up callstd and msgbox code * 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 --- data/maps/MtPyre_Summit/scripts.inc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 352d92d83..d0c9fcc6a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -43,7 +43,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, 4 + msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, 4 + msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD @@ -133,7 +133,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C faceplayer checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, 5 + msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 @@ -142,7 +142,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C end MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, 5 + msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 @@ -151,15 +151,15 @@ MtPyre_Summit_EventScript_232167:: @ 8232167 end MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, 4 + msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, 4 + msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, 4 + msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_2321A2:: @ 82321A2 @@ -171,23 +171,23 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, 4 + msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, 4 + msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT setflag FLAG_0x103 release end MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, 4 + msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, 4 + msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT release end @@ -231,7 +231,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 call_if 1, MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, 4 + msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A @@ -426,22 +426,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 MtPyre_Summit_EventScript_2323FD:: @ 82323FD trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, 6 + msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, 6 + msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, 6 + msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, 6 + msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end MtPyre_Summit_Text_232459: @ 8232459 -- cgit v1.2.3 From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- data/maps/MtPyre_Summit/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index d0c9fcc6a..cfff1c354 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- data/maps/MtPyre_Summit/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/MtPyre_Summit') diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index cfff1c354..ee03362ed 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end -- cgit v1.2.3