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/Route102/events.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index fc30a195c..a51e09b59 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,13 +1,13 @@ Route102_EventObjects: @ 8527FD8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 -- cgit v1.2.3 From 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 11:12:26 -0500 Subject: Sync bg_event macros with pokeruby --- data/maps/Route102/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index a51e09b59..58a0bf64b 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -10,8 +10,8 @@ Route102_EventObjects: @ 8527FD8 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 Route102_MapBGEvents: @ 85280B0 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA Route102_MapEvents:: @ 85280C8 map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents -- 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/Route102/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 22da93b7a..8a3b38d62 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,7 +5,7 @@ Route102: @ 8482694 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 .byte 2 .byte 3 -- 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/Route102/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 8a3b38d62..33e22d3bd 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -7,7 +7,7 @@ Route102: @ 8482694 .2byte 18 .byte MAPSEC_ROUTE_102 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .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/Route102/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 33e22d3bd..6102e69a0 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -8,7 +8,7 @@ Route102: @ 8482694 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .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/Route102/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 6102e69a0..dc2b3240a 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -11,5 +11,5 @@ Route102: @ 8482694 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3