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/Route108/events.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 0a0b448c4..a83027178 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,11 +1,11 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK -- 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/Route108/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index a83027178..e18cf16d0 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -11,7 +11,7 @@ Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86 Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_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/Route108/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 2c4cea90d..eb982f2de 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,7 +5,7 @@ Route108: @ 848273C .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .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/Route108/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index eb982f2de..3b55160d8 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -7,7 +7,7 @@ Route108: @ 848273C .2byte 24 .byte MAPSEC_ROUTE_108 .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/Route108/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3b55160d8..a59ddf761 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -8,7 +8,7 @@ Route108: @ 848273C .byte MAPSEC_ROUTE_108 .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/Route108/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route108') diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index a59ddf761..a6314172f 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -11,5 +11,5 @@ Route108: @ 848273C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3