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/RustboroCity_PokemonCenter_2F/events.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/RustboroCity_PokemonCenter_2F') diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index d1ec1adb9..f1f9fe356 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F -- 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/RustboroCity_PokemonCenter_2F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/RustboroCity_PokemonCenter_2F') diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 74f264702..48e731a3e 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .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/RustboroCity_PokemonCenter_2F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/RustboroCity_PokemonCenter_2F') diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 48e731a3e..15e8537df 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .2byte 62 .byte MAPSEC_RUSTBORO_CITY .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/RustboroCity_PokemonCenter_2F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/RustboroCity_PokemonCenter_2F') diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 15e8537df..7c2467234 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAPSEC_RUSTBORO_CITY .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/RustboroCity_PokemonCenter_2F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/RustboroCity_PokemonCenter_2F') diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 7c2467234..e7a1999cc 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3