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/Route134/events.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 5a2d57417..03339b081 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,15 +1,15 @@ Route134_EventObjects: @ 852CD98 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 -- 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/Route134/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 20f6dd90a..b4bc18251 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,7 +5,7 @@ Route134: @ 8482A14 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 .byte 2 .byte 6 -- 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/Route134/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index b4bc18251..623db96b5 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -7,7 +7,7 @@ Route134: @ 8482A14 .2byte 50 .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 -- 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/Route134/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 623db96b5..cdd43da73 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -8,7 +8,7 @@ Route134: @ 8482A14 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .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/Route134/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index cdd43da73..d1df504ed 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -11,5 +11,5 @@ Route134: @ 8482A14 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3