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/TradeCenter/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 89e5eac90..a2156ff48 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE -- 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/TradeCenter/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index a2156ff48..e1f2e2bea 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps: @ 8539DB8 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF + coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 + coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 -- 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/TradeCenter/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 55afa79f3..92d6c14a7 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,7 +5,7 @@ TradeCenter: @ 8484D4C .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .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/TradeCenter/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 92d6c14a7..4b2c0f840 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -7,7 +7,7 @@ TradeCenter: @ 8484D4C .2byte 222 .byte MAPSEC_DYNAMIC .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/TradeCenter/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 4b2c0f840..497a3219d 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -8,7 +8,7 @@ TradeCenter: @ 8484D4C .byte MAPSEC_DYNAMIC .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/TradeCenter/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/TradeCenter') diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 497a3219d..947cdbde2 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -11,5 +11,5 @@ TradeCenter: @ 8484D4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3