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/SecretBase_Shrub4/events.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data/maps/SecretBase_Shrub4') diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index a027b266b..c6d5f32f5 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE -- 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/SecretBase_Shrub4/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SecretBase_Shrub4') diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 12fa26c3c..ea2c263bb 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub4: @ 8484D14 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 -- 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/SecretBase_Shrub4/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SecretBase_Shrub4') diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index ea2c263bb..7dc3af57e 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub4: @ 8484D14 .2byte 220 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 -- 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/SecretBase_Shrub4/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SecretBase_Shrub4') diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 7dc3af57e..4cfdf043b 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub4: @ 8484D14 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 -- 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/SecretBase_Shrub4/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SecretBase_Shrub4') diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 4cfdf043b..72c5724f6 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub4: @ 8484D14 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER -- cgit v1.2.3