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/BattleFrontier_BattlePyramidLobby/events.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index 28b5f5c61..dd3722945 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 + object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -- 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/BattleFrontier_BattlePyramidLobby/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index dd3722945..521577c4c 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -8,8 +8,8 @@ BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 - bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 + bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_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/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ed68e86c7..06fd632f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .4byte 0x0 .2byte MUS_PYRAMID .2byte 360 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 -- 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/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 06fd632f8..9fa6b7fa3 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .2byte 360 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 -- 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/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 9fa6b7fa3..a64b37179 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .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/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/BattleFrontier_BattlePyramidLobby') diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index a64b37179..6da314304 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3