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/Route133/events.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 6adfce330..ba1ac2ac0 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,14 +1,14 @@ Route133_EventObjects: @ 852CC94 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 Route133_MapEvents:: @ 852CD84 map_events Route133_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/Route133/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index e8bc66e6f..0233c4b1b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,7 +5,7 @@ Route133: @ 84829F8 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .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/Route133/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 0233c4b1b..bd7ab0e10 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -7,7 +7,7 @@ Route133: @ 84829F8 .2byte 49 .byte MAPSEC_ROUTE_133 .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/Route133/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index bd7ab0e10..9f1aad37d 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -8,7 +8,7 @@ Route133: @ 84829F8 .byte MAPSEC_ROUTE_133 .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/Route133/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 9f1aad37d..26428b3dc 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -11,5 +11,5 @@ Route133: @ 84829F8 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3