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/Route128/events.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c34f6eb16..c4b1710fa 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,14 +1,14 @@ Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, 944 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, 945 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 834 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 -- 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/Route128/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c4b1710fa..02d28acfd 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C - bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 - bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0 - bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92 + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93 + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94 Route128_MapEvents:: @ 852C9A0 map_events Route128_EventObjects, 0x0, 0x0, Route128_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/Route128/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 08acd71f2..6ced2f320 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,7 +5,7 @@ Route128: @ 848296C .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .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/Route128/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 6ced2f320..b4f08635f 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -7,7 +7,7 @@ Route128: @ 848296C .2byte 44 .byte MAPSEC_ROUTE_128 .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/Route128/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index b4f08635f..5de5e3d91 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -8,7 +8,7 @@ Route128: @ 848296C .byte MAPSEC_ROUTE_128 .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/Route128/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 5de5e3d91..6065e257c 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -11,5 +11,5 @@ Route128: @ 848296C .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3