From 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:51 -0500 Subject: Use movement type constants in object_event macros --- data/maps/MtPyre_1F/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/MtPyre_1F') diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 80bf46c2e..179a6a538 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 -- cgit v1.2.3 From d5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 21:47:04 -0500 Subject: Use region map section constants in map headers --- data/maps/MtPyre_1F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_1F') diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 17b7673c7..9e903d5b6 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,7 +5,7 @@ MtPyre_1F: @ 8484064 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 137 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 -- cgit v1.2.3 From d53e8137cd1e14c7fd5435562a979bb6bd83d20e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:15:35 -0500 Subject: Use weather constants in map headers --- data/maps/MtPyre_1F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_1F') diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 9e903d5b6..88306a7de 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -7,7 +7,7 @@ MtPyre_1F: @ 8484064 .2byte 137 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 -- cgit v1.2.3 From 546819bc722b706a1c49a3d323b3b36d03fa612a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:39:38 -0500 Subject: Use map type constants in map headers --- data/maps/MtPyre_1F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_1F') diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 88306a7de..bb38876c8 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -8,7 +8,7 @@ MtPyre_1F: @ 8484064 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 -- cgit v1.2.3 From 94650495c669f673c59f4912b805b51360c0797a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:45:41 -0500 Subject: Use map battle scene constants in map headers --- data/maps/MtPyre_1F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/MtPyre_1F') diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index bb38876c8..241f3dff3 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -11,5 +11,5 @@ MtPyre_1F: @ 8484064 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3