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/Route106/events.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 8fdbaad5f..22807fcec 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,9 +1,9 @@ Route106_EventObjects: @ 85287E4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F -- 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/Route106/events.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 22807fcec..11541f2bf 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -9,10 +9,10 @@ Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 - bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 - bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0 - bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0 - bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63 + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46 + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47 + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_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/Route106/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 93f4bd835..51dfac9e3 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,7 +5,7 @@ Route106: @ 8482704 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .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/Route106/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 51dfac9e3..df51d4222 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -7,7 +7,7 @@ Route106: @ 8482704 .2byte 22 .byte MAPSEC_ROUTE_106 .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/Route106/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index df51d4222..69ab66b03 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -8,7 +8,7 @@ Route106: @ 8482704 .byte MAPSEC_ROUTE_106 .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/Route106/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route106') diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 69ab66b03..9292cae39 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -11,5 +11,5 @@ Route106: @ 8482704 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3