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/Route117/events.inc | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index f84ef6212..9747679ad 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,28 +1,28 @@ Route117_EventObjects: @ 852A828 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 + object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE -- 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/Route117/events.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 9747679ad..ffdb9984f 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -28,10 +28,10 @@ Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents: @ 852AA70 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE - bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7 - bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 + bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE + bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 + bg_hidden_item_event 3, 18, 3, ITEM_REPEL, 72 Route117_MapEvents:: @ 852AAA0 map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_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/Route117/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 897d37afb..02804667c 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -5,7 +5,7 @@ Route117: @ 8482838 .4byte Route117_MapConnections .2byte MUS_DOORO_X1 .2byte 33 - .byte 32 + .byte MAPSEC_ROUTE_117 .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/Route117/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 02804667c..3ed11a3ee 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -7,7 +7,7 @@ Route117: @ 8482838 .2byte 33 .byte MAPSEC_ROUTE_117 .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/Route117/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 3ed11a3ee..70104035a 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -8,7 +8,7 @@ Route117: @ 8482838 .byte MAPSEC_ROUTE_117 .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/Route117/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 70104035a..c720839de 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -11,5 +11,5 @@ Route117: @ 8482838 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3